mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compile disasm module when x86-64 is not compiled in

Browse Source
This commit is contained in:
Stanislav Shwartsman 2016-05-12 11:16:05 +00:00
parent 12ece81e19
commit 09e6ee3143
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bochs/cpu/decoder.h
View File

@ -178,7 +178,6 @@ enum BxRegs16 {
BX_16BIT_REG_R14,
BX_16BIT_REG_R15,
#endif
BX_16BIT_REG_IP,
};
enum BxRegs32 {
@ -200,7 +199,6 @@ enum BxRegs32 {
BX_32BIT_REG_R14,
BX_32BIT_REG_R15,
#endif
BX_32BIT_REG_EIP,
};
#if BX_SUPPORT_X86_64
@ -221,7 +219,6 @@ enum BxRegs64 {
BX_64BIT_REG_R13,
BX_64BIT_REG_R14,
BX_64BIT_REG_R15,
BX_64BIT_REG_RIP,
};
#endif
@ -231,6 +228,10 @@ enum BxRegs64 {
# define BX_GENERAL_REGISTERS 8
#endif
#define BX_16BIT_REG_IP (BX_GENERAL_REGISTERS)
#define BX_32BIT_REG_EIP (BX_GENERAL_REGISTERS)
#define BX_64BIT_REG_RIP (BX_GENERAL_REGISTERS)
#define BX_TMP_REGISTER (BX_GENERAL_REGISTERS+1)
#define BX_NIL_REGISTER (BX_GENERAL_REGISTERS+2)

7
bochs/disasm/dis_groups.cc
View File

@ -29,6 +29,13 @@
#endif
*/
#if BX_SUPPORT_X86_64 == 0
#define BX_64BIT_REG_RAX BX_32BIT_REG_EAX
#define BX_64BIT_REG_RCX BX_32BIT_REG_ECX
#define BX_64BIT_REG_RSI BX_32BIT_REG_ESI
#define BX_64BIT_REG_RDI BX_32BIT_REG_EDI
#endif
void disassembler::Apw(const x86_insn *insn)
{
Bit16u imm16 = fetch_word();