diff options
| author | Camille Mougey <commial@gmail.com> | 2018-02-02 15:02:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 15:02:52 +0100 |
| commit | 738f6c6a606b2bea9c8c5eebb093aa1d88240a20 (patch) | |
| tree | 4d46baa5ac2a18d20f9a567c94b36a2a568078b8 /miasm2/arch/x86/sem.py | |
| parent | c07d153def937e501eaef50ec6ac79f302bc5f12 (diff) | |
| parent | ef4bb726154228081a377607698d4293185c72a4 (diff) | |
| download | miasm-738f6c6a606b2bea9c8c5eebb093aa1d88240a20.tar.gz miasm-738f6c6a606b2bea9c8c5eebb093aa1d88240a20.zip | |
Merge pull request #669 from serpilliere/fix_cdq
X86: fix cdq/cbw...
Diffstat (limited to '')
| -rw-r--r-- | miasm2/arch/x86/sem.py | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/miasm2/arch/x86/sem.py b/miasm2/arch/x86/sem.py index 56aca1c2..deebba8c 100644 --- a/miasm2/arch/x86/sem.py +++ b/miasm2/arch/x86/sem.py @@ -1614,22 +1614,25 @@ def imul(_, instr, src1, src2=None, src3=None): def cbw(_, instr): + # Only in 16 bit e = [] - tempAL = mRAX[instr.mode][:8] - tempAX = mRAX[instr.mode][:16] + tempAL = mRAX[instr.v_opmode()][:8] + tempAX = mRAX[instr.v_opmode()][:16] e.append(m2_expr.ExprAff(tempAX, tempAL.signExtend(16))) return e, [] def cwde(_, instr): + # Only in 32/64 bit e = [] - tempAX = mRAX[instr.mode][:16] - tempEAX = mRAX[instr.mode][:32] + tempAX = mRAX[instr.v_opmode()][:16] + tempEAX = mRAX[instr.v_opmode()][:32] e.append(m2_expr.ExprAff(tempEAX, tempAX.signExtend(32))) return e, [] def cdqe(_, instr): + # Only in 64 bit e = [] tempEAX = mRAX[instr.mode][:32] tempRAX = mRAX[instr.mode][:64] @@ -1638,32 +1641,34 @@ def cdqe(_, instr): def cwd(_, instr): + # Only in 16 bit e = [] tempAX = mRAX[instr.mode][:16] tempDX = mRDX[instr.mode][:16] - c = tempAX.signExtend(32) - e.append(m2_expr.ExprAff(tempAX, c[:16])) - e.append(m2_expr.ExprAff(tempDX, c[16:32])) + result = tempAX.signExtend(32) + e.append(m2_expr.ExprAff(tempAX, result[:16])) + e.append(m2_expr.ExprAff(tempDX, result[16:32])) return e, [] def cdq(_, instr): + # Only in 32/64 bit e = [] - tempEAX = mRAX[instr.mode][:32] - tempEDX = mRDX[instr.mode][:32] - c = tempEAX.signExtend(64) - e.append(m2_expr.ExprAff(tempEAX, c[:32])) - e.append(m2_expr.ExprAff(tempEDX, c[32:64])) + tempEAX = mRAX[instr.v_opmode()] + tempEDX = mRDX[instr.v_opmode()] + result = tempEAX.signExtend(64) + e.append(m2_expr.ExprAff(tempEDX, result[32:64])) return e, [] def cqo(_, instr): + # Only in 64 bit e = [] tempRAX = mRAX[instr.mode][:64] tempRDX = mRDX[instr.mode][:64] - c = tempRAX.signExtend(128) - e.append(m2_expr.ExprAff(tempRAX, c[:64])) - e.append(m2_expr.ExprAff(tempRDX, c[64:128])) + result = tempRAX.signExtend(128) + e.append(m2_expr.ExprAff(tempRAX, result[:64])) + e.append(m2_expr.ExprAff(tempRDX, result[64:128])) return e, [] |