arm64: fix some compilation warnings & indentation
diff --git a/arch/AArch64/AArch64InstPrinter.c b/arch/AArch64/AArch64InstPrinter.c
index 00c8ba1..56b073c 100644
--- a/arch/AArch64/AArch64InstPrinter.c
+++ b/arch/AArch64/AArch64InstPrinter.c
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
/* Capstone Disassembly Engine */
-/* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2015 */
+/* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2016 */
#ifdef CAPSTONE_HAS_ARM64
@@ -48,7 +48,7 @@
static cs_ac_type get_op_access(cs_struct *h, unsigned int id, unsigned int index)
{
#ifndef CAPSTONE_DIET
- cs_ac_type *arr = arm64_get_op_access(h, id);
+ uint8_t *arr = AArch64_get_op_access(h, id);
if (arr[index] == CS_AC_IGNORE)
return 0;
@@ -68,8 +68,8 @@
if (status) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm.op_count].access = access;
MI->ac_idx++;
#endif
@@ -137,18 +137,18 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op0);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = getWRegFromXReg(MCOperand_getReg(Op1));
@@ -202,26 +202,26 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op0);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op1);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = shift;
@@ -245,34 +245,34 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op0);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op1);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (Is64Bit ? 64 : 32) - (int)MCOperand_getImm(Op2);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)MCOperand_getImm(Op3) + 1;
@@ -294,34 +294,34 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op0);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op1);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)MCOperand_getImm(Op2);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)MCOperand_getImm(Op3) - (int)MCOperand_getImm(Op2) + 1;
@@ -353,34 +353,34 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op0);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op2);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = LSB;
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = Width;
@@ -403,34 +403,34 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op0);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(Op2);
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = LSB;
MI->flat_insn->detail->arm64.op_count++;
#ifndef CAPSTONE_DIET
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = Width;
@@ -697,10 +697,10 @@
SStream_concat0(O, Asm);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_SYS;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].sys = op_ic + op_dc + op_at + op_tlbi;
@@ -712,10 +712,10 @@
SStream_concat(O, ", %s", getRegisterName(Reg, AArch64_NoRegAltName));
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = Reg;
@@ -744,10 +744,10 @@
}
} else {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = Reg;
@@ -772,10 +772,10 @@
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].mem.disp = (int32_t)imm;
} else {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = imm;
@@ -791,10 +791,10 @@
SStream_concat(O, "#%#llx", MCOperand_getImm(Op));
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)MCOperand_getImm(Op);
@@ -813,10 +813,10 @@
printInt32Bang(O, Imm);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = Imm;
@@ -826,10 +826,10 @@
SStream_concat0(O, getRegisterName(Reg, AArch64_NoRegAltName));
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = Reg;
@@ -853,10 +853,10 @@
SStream_concat0(O, getRegisterName(Reg, AArch64_vreg));
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = AArch64_map_vregister(Reg);
@@ -871,10 +871,10 @@
SStream_concat(O, "c%u", MCOperand_getImm(Op));
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_CIMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)MCOperand_getImm(Op);
@@ -894,10 +894,10 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = Val;
@@ -918,10 +918,10 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)Val;
@@ -952,10 +952,10 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)Val;
@@ -1005,10 +1005,10 @@
SStream_concat0(O, getRegisterName(MCOperand_getReg(MCInst_getOperand(MI, OpNum)), AArch64_NoRegAltName));
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = MCOperand_getReg(MCInst_getOperand(MI, OpNum));
@@ -1097,10 +1097,10 @@
SStream_concat0(O, getRegisterName(Reg, AArch64_NoRegAltName));
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = Reg;
@@ -1197,10 +1197,10 @@
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].mem.disp = (int)val;
} else {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)val;
@@ -1221,14 +1221,14 @@
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].mem.disp = (int)val;
} else {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)val;
- MI->flat_insn->detail->arm64.op_count++;
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)val;
+ MI->flat_insn->detail->arm64.op_count++;
}
}
}
@@ -1257,10 +1257,10 @@
printInt32Bang(O, prfop);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = prfop;
@@ -1278,10 +1278,10 @@
SStream_concat(O, "#%.8f", FPImm);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_FP;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].fp = FPImm;
@@ -1375,10 +1375,10 @@
SStream_concat0(O, ", ");
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = AArch64_map_vregister(Reg);
@@ -1497,10 +1497,10 @@
printUInt64Bang(O, imm);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = imm;
@@ -1525,10 +1525,10 @@
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = imm;
@@ -1554,10 +1554,10 @@
SStream_concat0(O, Name);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_BARRIER;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].barrier = Val;
@@ -1567,10 +1567,10 @@
printUInt32Bang(O, Val);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = Val;
@@ -1589,10 +1589,10 @@
SStream_concat0(O, Name);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG_MRS;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = Val;
@@ -1610,10 +1610,10 @@
SStream_concat0(O, Name);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_REG_MSR;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = Val;
@@ -1632,10 +1632,10 @@
SStream_concat0(O, Name);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_PSTATE;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].pstate = Val;
@@ -1644,10 +1644,10 @@
} else {
printInt32Bang(O, Val);
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = Val;
@@ -1662,10 +1662,10 @@
SStream_concat(O, "#%#016llx", Val);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access;
- access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
- MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
- MI->ac_idx++;
+ uint8_t access;
+ access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+ MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
+ MI->ac_idx++;
#endif
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].type = ARM64_OP_IMM;
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].imm = (int)Val;
diff --git a/arch/AArch64/AArch64Mapping.c b/arch/AArch64/AArch64Mapping.c
index 644cea1..5b9746c 100644
--- a/arch/AArch64/AArch64Mapping.c
+++ b/arch/AArch64/AArch64Mapping.c
@@ -1005,7 +1005,7 @@
// map instruction to its characteristics
typedef struct insn_op {
unsigned int eflags_update; // how this instruction update status flags
- cs_ac_type operands[5];
+ uint8_t access[5];
} insn_op;
static insn_op insn_ops[] = {
@@ -1018,11 +1018,11 @@
};
// given internal insn id, return operand access info
-cs_ac_type *arm64_get_op_access(cs_struct *h, unsigned int id)
+uint8_t *AArch64_get_op_access(cs_struct *h, unsigned int id)
{
int i = insn_find(insns, ARR_SIZE(insns), id, &h->insn_cache);
if (i != 0) {
- return insn_ops[i].operands;
+ return insn_ops[i].access;
}
return NULL;
diff --git a/arch/AArch64/AArch64Mapping.h b/arch/AArch64/AArch64Mapping.h
index 767a8f1..3973754 100644
--- a/arch/AArch64/AArch64Mapping.h
+++ b/arch/AArch64/AArch64Mapping.h
@@ -32,7 +32,7 @@
void arm64_op_addImm(MCInst *MI, int64_t imm);
-cs_ac_type *arm64_get_op_access(cs_struct *h, unsigned int id);
+uint8_t *AArch64_get_op_access(cs_struct *h, unsigned int id);
void AArch64_reg_access(const cs_insn *insn,
cs_regs regs_read, uint8_t *regs_read_count,