Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: address-size prefix should override RIP relative address in x64 mode. bug reported by @hlide

This commit is contained in:
Nguyen Anh Quynh 2014-06-30 07:57:29 +08:00
parent 656ebc9625
commit ed6b8c5a96
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/X86/X86Disassembler.c
View File

@ -270,7 +270,7 @@ static bool translateRMRegister(MCInst *mcInst, InternalInstruction *insn)
return true; return true;
#define ENTRY(x) \ #define ENTRY(x) \
case EA_REG_##x: \ case EA_REG_##x: \
MCOperand_CreateReg0(mcInst, X86_##x); break; MCOperand_CreateReg0(mcInst, X86_##x); break;
ALL_REGS ALL_REGS
#undef ENTRY #undef ENTRY
default: default:
@ -314,7 +314,7 @@ static bool translateRMMemory(MCInst *mcInst, InternalInstruction *insn)
switch (insn->sibBase) { switch (insn->sibBase) {
#define ENTRY(x) \ #define ENTRY(x) \
case SIB_BASE_##x: \ case SIB_BASE_##x: \
MCOperand_CreateReg0(mcInst, X86_##x); break; MCOperand_CreateReg0(mcInst, X86_##x); break;
ALL_SIB_BASES ALL_SIB_BASES
#undef ENTRY #undef ENTRY
default: default:
@ -390,7 +390,7 @@ static bool translateRMMemory(MCInst *mcInst, InternalInstruction *insn)
return true; return true;
#define ENTRY(x) \ #define ENTRY(x) \
case SIB_INDEX_##x: \ case SIB_INDEX_##x: \
indexReg = X86_##x; break; indexReg = X86_##x; break;
EA_BASES_32BIT EA_BASES_32BIT
EA_BASES_64BIT EA_BASES_64BIT
REGS_XMM REGS_XMM
@ -411,9 +411,13 @@ static bool translateRMMemory(MCInst *mcInst, InternalInstruction *insn)
return true; return true;
} }
if (insn->mode == MODE_64BIT) { if (insn->mode == MODE_64BIT) {
MCOperand_CreateReg0(mcInst, X86_RIP); // Section 2.2.1.6 if (insn->prefix3 == 0x67) // address-size prefix overrides RIP relative addressing
} else MCOperand_CreateReg0(mcInst, X86_EIP);
else
MCOperand_CreateReg0(mcInst, X86_RIP); // Section 2.2.1.6
} else {
MCOperand_CreateReg0(mcInst, 0); MCOperand_CreateReg0(mcInst, 0);
}
indexReg = 0; indexReg = 0;
break; break;
@ -445,7 +449,7 @@ static bool translateRMMemory(MCInst *mcInst, InternalInstruction *insn)
// placeholders to keep the compiler happy. // placeholders to keep the compiler happy.
#define ENTRY(x) \ #define ENTRY(x) \
case EA_BASE_##x: \ case EA_BASE_##x: \
MCOperand_CreateReg0(mcInst, X86_##x); break; MCOperand_CreateReg0(mcInst, X86_##x); break;
ALL_EA_BASES ALL_EA_BASES
#undef ENTRY #undef ENTRY
#define ENTRY(x) case EA_REG_##x: #define ENTRY(x) case EA_REG_##x: