From 7cfa70ffa40575da4d5c31744dec857bd5e87d6e Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Tue, 16 Apr 2019 23:36:40 +0800 Subject: [PATCH] x86: do not print EIZ register - issue #1456 --- arch/X86/X86ATTInstPrinter.c | 9 +++++++-- arch/X86/X86IntelInstPrinter.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/X86/X86ATTInstPrinter.c b/arch/X86/X86ATTInstPrinter.c index 63f2cb17..173b94f2 100644 --- a/arch/X86/X86ATTInstPrinter.c +++ b/arch/X86/X86ATTInstPrinter.c @@ -53,6 +53,9 @@ #include "X86GenInstrInfo.inc" #endif +#define GET_REGINFO_ENUM +#include "X86GenRegisterInfo.inc" + static void printMemReference(MCInst *MI, unsigned Op, SStream *O); static void printOperand(MCInst *MI, unsigned OpNo, SStream *O); @@ -715,7 +718,9 @@ static void printMemReference(MCInst *MI, unsigned Op, SStream *O) MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].size = MI->x86opsize; MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.segment = X86_REG_INVALID; MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.base = X86_register_map(MCOperand_getReg(BaseReg)); - MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.index = X86_register_map(MCOperand_getReg(IndexReg)); + if (MCOperand_getReg(IndexReg) != X86_EIZ) { + MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.index = X86_register_map(MCOperand_getReg(IndexReg)); + } MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.scale = 1; MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.disp = 0; @@ -761,7 +766,7 @@ static void printMemReference(MCInst *MI, unsigned Op, SStream *O) if (MCOperand_getReg(BaseReg)) _printOperand(MI, Op + X86_AddrBaseReg, O); - if (MCOperand_getReg(IndexReg)) { + if (MCOperand_getReg(IndexReg) != X86_EIZ) { SStream_concat0(O, ", "); _printOperand(MI, Op + X86_AddrIndexReg, O); ScaleVal = MCOperand_getImm(MCInst_getOperand(MI, Op + X86_AddrScaleAmt)); diff --git a/arch/X86/X86IntelInstPrinter.c b/arch/X86/X86IntelInstPrinter.c index 5bd59cda..74353923 100644 --- a/arch/X86/X86IntelInstPrinter.c +++ b/arch/X86/X86IntelInstPrinter.c @@ -52,6 +52,9 @@ #include "X86GenInstrInfo.inc" #endif +#define GET_REGINFO_ENUM +#include "X86GenRegisterInfo.inc" + #include "X86BaseInfo.h" static void printMemReference(MCInst *MI, unsigned Op, SStream *O); @@ -944,7 +947,9 @@ static void printMemReference(MCInst *MI, unsigned Op, SStream *O) MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].size = MI->x86opsize; MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.segment = X86_REG_INVALID; MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.base = X86_register_map(MCOperand_getReg(BaseReg)); - MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.index = X86_register_map(MCOperand_getReg(IndexReg)); + if (MCOperand_getReg(IndexReg) != X86_EIZ) { + MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.index = X86_register_map(MCOperand_getReg(IndexReg)); + } MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.scale = (int)ScaleVal; MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.disp = 0; @@ -971,7 +976,7 @@ static void printMemReference(MCInst *MI, unsigned Op, SStream *O) NeedPlus = true; } - if (MCOperand_getReg(IndexReg)) { + if (MCOperand_getReg(IndexReg) != X86_EIZ) { if (NeedPlus) SStream_concat0(O, " + "); _printOperand(MI, Op + X86_AddrIndexReg, O); if (ScaleVal != 1)