diff options
| author | serpilliere <devnull@localhost> | 2011-08-26 13:34:12 +0200 |
|---|---|---|
| committer | serpilliere <devnull@localhost> | 2011-08-26 13:34:12 +0200 |
| commit | bbd7e71ada55e23fe857a7c9954687ff987dec7c (patch) | |
| tree | 5b8b21abab228129b8b2db1fab465185d27e4416 /miasm/expression/expression.py | |
| parent | 78bacd4d0dd014412a81ce8dc72ad3954bcd12e5 (diff) | |
| download | focaccia-miasm-bbd7e71ada55e23fe857a7c9954687ff987dec7c.tar.gz focaccia-miasm-bbd7e71ada55e23fe857a7c9954687ff987dec7c.zip | |
explicit error whil vm_get_mem fails
Diffstat (limited to 'miasm/expression/expression.py')
| -rw-r--r-- | miasm/expression/expression.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/miasm/expression/expression.py b/miasm/expression/expression.py index e472fb48..015dd651 100644 --- a/miasm/expression/expression.py +++ b/miasm/expression/expression.py @@ -612,9 +612,10 @@ class ExprSlice(Expr): return hash(self.arg)^hash(self.start)^hash(self.stop) def toC(self): + # XXX gen mask in python for 64 bit & 32 bit compat return "((%s>>%d) & ((0xFFFFFFFF>>(32-%d))))"%(self.arg.toC(), self.start, self.stop-self.start) - + class ExprSliceTo(Expr): def __init__(self, arg, start, stop): self.arg, self.start, self.stop = arg, start, stop @@ -650,6 +651,7 @@ class ExprSliceTo(Expr): return hash(self.arg)^hash(self.start)^hash(self.stop) def toC(self): + # XXX gen mask in python for 64 bit & 32 bit compat return "((%s & (0xFFFFFFFF>>(32-%d))) << %d)"%(self.arg.toC(), self.stop-self.start, self.start) class ExprCompose(Expr): @@ -669,7 +671,7 @@ class ExprCompose(Expr): if isinstance(a, Expr): args.append(a.reload_expr(g)) else: - args.append(a) + args.append(a) return ExprCompose(args ) def __contains__(self, e): |