From d2f47d065f71d342c1d761b071e3cf0905551fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Be=CC=81nony?= Date: Fri, 17 Apr 2015 11:42:45 +0200 Subject: [PATCH] Remove enum for ASRS, LSRS, SUBS and MOVS These instructions are now disassembled ASR, LSR, SUB and MOV, with the "update_flags" bit set. --- arch/ARM/ARMMapping.c | 4 --- arch/ARM/ARMMappingInsnOp.inc | 8 ++--- bindings/java/capstone/Arm_const.java | 42 ++++++++++++--------------- bindings/ocaml/arm_const.ml | 42 ++++++++++++--------------- bindings/python/capstone/arm_const.py | 42 ++++++++++++--------------- include/capstone/arm.h | 4 --- 6 files changed, 61 insertions(+), 81 deletions(-) diff --git a/arch/ARM/ARMMapping.c b/arch/ARM/ARMMapping.c index 96c07e0d..37895bb9 100644 --- a/arch/ARM/ARMMapping.c +++ b/arch/ARM/ARMMapping.c @@ -728,18 +728,14 @@ static name_map insn_name_maps[] = { { ARM_INS_IT, "it" }, { ARM_INS_LSL, "lsl" }, { ARM_INS_LSR, "lsr" }, - { ARM_INS_ASRS, "asrs" }, - { ARM_INS_LSRS, "lsrs" }, { ARM_INS_ORN, "orn" }, { ARM_INS_ROR, "ror" }, { ARM_INS_RRX, "rrx" }, - { ARM_INS_SUBS, "subs" }, { ARM_INS_SUBW, "subw" }, { ARM_INS_TBB, "tbb" }, { ARM_INS_TBH, "tbh" }, { ARM_INS_CBNZ, "cbnz" }, { ARM_INS_CBZ, "cbz" }, - { ARM_INS_MOVS, "movs" }, { ARM_INS_POP, "pop" }, { ARM_INS_PUSH, "push" }, diff --git a/arch/ARM/ARMMappingInsnOp.inc b/arch/ARM/ARMMappingInsnOp.inc index 412e580c..dee436f2 100644 --- a/arch/ARM/ARMMappingInsnOp.inc +++ b/arch/ARM/ARMMappingInsnOp.inc @@ -5734,10 +5734,10 @@ { /* ARM_t2MOVr, ARM_INS_MOV: mov${s}${p}.w $rd, $rm */ { CS_AC_WRITE, CS_AC_READ, 0 } }, -{ /* ARM_t2MOVsra_flag, ARM_INS_ASRS: asrs${p}.w $rd, $rm, #1 */ +{ /* ARM_t2MOVsra_flag, ARM_INS_ASR: asrs${p}.w $rd, $rm, #1 */ { CS_AC_WRITE, CS_AC_READ, 0 } }, -{ /* ARM_t2MOVsrl_flag, ARM_INS_LSRS: lsrs${p}.w $rd, $rm, #1 */ +{ /* ARM_t2MOVsrl_flag, ARM_INS_LSR: lsrs${p}.w $rd, $rm, #1 */ { CS_AC_WRITE, CS_AC_READ, 0 } }, { /* ARM_t2MRC, ARM_INS_MRC: mrc${p} $cop, $opc1, $rt, $crn, $crm, $opc2 */ @@ -6253,7 +6253,7 @@ { /* ARM_t2STRs, ARM_INS_STR: str${p}.w $rt, $addr */ { CS_AC_READ, CS_AC_WRITE, 0 } }, -{ /* ARM_t2SUBS_PC_LR, ARM_INS_SUBS: subs${p} pc, lr, $imm */ +{ /* ARM_t2SUBS_PC_LR, ARM_INS_SUB: subs${p} pc, lr, $imm */ { CS_AC_WRITE, CS_AC_READ, 0 } }, { /* ARM_t2SUBri, ARM_INS_SUB: sub${s}${p}.w $rd, $rn, $imm */ @@ -6550,7 +6550,7 @@ { /* ARM_tLSRrr, ARM_INS_LSR: lsr${s}${p} $rdn, $rm */ { CS_AC_READ | CS_AC_WRITE, CS_AC_READ, 0 } }, -{ /* ARM_tMOVSr, ARM_INS_MOVS: movs $rd, $rm */ +{ /* ARM_tMOVSr, ARM_INS_MOV: movs $rd, $rm */ { CS_AC_WRITE, CS_AC_READ, 0 } }, { /* ARM_tMOVi8, ARM_INS_MOV: mov${s}${p} $rd, $imm8 */ diff --git a/bindings/java/capstone/Arm_const.java b/bindings/java/capstone/Arm_const.java index 576a45b8..0790e451 100644 --- a/bindings/java/capstone/Arm_const.java +++ b/bindings/java/capstone/Arm_const.java @@ -741,29 +741,25 @@ public class Arm_const { public static final int ARM_INS_IT = 412; public static final int ARM_INS_LSL = 413; public static final int ARM_INS_LSR = 414; - public static final int ARM_INS_ASRS = 415; - public static final int ARM_INS_LSRS = 416; - public static final int ARM_INS_ORN = 417; - public static final int ARM_INS_ROR = 418; - public static final int ARM_INS_RRX = 419; - public static final int ARM_INS_SUBS = 420; - public static final int ARM_INS_SUBW = 421; - public static final int ARM_INS_TBB = 422; - public static final int ARM_INS_TBH = 423; - public static final int ARM_INS_CBNZ = 424; - public static final int ARM_INS_CBZ = 425; - public static final int ARM_INS_MOVS = 426; - public static final int ARM_INS_POP = 427; - public static final int ARM_INS_PUSH = 428; - public static final int ARM_INS_NOP = 429; - public static final int ARM_INS_YIELD = 430; - public static final int ARM_INS_WFE = 431; - public static final int ARM_INS_WFI = 432; - public static final int ARM_INS_SEV = 433; - public static final int ARM_INS_SEVL = 434; - public static final int ARM_INS_VPUSH = 435; - public static final int ARM_INS_VPOP = 436; - public static final int ARM_INS_ENDING = 437; + public static final int ARM_INS_ORN = 415; + public static final int ARM_INS_ROR = 416; + public static final int ARM_INS_RRX = 417; + public static final int ARM_INS_SUBW = 418; + public static final int ARM_INS_TBB = 419; + public static final int ARM_INS_TBH = 420; + public static final int ARM_INS_CBNZ = 421; + public static final int ARM_INS_CBZ = 422; + public static final int ARM_INS_POP = 423; + public static final int ARM_INS_PUSH = 424; + public static final int ARM_INS_NOP = 425; + public static final int ARM_INS_YIELD = 426; + public static final int ARM_INS_WFE = 427; + public static final int ARM_INS_WFI = 428; + public static final int ARM_INS_SEV = 429; + public static final int ARM_INS_SEVL = 430; + public static final int ARM_INS_VPUSH = 431; + public static final int ARM_INS_VPOP = 432; + public static final int ARM_INS_ENDING = 433; // Group of ARM instructions diff --git a/bindings/ocaml/arm_const.ml b/bindings/ocaml/arm_const.ml index 226df5ab..8804b32e 100644 --- a/bindings/ocaml/arm_const.ml +++ b/bindings/ocaml/arm_const.ml @@ -738,29 +738,25 @@ let _ARM_INS_DCPS3 = 411;; let _ARM_INS_IT = 412;; let _ARM_INS_LSL = 413;; let _ARM_INS_LSR = 414;; -let _ARM_INS_ASRS = 415;; -let _ARM_INS_LSRS = 416;; -let _ARM_INS_ORN = 417;; -let _ARM_INS_ROR = 418;; -let _ARM_INS_RRX = 419;; -let _ARM_INS_SUBS = 420;; -let _ARM_INS_SUBW = 421;; -let _ARM_INS_TBB = 422;; -let _ARM_INS_TBH = 423;; -let _ARM_INS_CBNZ = 424;; -let _ARM_INS_CBZ = 425;; -let _ARM_INS_MOVS = 426;; -let _ARM_INS_POP = 427;; -let _ARM_INS_PUSH = 428;; -let _ARM_INS_NOP = 429;; -let _ARM_INS_YIELD = 430;; -let _ARM_INS_WFE = 431;; -let _ARM_INS_WFI = 432;; -let _ARM_INS_SEV = 433;; -let _ARM_INS_SEVL = 434;; -let _ARM_INS_VPUSH = 435;; -let _ARM_INS_VPOP = 436;; -let _ARM_INS_ENDING = 437;; +let _ARM_INS_ORN = 415;; +let _ARM_INS_ROR = 416;; +let _ARM_INS_RRX = 417;; +let _ARM_INS_SUBW = 418;; +let _ARM_INS_TBB = 419;; +let _ARM_INS_TBH = 420;; +let _ARM_INS_CBNZ = 421;; +let _ARM_INS_CBZ = 422;; +let _ARM_INS_POP = 423;; +let _ARM_INS_PUSH = 424;; +let _ARM_INS_NOP = 425;; +let _ARM_INS_YIELD = 426;; +let _ARM_INS_WFE = 427;; +let _ARM_INS_WFI = 428;; +let _ARM_INS_SEV = 429;; +let _ARM_INS_SEVL = 430;; +let _ARM_INS_VPUSH = 431;; +let _ARM_INS_VPOP = 432;; +let _ARM_INS_ENDING = 433;; (* Group of ARM instructions *) diff --git a/bindings/python/capstone/arm_const.py b/bindings/python/capstone/arm_const.py index 7a035a1c..45bbca6f 100644 --- a/bindings/python/capstone/arm_const.py +++ b/bindings/python/capstone/arm_const.py @@ -738,29 +738,25 @@ ARM_INS_DCPS3 = 411 ARM_INS_IT = 412 ARM_INS_LSL = 413 ARM_INS_LSR = 414 -ARM_INS_ASRS = 415 -ARM_INS_LSRS = 416 -ARM_INS_ORN = 417 -ARM_INS_ROR = 418 -ARM_INS_RRX = 419 -ARM_INS_SUBS = 420 -ARM_INS_SUBW = 421 -ARM_INS_TBB = 422 -ARM_INS_TBH = 423 -ARM_INS_CBNZ = 424 -ARM_INS_CBZ = 425 -ARM_INS_MOVS = 426 -ARM_INS_POP = 427 -ARM_INS_PUSH = 428 -ARM_INS_NOP = 429 -ARM_INS_YIELD = 430 -ARM_INS_WFE = 431 -ARM_INS_WFI = 432 -ARM_INS_SEV = 433 -ARM_INS_SEVL = 434 -ARM_INS_VPUSH = 435 -ARM_INS_VPOP = 436 -ARM_INS_ENDING = 437 +ARM_INS_ORN = 415 +ARM_INS_ROR = 416 +ARM_INS_RRX = 417 +ARM_INS_SUBW = 418 +ARM_INS_TBB = 419 +ARM_INS_TBH = 420 +ARM_INS_CBNZ = 421 +ARM_INS_CBZ = 422 +ARM_INS_POP = 423 +ARM_INS_PUSH = 424 +ARM_INS_NOP = 425 +ARM_INS_YIELD = 426 +ARM_INS_WFE = 427 +ARM_INS_WFI = 428 +ARM_INS_SEV = 429 +ARM_INS_SEVL = 430 +ARM_INS_VPUSH = 431 +ARM_INS_VPOP = 432 +ARM_INS_ENDING = 433 # Group of ARM instructions diff --git a/include/capstone/arm.h b/include/capstone/arm.h index 8c371784..a2ffe4bc 100644 --- a/include/capstone/arm.h +++ b/include/capstone/arm.h @@ -855,18 +855,14 @@ typedef enum arm_insn { ARM_INS_IT, ARM_INS_LSL, ARM_INS_LSR, - ARM_INS_ASRS, // Not used anymore - ARM_INS_LSRS, // Not used anymore ARM_INS_ORN, ARM_INS_ROR, ARM_INS_RRX, - ARM_INS_SUBS, // Not used anymore ARM_INS_SUBW, ARM_INS_TBB, ARM_INS_TBH, ARM_INS_CBNZ, ARM_INS_CBZ, - ARM_INS_MOVS, // Not used anymore ARM_INS_POP, ARM_INS_PUSH,