diff options
Diffstat (limited to '')
| -rw-r--r-- | miasm2/arch/msp430/arch.py | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/miasm2/arch/msp430/arch.py b/miasm2/arch/msp430/arch.py index 02e3ca60..624ec19f 100644 --- a/miasm2/arch/msp430/arch.py +++ b/miasm2/arch/msp430/arch.py @@ -47,18 +47,13 @@ def deref_expr(s, l, t): t = t[0] assert(len(t) == 1) t = t[0] - if isinstance(t, ExprId): - return t - elif isinstance(t, ExprInt): - return t - elif isinstance(t, ExprMem): - return t - elif isinstance(t, ExprOp) and t.op == "autoinc": + if isinstance(t, ExprId) or \ + isinstance(t, ExprInt) or \ + isinstance(t, ExprMem) or \ + (isinstance(t, ExprOp) and t.op == "autoinc"): return t + raise NotImplementedError('not fully functional') - if t[-1] == '!': - return ExprOp('wback', *t[:-1]) - return t[0] def f_reg2expr(t): @@ -301,7 +296,6 @@ class mn_msp430(cls_mn): def getnextflow(self, symbol_pool): raise NotImplementedError('not fully functional') - return self.offset + 4 def addop(name, fields, args=None, alias=False): |