diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-08-29 18:09:52 +0200 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-08-29 18:49:47 +0200 |
| commit | caec47dc1871782ca445ea34229cd2a5ee600a7f (patch) | |
| tree | ca23e85b3e65801f4680657d10e853661da2b114 /miasm2/expression/expression.py | |
| parent | 60f3cb9a31a86b28eeb5abd357608f91652cb75e (diff) | |
| download | miasm-caec47dc1871782ca445ea34229cd2a5ee600a7f.tar.gz miasm-caec47dc1871782ca445ea34229cd2a5ee600a7f.zip | |
Expr: use TOK define instead of strings
Diffstat (limited to 'miasm2/expression/expression.py')
| -rw-r--r-- | miasm2/expression/expression.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/miasm2/expression/expression.py b/miasm2/expression/expression.py index 954ba00a..ec423f83 100644 --- a/miasm2/expression/expression.py +++ b/miasm2/expression/expression.py @@ -1009,7 +1009,7 @@ class ExprOp(Expr): # Set size for special cases if self._op in [ - '==', 'parity', 'fcom_c0', 'fcom_c1', 'fcom_c2', 'fcom_c3', + TOK_EQUAL, 'parity', 'fcom_c0', 'fcom_c1', 'fcom_c2', 'fcom_c3', 'fxam_c0', 'fxam_c1', 'fxam_c2', 'fxam_c3', "access_segment_ok", "load_segment_limit_ok", "bcdadd_cf", "ucomiss_zf", "ucomiss_pf", "ucomiss_cf", @@ -1102,9 +1102,15 @@ class ExprOp(Expr): return self._op.startswith('call') def is_infix(self): - return self._op in [ '-', '+', '*', '^', '&', '|', '>>', '<<', - 'a>>', '>>>', '<<<', '/', '%', '**', - '<u', '<s', '<=u', '<=s', '==' ] + return self._op in [ + '-', '+', '*', '^', '&', '|', '>>', '<<', + 'a>>', '>>>', '<<<', '/', '%', '**', + TOK_INF_UNSIGNED, + TOK_INF_SIGNED, + TOK_INF_EQUAL_UNSIGNED, + TOK_INF_EQUAL_SIGNED, + TOK_EQUAL + ] def is_associative(self): "Return True iff current operation is associative" |