do not need to explicitly assign values for operand types in the last commit
diff --git a/arch/ARM/ARMBaseInfo.h b/arch/ARM/ARMBaseInfo.h
index 752c94e..7e50396 100644
--- a/arch/ARM/ARMBaseInfo.h
+++ b/arch/ARM/ARMBaseInfo.h
@@ -20,7 +20,6 @@
#ifndef CS_ARMBASEINFO_H
#define CS_ARMBASEINFO_H
-#include "../../include/capstone.h"
#include "../../include/arm.h"
// Defines symbolic names for ARM registers. This defines a mapping from
diff --git a/include/arm.h b/include/arm.h
index fecc6a3..5d38bea 100644
--- a/include/arm.h
+++ b/include/arm.h
@@ -99,11 +99,11 @@
//> Operand type for instruction's operands
typedef enum arm_op_type {
- ARM_OP_INVALID = CS_OP_INVALID, // Uninitialized.
- ARM_OP_REG = CS_OP_REG, // Register operand.
- ARM_OP_IMM = CS_OP_IMM, // Immediate operand.
- ARM_OP_MEM = CS_OP_MEM, // Memory operand
- ARM_OP_FP = CS_OP_FP, // Floating-Point immediate operand.
+ ARM_OP_INVALID = 0, // = CS_OP_INVALID (Uninitialized).
+ ARM_OP_REG, // = CS_OP_REG (Register operand).
+ ARM_OP_IMM, // = CS_OP_IMM (Immediate operand).
+ ARM_OP_MEM, // = CS_OP_MEM (Memory operand).
+ ARM_OP_FP, // = CS_OP_FP (Floating-Point operand).
ARM_OP_CIMM = 64, // C-Immediate (coprocessor registers)
ARM_OP_PIMM, // P-Immediate (coprocessor registers)
ARM_OP_SETEND, // operand for SETEND instruction
diff --git a/include/arm64.h b/include/arm64.h
index 8dcf969..06e146f 100644
--- a/include/arm64.h
+++ b/include/arm64.h
@@ -232,11 +232,11 @@
//> Operand type for instruction's operands
typedef enum arm64_op_type {
- ARM64_OP_INVALID = CS_OP_INVALID, // Uninitialized.
- ARM64_OP_REG = CS_OP_REG, // Register operand.
- ARM64_OP_IMM = CS_OP_IMM, // Immediate operand.
- ARM64_OP_MEM = CS_OP_MEM, // Memory operand
- ARM64_OP_FP = CS_OP_FP, // Floating-Point immediate operand.
+ ARM64_OP_INVALID = 0, // = CS_OP_INVALID (Uninitialized).
+ ARM64_OP_REG, // = CS_OP_REG (Register operand).
+ ARM64_OP_IMM, // = CS_OP_IMM (Immediate operand).
+ ARM64_OP_MEM, // = CS_OP_MEM (Memory operand).
+ ARM64_OP_FP, // = CS_OP_FP (Floating-Point operand).
ARM64_OP_CIMM = 64, // C-Immediate
ARM64_OP_REG_MRS, // MRS register operand.
ARM64_OP_REG_MSR, // MSR register operand.
diff --git a/include/mips.h b/include/mips.h
index 0d816e1..957bd73 100644
--- a/include/mips.h
+++ b/include/mips.h
@@ -21,10 +21,10 @@
//> Operand type for instruction's operands
typedef enum mips_op_type {
- MIPS_OP_INVALID = CS_OP_INVALID, // Uninitialized.
- MIPS_OP_REG = CS_OP_REG, // Register operand.
- MIPS_OP_IMM = CS_OP_IMM, // Immediate operand.
- MIPS_OP_MEM = CS_OP_MEM, // Memory operand
+ MIPS_OP_INVALID = 0, // = CS_OP_INVALID (Uninitialized).
+ MIPS_OP_REG, // = CS_OP_REG (Register operand).
+ MIPS_OP_IMM, // = CS_OP_IMM (Immediate operand).
+ MIPS_OP_MEM, // = CS_OP_MEM (Memory operand).
} mips_op_type;
// Instruction's operand referring to memory
diff --git a/include/ppc.h b/include/ppc.h
index e71138b..cf5a50b 100644
--- a/include/ppc.h
+++ b/include/ppc.h
@@ -41,10 +41,10 @@
//> Operand type for instruction's operands
typedef enum ppc_op_type {
- PPC_OP_INVALID = CS_OP_INVALID, // Uninitialized.
- PPC_OP_REG = CS_OP_REG, // Register operand.
- PPC_OP_IMM = CS_OP_IMM, // Immediate operand.
- PPC_OP_MEM = CS_OP_MEM, // Memory operand
+ PPC_OP_INVALID = 0, // = CS_OP_INVALID (Uninitialized).
+ PPC_OP_REG, // = CS_OP_REG (Register operand).
+ PPC_OP_IMM, // = CS_OP_IMM (Immediate operand).
+ PPC_OP_MEM, // = CS_OP_MEM (Memory operand).
PPC_OP_CRX = 64, // Condition Register field
} ppc_op_type;
diff --git a/include/sparc.h b/include/sparc.h
index c0c8516..5799b2b 100644
--- a/include/sparc.h
+++ b/include/sparc.h
@@ -69,10 +69,10 @@
//> Operand type for instruction's operands
typedef enum sparc_op_type {
- SPARC_OP_INVALID = CS_OP_INVALID, // Uninitialized.
- SPARC_OP_REG = CS_OP_REG, // Register operand.
- SPARC_OP_IMM = CS_OP_IMM, // Immediate operand.
- SPARC_OP_MEM = CS_OP_MEM, // Memory operand
+ SPARC_OP_INVALID = 0, // = CS_OP_INVALID (Uninitialized).
+ SPARC_OP_REG, // = CS_OP_REG (Register operand).
+ SPARC_OP_IMM, // = CS_OP_IMM (Immediate operand).
+ SPARC_OP_MEM, // = CS_OP_MEM (Memory operand).
} sparc_op_type;
// Instruction's operand referring to memory
diff --git a/include/systemz.h b/include/systemz.h
index 0f9dcd7..951db52 100644
--- a/include/systemz.h
+++ b/include/systemz.h
@@ -37,10 +37,10 @@
//> Operand type for instruction's operands
typedef enum sysz_op_type {
- SYSZ_OP_INVALID = CS_OP_INVALID, // Uninitialized.
- SYSZ_OP_REG = CS_OP_REG, // Register operand.
- SYSZ_OP_IMM = CS_OP_IMM, // Immediate operand.
- SYSZ_OP_MEM = CS_OP_MEM, // Memory operand
+ SYSZ_OP_INVALID = 0, // = CS_OP_INVALID (Uninitialized).
+ SYSZ_OP_REG, // = CS_OP_REG (Register operand).
+ SYSZ_OP_IMM, // = CS_OP_IMM (Immediate operand).
+ SYSZ_OP_MEM, // = CS_OP_MEM (Memory operand).
SYSZ_OP_ACREG = 64, // Access register operand.
} sysz_op_type;
diff --git a/include/x86.h b/include/x86.h
index ecb072e..96d6c41 100644
--- a/include/x86.h
+++ b/include/x86.h
@@ -69,11 +69,11 @@
//> Operand type for instruction's operands
typedef enum x86_op_type {
- X86_OP_INVALID = CS_OP_INVALID, // Uninitialized.
- X86_OP_REG = CS_OP_REG, // Register operand.
- X86_OP_IMM = CS_OP_IMM, // Immediate operand.
- X86_OP_MEM = CS_OP_MEM, // Memory operand
- X86_OP_FP = CS_OP_FP, // Floating-Point operand.
+ X86_OP_INVALID = 0, // = CS_OP_INVALID (Uninitialized).
+ X86_OP_REG, // = CS_OP_REG (Register operand).
+ X86_OP_IMM, // = CS_OP_IMM (Immediate operand).
+ X86_OP_MEM, // = CS_OP_MEM (Memory operand).
+ X86_OP_FP, // = CS_OP_FP (Floating-Point operand).
} x86_op_type;
//> AVX broadcast type
diff --git a/include/xcore.h b/include/xcore.h
index a843e69..e8545a6 100644
--- a/include/xcore.h
+++ b/include/xcore.h
@@ -17,10 +17,10 @@
//> Operand type for instruction's operands
typedef enum xcore_op_type {
- XCORE_OP_INVALID = CS_OP_INVALID, // Uninitialized.
- XCORE_OP_REG = CS_OP_REG, // Register operand.
- XCORE_OP_IMM = CS_OP_IMM, // Immediate operand.
- XCORE_OP_MEM = CS_OP_MEM, // Memory operand
+ XCORE_OP_INVALID = 0, // = CS_OP_INVALID (Uninitialized).
+ XCORE_OP_REG, // = CS_OP_REG (Register operand).
+ XCORE_OP_IMM, // = CS_OP_IMM (Immediate operand).
+ XCORE_OP_MEM, // = CS_OP_MEM (Memory operand).
} xcore_op_type;
// Instruction's operand referring to memory