Skip to content

Commit

Permalink
x86: correct access mode for cmp instruction (capstone-engine#1309)
Browse files Browse the repository at this point in the history 
cmp instruction does not modify its operands. Currently, cmp
variants that accept a memory operand have CS_AC_WRITE access mode
set. This commit removes CS_AC_WRITE mode from cmp variants that
have it.
  • Loading branch information
@abenkhadra @aquynh
abenkhadra authored and aquynh committed Dec 18, 2018
1 parent cc8da33 commit bae63f6
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
18 changes: 9 additions & 9 deletions arch/X86/X86MappingInsnOp.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1691,15 +1691,15 @@
},
{ /* X86_CMP16mi, X86_INS_CMP: cmp{w} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP16mi8, X86_INS_CMP: cmp{w} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP16mr, X86_INS_CMP: cmp{w} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_READ, 0 }
{ CS_AC_READ, CS_AC_READ, 0 }
},
{ /* X86_CMP16ri, X86_INS_CMP: cmp{w} $src1, $src2 */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
Expand Down Expand Up @@ -1727,15 +1727,15 @@
},
{ /* X86_CMP32mi, X86_INS_CMP: cmp{l} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP32mi8, X86_INS_CMP: cmp{l} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP32mr, X86_INS_CMP: cmp{l} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_READ, 0 }
{ CS_AC_READ, CS_AC_READ, 0 }
},
{ /* X86_CMP32ri, X86_INS_CMP: cmp{l} $src1, $src2 */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
Expand Down Expand Up @@ -1763,15 +1763,15 @@
},
{ /* X86_CMP64mi32, X86_INS_CMP: cmp{q} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP64mi8, X86_INS_CMP: cmp{q} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP64mr, X86_INS_CMP: cmp{q} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_READ, 0 }
{ CS_AC_READ, CS_AC_READ, 0 }
},
{ /* X86_CMP64ri32, X86_INS_CMP: cmp{q} $src1, $src2 */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
Expand Down
24 changes: 12 additions & 12 deletions arch/X86/X86MappingInsnOp_reduce.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1443,15 +1443,15 @@
},
{ /* X86_CMP16mi, X86_INS_CMP: cmp{w} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP16mi8, X86_INS_CMP: cmp{w} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP16mr, X86_INS_CMP: cmp{w} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_READ, 0 }
{ CS_AC_READ, CS_AC_READ, 0 }
},
{ /* X86_CMP16ri, X86_INS_CMP: cmp{w} $src1, $src2 */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
Expand Down Expand Up @@ -1479,15 +1479,15 @@
},
{ /* X86_CMP32mi, X86_INS_CMP: cmp{l} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP32mi8, X86_INS_CMP: cmp{l} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP32mr, X86_INS_CMP: cmp{l} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_READ, 0 }
{ CS_AC_READ, CS_AC_READ, 0 }
},
{ /* X86_CMP32ri, X86_INS_CMP: cmp{l} $src1, $src2 */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
Expand Down Expand Up @@ -1515,15 +1515,15 @@
},
{ /* X86_CMP64mi32, X86_INS_CMP: cmp{q} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP64mi8, X86_INS_CMP: cmp{q} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP64mr, X86_INS_CMP: cmp{q} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_READ, 0 }
{ CS_AC_READ, CS_AC_READ, 0 }
},
{ /* X86_CMP64ri32, X86_INS_CMP: cmp{q} $src1, $src2 */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
Expand Down Expand Up @@ -1551,15 +1551,15 @@
},
{ /* X86_CMP8mi, X86_INS_CMP: cmp{b} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP8mi8, X86_INS_CMP: cmp{b} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_IGNORE, 0 }
{ CS_AC_READ, CS_AC_IGNORE, 0 }
},
{ /* X86_CMP8mr, X86_INS_CMP: cmp{b} $dst, $src */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
{ CS_AC_READ | CS_AC_WRITE, CS_AC_READ, 0 }
{ CS_AC_READ, CS_AC_READ, 0 }
},
{ /* X86_CMP8ri, X86_INS_CMP: cmp{b} $src1, $src2 */
X86_EFLAGS_MODIFY_OF | X86_EFLAGS_MODIFY_SF | X86_EFLAGS_MODIFY_ZF | X86_EFLAGS_MODIFY_AF | X86_EFLAGS_MODIFY_PF | X86_EFLAGS_MODIFY_CF,
Expand Down

0 comments on commit bae63f6

Please sign in to comment.