Fix: Remove invalid mnemonic enum adr_

capstone-engine · Nov 25, 2024 · d1ff557 · d1ff557
1 parent b5a6457
commit d1ff557
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/arch/ARM/ARMGenCSMappingInsn.inc b/arch/ARM/ARMGenCSMappingInsn.inc
@@ -26955,15 +26955,15 @@
 },
 {
   /* vscclrm{$p}	$regs */
-  ARM_VSCCLRMD /* 3449 */, ARM_INS_VSCCLRM_,
+  ARM_VSCCLRMD /* 3449 */, ARM_INS_VSCCLRM,
   #ifndef CAPSTONE_DIET
     { 0 }, { 0 }, { ARM_FEATURE_HASV8_1MMAINLINE, ARM_FEATURE_HAS8MSECEXT, 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
 
   #endif
 },
 {
   /* vscclrm{$p}	$regs */
-  ARM_VSCCLRMS /* 3450 */, ARM_INS_VSCCLRM_,
+  ARM_VSCCLRMS /* 3450 */, ARM_INS_VSCCLRM,
   #ifndef CAPSTONE_DIET
     { 0 }, { 0 }, { ARM_FEATURE_HASV8_1MMAINLINE, ARM_FEATURE_HAS8MSECEXT, 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
 
@@ -31147,7 +31147,7 @@
 },
 {
   /* adr{$p}.w	$Rd, $addr */
-  ARM_t2ADR /* 3989 */, ARM_INS_ADR_,
+  ARM_t2ADR /* 3989 */, ARM_INS_ADR,
   #ifndef CAPSTONE_DIET
     { 0 }, { 0 }, { ARM_FEATURE_ISTHUMB2, 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
 
@@ -34319,7 +34319,7 @@
 },
 {
   /* adr{$p}	$Rd, $addr */
-  ARM_tADR /* 4386 */, ARM_INS_ADR_,
+  ARM_tADR /* 4386 */, ARM_INS_ADR,
   #ifndef CAPSTONE_DIET
     { 0 }, { 0 }, { ARM_FEATURE_ISTHUMB, 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
 

diff --git a/arch/ARM/ARMGenCSMappingInsnName.inc b/arch/ARM/ARMGenCSMappingInsnName.inc
@@ -577,7 +577,7 @@
   "vrsqrts", // ARM_INS_VRSQRTS
   "vrsra", // ARM_INS_VRSRA
   "vrsubhn", // ARM_INS_VRSUBHN
-  "vscclrm_", // ARM_INS_VSCCLRM_
+  "vscclrm", // ARM_INS_VSCCLRM
   "vsdot", // ARM_INS_VSDOT
   "vseleq", // ARM_INS_VSELEQ
   "vselge", // ARM_INS_VSELGE
@@ -608,7 +608,6 @@
   "vuzp", // ARM_INS_VUZP
   "vzip", // ARM_INS_VZIP
   "addw", // ARM_INS_ADDW
-  "adr_", // ARM_INS_ADR_
   "aut", // ARM_INS_AUT
   "autg", // ARM_INS_AUTG
   "bfl", // ARM_INS_BFL

diff --git a/arch/ARM/ARMGenCSMappingInsnOp.inc b/arch/ARM/ARMGenCSMappingInsnOp.inc
@@ -28521,15 +28521,15 @@
   { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
   { 0 }
 }},
-{ /* ARM_VSCCLRMD (3449) - ARM_INS_VSCCLRM_ - vscclrm{$p}	$regs */
+{ /* ARM_VSCCLRMD (3449) - ARM_INS_VSCCLRM - vscclrm{$p}	$regs */
 {
   { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
   { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
   { CS_OP_IMM, CS_AC_WRITE, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* regs */
   { CS_OP_INVALID, CS_AC_READ, { CS_DATA_TYPE_LAST } }, /*  */
   { 0 }
 }},
-{ /* ARM_VSCCLRMS (3450) - ARM_INS_VSCCLRM_ - vscclrm{$p}	$regs */
+{ /* ARM_VSCCLRMS (3450) - ARM_INS_VSCCLRM - vscclrm{$p}	$regs */
 {
   { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
   { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
@@ -32923,7 +32923,7 @@
   { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
   { 0 }
 }},
-{ /* ARM_t2ADR (3989) - ARM_INS_ADR_ - adr{$p}.w	$Rd, $addr */
+{ /* ARM_t2ADR (3989) - ARM_INS_ADR - adr{$p}.w	$Rd, $addr */
 {
   { CS_OP_REG, CS_AC_WRITE, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* Rd */
   { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* addr */
@@ -36491,7 +36491,7 @@
   { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
   { 0 }
 }},
-{ /* ARM_tADR (4386) - ARM_INS_ADR_ - adr{$p}	$Rd, $addr */
+{ /* ARM_tADR (4386) - ARM_INS_ADR - adr{$p}	$Rd, $addr */
 {
   { CS_OP_REG, CS_AC_WRITE, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* Rd */
   { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* addr */

diff --git a/include/capstone/arm.h b/include/capstone/arm.h
@@ -1493,7 +1493,7 @@ typedef enum arm_insn {
 	ARM_INS_VRSQRTS,
 	ARM_INS_VRSRA,
 	ARM_INS_VRSUBHN,
-	ARM_INS_VSCCLRM_,
+	ARM_INS_VSCCLRM,
 	ARM_INS_VSDOT,
 	ARM_INS_VSELEQ,
 	ARM_INS_VSELGE,
@@ -1524,7 +1524,6 @@ typedef enum arm_insn {
 	ARM_INS_VUZP,
 	ARM_INS_VZIP,
 	ARM_INS_ADDW,
-	ARM_INS_ADR_,
 	ARM_INS_AUT,
 	ARM_INS_AUTG,
 	ARM_INS_BFL,

diff --git a/suite/auto-sync/inc_patches/ARM/01_LDM_reg_lists_write_attribute.patch b/suite/auto-sync/inc_patches/ARM/01_LDM_reg_lists_write_attribute.patch
@@ -204,7 +204,7 @@ index cc10dad8..8a1ede35 100644
 @@ -28522,21 +28522,21 @@
    { 0 }
  }},
- { /* ARM_VSCCLRMD (3449) - ARM_INS_VSCCLRM_ - vscclrm{$p}	$regs */
+ { /* ARM_VSCCLRMD (3449) - ARM_INS_VSCCLRM - vscclrm{$p}	$regs */
  {
    { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
    { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
@@ -213,7 +213,7 @@ index cc10dad8..8a1ede35 100644
    { CS_OP_INVALID, CS_AC_READ, { CS_DATA_TYPE_LAST } }, /*  */
    { 0 }
  }},
- { /* ARM_VSCCLRMS (3450) - ARM_INS_VSCCLRM_ - vscclrm{$p}	$regs */
+ { /* ARM_VSCCLRMS (3450) - ARM_INS_VSCCLRM - vscclrm{$p}	$regs */
  {
    { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */
    { CS_OP_IMM, CS_AC_READ, { CS_DATA_TYPE_i32, CS_DATA_TYPE_LAST } }, /* p - i32imm */

diff --git a/suite/auto-sync/src/autosync/IncGenerator.py b/suite/auto-sync/src/autosync/IncGenerator.py
@@ -143,9 +143,10 @@ def apply_patches(self) -> None:
         for patch in patch_dir.iterdir():
             try:
                 subprocess.run(
-                    ["git", "apply", "-C4", "--recount", str(patch)],
+                    ["git", "apply", "-v", "--recount", str(patch)],
                     check=True,
                 )
                 log.info(f"Applied inc patch {patch.name}")
             except subprocess.CalledProcessError as e:
                 log.warning(f".inc patch {patch.name} did not apply correctly!")
+                log.warning(f"Error:\n{e.output}")