diff --git a/bochs/cpu/disasm.cc b/bochs/cpu/disasm.cc index 442469035..21f3eeea8 100644 --- a/bochs/cpu/disasm.cc +++ b/bochs/cpu/disasm.cc @@ -325,7 +325,7 @@ char* disasm(char *disbufptr, const bxInstruction_c *i, bx_address cs_base, bx_a } break; case BX_RDIREF: - disbufptr = dis_sprintf(disbufptr, "%s:", intel_segment_name[i->seg()]); + disbufptr = dis_sprintf(disbufptr, "%s:", intel_segment_name[BX_SEG_REG_ES]); #if BX_SUPPORT_X86_64 if (i->as64L()) { disbufptr = dis_sprintf(disbufptr, "[%s]", intel_general_64bit_regname[BX_64BIT_REG_RDI]); diff --git a/bochs/cpu/fetchdecode.cc b/bochs/cpu/fetchdecode.cc index 8838280b2..6adbab9fd 100644 --- a/bochs/cpu/fetchdecode.cc +++ b/bochs/cpu/fetchdecode.cc @@ -331,7 +331,7 @@ static const BxOpcodeInfo_t BxOpcodeInfo32[512*2] = { /* 97 /w */ { 0, BX_IA_XCHG_RXAX }, /* 98 /w */ { 0, BX_IA_CBW }, /* 99 /w */ { 0, BX_IA_CWD }, - /* 9A /w */ { BxImmediate_Iw | BxImmediate_Iw2, BX_IA_CALLFAR_Op16_Ap }, + /* 9A /w */ { BxImmediate_Iw | BxImmediate_Iw2, BX_IA_CALLF_Op16_Ap }, /* 9B /w */ { 0, BX_IA_FWAIT }, /* 9C /w */ { 0, BX_IA_PUSHF_Fw }, /* 9D /w */ { 0, BX_IA_POPF_Fw }, @@ -371,16 +371,16 @@ static const BxOpcodeInfo_t BxOpcodeInfo32[512*2] = { /* BF /w */ { BxImmediate_Iw, BX_IA_MOV_EwIw }, /* C0 /w */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfoG2EbIb }, /* C1 /w */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfoG2EwIb }, - /* C2 /w */ { BxImmediate_Iw, BX_IA_RET_near_Op16_Iw }, - /* C3 /w */ { 0, BX_IA_RET_near_Op16 }, + /* C2 /w */ { BxImmediate_Iw, BX_IA_RET_Op16_Iw }, + /* C3 /w */ { 0, BX_IA_RET_Op16 }, /* C4 /w */ { 0, BX_IA_LES_GwMp }, /* C5 /w */ { 0, BX_IA_LDS_GwMp }, /* C6 /w */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfoG11Eb }, /* C7 /w */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfoG11Ew }, /* C8 /w */ { BxImmediate_Iw | BxImmediate_Ib2, BX_IA_ENTER_Op16_IwIb }, /* C9 /w */ { 0, BX_IA_LEAVE_Op16 }, - /* CA /w */ { BxImmediate_Iw, BX_IA_RETfar_Op16_Iw }, - /* CB /w */ { 0, BX_IA_RETfar_Op16 }, + /* CA /w */ { BxImmediate_Iw, BX_IA_RETF_Op16_Iw }, + /* CB /w */ { 0, BX_IA_RETF_Op16 }, /* CC /w */ { 0, BX_IA_INT3 }, /* CD /w */ { BxImmediate_Ib, BX_IA_INT_Ib }, /* CE /w */ { 0, BX_IA_INTO }, @@ -422,7 +422,7 @@ static const BxOpcodeInfo_t BxOpcodeInfo32[512*2] = { /* E7 /w */ { BxImmediate_Ib, BX_IA_OUT_IbAX }, /* E8 /w */ { BxImmediate_BrOff16, BX_IA_CALL_Jw }, /* E9 /w */ { BxImmediate_BrOff16, BX_IA_JMP_Jw }, - /* EA /w */ { BxImmediate_Iw | BxImmediate_Iw2, BX_IA_JMPFAR_Ap }, + /* EA /w */ { BxImmediate_Iw | BxImmediate_Iw2, BX_IA_JMPF_Ap }, /* EB /w */ { BxImmediate_BrOff8, BX_IA_JMP_Jw }, /* EC /w */ { 0, BX_IA_IN_ALDX }, /* ED /w */ { 0, BX_IA_IN_AXDX }, @@ -876,7 +876,7 @@ static const BxOpcodeInfo_t BxOpcodeInfo32[512*2] = { /* 97 /d */ { 0, BX_IA_XCHG_ERXEAX }, /* 98 /d */ { 0, BX_IA_CWDE }, /* 99 /d */ { 0, BX_IA_CDQ }, - /* 9A /d */ { BxImmediate_Id | BxImmediate_Iw2, BX_IA_CALLFAR_Op32_Ap }, + /* 9A /d */ { BxImmediate_Id | BxImmediate_Iw2, BX_IA_CALLF_Op32_Ap }, /* 9B /d */ { 0, BX_IA_FWAIT }, /* 9C /d */ { 0, BX_IA_PUSHF_Fd }, /* 9D /d */ { 0, BX_IA_POPF_Fd }, @@ -916,16 +916,16 @@ static const BxOpcodeInfo_t BxOpcodeInfo32[512*2] = { /* BF /d */ { BxImmediate_Id, BX_IA_MOV_EdId }, /* C0 /d */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfoG2EbIb }, /* C1 /d */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfoG2EdIb }, - /* C2 /d */ { BxImmediate_Iw, BX_IA_RET_near_Op32_Iw }, - /* C3 /d */ { 0, BX_IA_RET_near_Op32 }, + /* C2 /d */ { BxImmediate_Iw, BX_IA_RET_Op32_Iw }, + /* C3 /d */ { 0, BX_IA_RET_Op32 }, /* C4 /d */ { 0, BX_IA_LES_GdMp }, /* C5 /d */ { 0, BX_IA_LDS_GdMp }, /* C6 /d */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfoG11Eb }, /* C7 /d */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfoG11Ed }, /* C8 /d */ { BxImmediate_Iw | BxImmediate_Ib2, BX_IA_ENTER_Op32_IwIb }, /* C9 /d */ { 0, BX_IA_LEAVE_Op32 }, - /* CA /d */ { BxImmediate_Iw, BX_IA_RETfar_Op32_Iw }, - /* CB /d */ { 0, BX_IA_RETfar_Op32 }, + /* CA /d */ { BxImmediate_Iw, BX_IA_RETF_Op32_Iw }, + /* CB /d */ { 0, BX_IA_RETF_Op32 }, /* CC /d */ { 0, BX_IA_INT3 }, /* CD /d */ { BxImmediate_Ib, BX_IA_INT_Ib }, /* CE /d */ { 0, BX_IA_INTO }, @@ -967,7 +967,7 @@ static const BxOpcodeInfo_t BxOpcodeInfo32[512*2] = { /* E7 /d */ { BxImmediate_Ib, BX_IA_OUT_IbEAX }, /* E8 /d */ { BxImmediate_BrOff32, BX_IA_CALL_Jd }, /* E9 /d */ { BxImmediate_BrOff32, BX_IA_JMP_Jd }, - /* EA /d */ { BxImmediate_Id | BxImmediate_Iw2, BX_IA_JMPFAR_Ap }, + /* EA /d */ { BxImmediate_Id | BxImmediate_Iw2, BX_IA_JMPF_Ap }, /* EB /d */ { BxImmediate_BrOff8, BX_IA_JMP_Jd }, /* EC /d */ { 0, BX_IA_IN_ALDX }, /* ED /d */ { 0, BX_IA_IN_EAXDX }, diff --git a/bochs/cpu/fetchdecode.h b/bochs/cpu/fetchdecode.h index abb6c5424..a2de5ffb6 100644 --- a/bochs/cpu/fetchdecode.h +++ b/bochs/cpu/fetchdecode.h @@ -516,9 +516,9 @@ static const BxOpcodeInfo_t BxOpcodeInfoG5w[8] = { /* 0 */ { BxLockable, BX_IA_INC_Ew }, /* 1 */ { BxLockable, BX_IA_DEC_Ew }, /* 2 */ { 0, BX_IA_CALL_Ew }, - /* 3 */ { 0, BX_IA_CALLFAR_Op16_Ep }, + /* 3 */ { 0, BX_IA_CALLF_Op16_Ep }, /* 4 */ { 0, BX_IA_JMP_Ew }, - /* 5 */ { 0, BX_IA_JMPFAR_Op16_Ep }, + /* 5 */ { 0, BX_IA_JMPF_Op16_Ep }, /* 6 */ { 0, BX_IA_PUSH_Ew }, /* 7 */ { 0, BX_IA_ERROR } }; @@ -528,9 +528,9 @@ static const BxOpcodeInfo_t BxOpcodeInfoG5d[8] = { /* 0 */ { BxLockable, BX_IA_INC_Ed }, /* 1 */ { BxLockable, BX_IA_DEC_Ed }, /* 2 */ { 0, BX_IA_CALL_Ed }, - /* 3 */ { 0, BX_IA_CALLFAR_Op32_Ep }, + /* 3 */ { 0, BX_IA_CALLF_Op32_Ep }, /* 4 */ { 0, BX_IA_JMP_Ed }, - /* 5 */ { 0, BX_IA_JMPFAR_Op32_Ep }, + /* 5 */ { 0, BX_IA_JMPF_Op32_Ep }, /* 6 */ { 0, BX_IA_PUSH_Ed }, /* 7 */ { 0, BX_IA_ERROR } }; @@ -540,9 +540,9 @@ static const BxOpcodeInfo_t BxOpcodeInfo64G5w[8] = { /* 0 */ { BxLockable, BX_IA_INC_Ew }, /* 1 */ { BxLockable, BX_IA_DEC_Ew }, /* 2 */ { 0, BX_IA_CALL_Eq }, - /* 3 */ { 0, BX_IA_CALLFAR_Op16_Ep }, + /* 3 */ { 0, BX_IA_CALLF_Op16_Ep }, /* 4 */ { 0, BX_IA_JMP_Eq }, - /* 5 */ { 0, BX_IA_JMPFAR_Op16_Ep }, + /* 5 */ { 0, BX_IA_JMPF_Op16_Ep }, /* 6 */ { 0, BX_IA_PUSH_Ew }, /* 7 */ { 0, BX_IA_ERROR } }; @@ -551,9 +551,9 @@ static const BxOpcodeInfo_t BxOpcodeInfo64G5d[8] = { /* 0 */ { BxLockable, BX_IA_INC_Ed }, /* 1 */ { BxLockable, BX_IA_DEC_Ed }, /* 2 */ { 0, BX_IA_CALL_Eq }, - /* 3 */ { 0, BX_IA_CALLFAR_Op32_Ep }, + /* 3 */ { 0, BX_IA_CALLF_Op32_Ep }, /* 4 */ { 0, BX_IA_JMP_Eq }, - /* 5 */ { 0, BX_IA_JMPFAR_Op32_Ep }, + /* 5 */ { 0, BX_IA_JMPF_Op32_Ep }, /* 6 */ { 0, BX_IA_PUSH_Eq }, /* 7 */ { 0, BX_IA_ERROR } }; @@ -562,9 +562,9 @@ static const BxOpcodeInfo_t BxOpcodeInfo64G5q[8] = { /* 0 */ { BxLockable, BX_IA_INC_Eq }, /* 1 */ { BxLockable, BX_IA_DEC_Eq }, /* 2 */ { 0, BX_IA_CALL_Eq }, - /* 3 */ { 0, BX_IA_CALLFAR_Op64_Ep }, // TODO: 64-bit offset for Intel + /* 3 */ { 0, BX_IA_CALLF_Op64_Ep }, // TODO: 64-bit offset for Intel /* 4 */ { 0, BX_IA_JMP_Eq }, - /* 5 */ { 0, BX_IA_JMPFAR_Op64_Ep }, // TODO: 64-bit offset for Intel + /* 5 */ { 0, BX_IA_JMPF_Op64_Ep }, // TODO: 64-bit offset for Intel /* 6 */ { 0, BX_IA_PUSH_Eq }, /* 7 */ { 0, BX_IA_ERROR } }; diff --git a/bochs/cpu/fetchdecode64.cc b/bochs/cpu/fetchdecode64.cc index 488b92a8c..97fa30c32 100644 --- a/bochs/cpu/fetchdecode64.cc +++ b/bochs/cpu/fetchdecode64.cc @@ -333,16 +333,16 @@ static const BxOpcodeInfo_t BxOpcodeInfo64[512*3] = { /* BF /w */ { BxImmediate_Iw, BX_IA_MOV_EwIw }, /* C0 /w */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfoG2EbIb }, /* C1 /w */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfoG2EwIb }, - /* C2 /w */ { BxImmediate_Iw, BX_IA_RET_near_Op64_Iw }, - /* C3 /w */ { 0, BX_IA_RET_near_Op64 }, + /* C2 /w */ { BxImmediate_Iw, BX_IA_RET_Op64_Iw }, + /* C3 /w */ { 0, BX_IA_RET_Op64 }, /* C4 /w */ { 0, BX_IA_ERROR }, /* C5 /w */ { 0, BX_IA_ERROR }, /* C6 /w */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfoG11Eb }, /* C7 /w */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfoG11Ew }, /* C8 /w */ { BxImmediate_Iw | BxImmediate_Ib2, BX_IA_ENTER_Op64_IwIb }, /* C9 /w */ { 0, BX_IA_LEAVE_Op64 }, - /* CA /w */ { BxImmediate_Iw, BX_IA_RETfar_Op16_Iw }, - /* CB /w */ { 0, BX_IA_RETfar_Op16 }, + /* CA /w */ { BxImmediate_Iw, BX_IA_RETF_Op16_Iw }, + /* CB /w */ { 0, BX_IA_RETF_Op16 }, /* CC /w */ { 0, BX_IA_INT3 }, /* CD /w */ { BxImmediate_Ib, BX_IA_INT_Ib }, /* CE /w */ { 0, BX_IA_ERROR }, @@ -848,16 +848,16 @@ static const BxOpcodeInfo_t BxOpcodeInfo64[512*3] = { /* BF /d */ { BxImmediate_Id, BX_IA_MOV_EdId }, /* C0 /d */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfoG2EbIb }, /* C1 /d */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfoG2EdIb }, - /* C2 /d */ { BxImmediate_Iw, BX_IA_RET_near_Op64_Iw }, - /* C3 /d */ { 0, BX_IA_RET_near_Op64 }, + /* C2 /d */ { BxImmediate_Iw, BX_IA_RET_Op64_Iw }, + /* C3 /d */ { 0, BX_IA_RET_Op64 }, /* C4 /d */ { 0, BX_IA_ERROR }, /* C5 /d */ { 0, BX_IA_ERROR }, /* C6 /d */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfoG11Eb }, /* C7 /d */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfoG11Ed }, /* C8 /d */ { BxImmediate_Iw | BxImmediate_Ib2, BX_IA_ENTER_Op64_IwIb }, /* C9 /d */ { 0, BX_IA_LEAVE_Op64 }, - /* CA /d */ { BxImmediate_Iw, BX_IA_RETfar_Op32_Iw }, - /* CB /d */ { 0, BX_IA_RETfar_Op32 }, + /* CA /d */ { BxImmediate_Iw, BX_IA_RETF_Op32_Iw }, + /* CB /d */ { 0, BX_IA_RETF_Op32 }, /* CC /d */ { 0, BX_IA_INT3 }, /* CD /d */ { BxImmediate_Ib, BX_IA_INT_Ib }, /* CE /d */ { 0, BX_IA_ERROR }, @@ -1363,16 +1363,16 @@ static const BxOpcodeInfo_t BxOpcodeInfo64[512*3] = { /* BF /q */ { BxImmediate_Iq, BX_IA_MOV_RRXIq }, /* C0 /q */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfoG2EbIb }, /* C1 /q */ { BxGroup2 | BxImmediate_Ib, BX_IA_ERROR, BxOpcodeInfo64G2EqIb }, - /* C2 /q */ { BxImmediate_Iw, BX_IA_RET_near_Op64_Iw }, - /* C3 /q */ { 0, BX_IA_RET_near_Op64 }, + /* C2 /q */ { BxImmediate_Iw, BX_IA_RET_Op64_Iw }, + /* C3 /q */ { 0, BX_IA_RET_Op64 }, /* C4 /q */ { 0, BX_IA_ERROR }, /* C5 /q */ { 0, BX_IA_ERROR }, /* C6 /q */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfoG11Eb }, /* C7 /q */ { BxGroup11, BX_IA_ERROR, BxOpcodeInfo64G11Eq }, /* C8 /q */ { BxImmediate_Iw | BxImmediate_Ib2, BX_IA_ENTER_Op64_IwIb }, /* C9 /q */ { 0, BX_IA_LEAVE_Op64 }, - /* CA /q */ { BxImmediate_Iw, BX_IA_RETfar_Op64_Iw }, - /* CB /q */ { 0, BX_IA_RETfar_Op64 }, + /* CA /q */ { BxImmediate_Iw, BX_IA_RETF_Op64_Iw }, + /* CB /q */ { 0, BX_IA_RETF_Op64 }, /* CC /q */ { 0, BX_IA_INT3 }, /* CD /q */ { BxImmediate_Ib, BX_IA_INT_Ib }, /* CE /q */ { 0, BX_IA_ERROR }, diff --git a/bochs/cpu/ia_opcodes.h b/bochs/cpu/ia_opcodes.h index 42f5488d6..069d2900e 100644 --- a/bochs/cpu/ia_opcodes.h +++ b/bochs/cpu/ia_opcodes.h @@ -271,10 +271,10 @@ bx_define_opcode(BX_IA_CALL_Ed, &BX_CPU_C::LOAD_Ed, &BX_CPU_C::CALL_EdR, 0, OP_E bx_define_opcode(BX_IA_CALL_Ew, &BX_CPU_C::LOAD_Ew, &BX_CPU_C::CALL_EwR, 0, OP_Ew, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_CALL_Jd, NULL, &BX_CPU_C::CALL_Jd, 0, OP_Jd, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_CALL_Jw, NULL, &BX_CPU_C::CALL_Jw, 0, OP_Jw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_CALLFAR_Op16_Ap, NULL, &BX_CPU_C::CALL16_Ap, 0, OP_Ap, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_CALLFAR_Op32_Ap, NULL, &BX_CPU_C::CALL32_Ap, 0, OP_Ap, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_CALLFAR_Op16_Ep, &BX_CPU_C::CALL16_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_CALLFAR_Op32_Ep, &BX_CPU_C::CALL32_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_CALLF_Op16_Ap, NULL, &BX_CPU_C::CALL16_Ap, 0, OP_Ap, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_CALLF_Op32_Ap, NULL, &BX_CPU_C::CALL32_Ap, 0, OP_Ap, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_CALLF_Op16_Ep, &BX_CPU_C::CALL16_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_CALLF_Op32_Ep, &BX_CPU_C::CALL32_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_CBW, NULL, &BX_CPU_C::CBW, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, 0) bx_define_opcode(BX_IA_CDQ, NULL, &BX_CPU_C::CDQ, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, 0) @@ -324,10 +324,9 @@ bx_define_opcode(BX_IA_JMP_Ew, &BX_CPU_C::LOAD_Ew, &BX_CPU_C::JMP_EwR, 0, OP_Ew, bx_define_opcode(BX_IA_JMP_Jw, NULL, &BX_CPU_C::JMP_Jw, 0, OP_Jw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_JMP_Jd, NULL, &BX_CPU_C::JMP_Jd, 0, OP_Jd, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_JMPFAR_Ap, NULL, &BX_CPU_C::JMP_Ap, 0, OP_Ap, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) - -bx_define_opcode(BX_IA_JMPFAR_Op16_Ep, &BX_CPU_C::JMP16_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_JMPFAR_Op32_Ep, &BX_CPU_C::JMP32_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_JMPF_Ap, NULL, &BX_CPU_C::JMP_Ap, 0, OP_Ap, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_JMPF_Op16_Ep, &BX_CPU_C::JMP16_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_JMPF_Op32_Ep, &BX_CPU_C::JMP32_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_JCXZ_Jb, NULL, &BX_CPU_C::JCXZ_Jb, 0, OP_Jw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_JECXZ_Jb, NULL, &BX_CPU_C::JECXZ_Jb, 0, OP_Jd, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) @@ -490,15 +489,15 @@ bx_define_opcode(BX_IA_REP_STOSB_YbAL, NULL, &BX_CPU_C::REP_STOSB_YbAL, 0, OP_Yb bx_define_opcode(BX_IA_REP_STOSD_YdEAX, NULL, &BX_CPU_C::REP_STOSD_YdEAX, 0, OP_Yd, OP_EAXReg, OP_NONE, OP_NONE, 0) bx_define_opcode(BX_IA_REP_STOSW_YwAX, NULL, &BX_CPU_C::REP_STOSW_YwAX, 0, OP_Yw, OP_AXReg, OP_NONE, OP_NONE, 0) -bx_define_opcode(BX_IA_RETfar_Op16, NULL, &BX_CPU_C::RETfar16_Iw, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RETfar_Op16_Iw, NULL, &BX_CPU_C::RETfar16_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RETfar_Op32, NULL, &BX_CPU_C::RETfar32_Iw, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RETfar_Op32_Iw, NULL, &BX_CPU_C::RETfar32_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RETF_Op16, NULL, &BX_CPU_C::RETfar16_Iw, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RETF_Op16_Iw, NULL, &BX_CPU_C::RETfar16_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RETF_Op32, NULL, &BX_CPU_C::RETfar32_Iw, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RETF_Op32_Iw, NULL, &BX_CPU_C::RETfar32_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RET_near_Op16, NULL, &BX_CPU_C::RETnear16, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RET_near_Op16_Iw, NULL, &BX_CPU_C::RETnear16_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RET_near_Op32, NULL, &BX_CPU_C::RETnear32, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RET_near_Op32_Iw, NULL, &BX_CPU_C::RETnear32_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RET_Op16, NULL, &BX_CPU_C::RETnear16, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RET_Op16_Iw, NULL, &BX_CPU_C::RETnear16_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RET_Op32, NULL, &BX_CPU_C::RETnear32, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RET_Op32_Iw, NULL, &BX_CPU_C::RETnear32_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_NOT_Eb, &BX_CPU_C::NOT_EbM, &BX_CPU_C::NOT_EbR, 0, OP_Eb, OP_NONE, OP_NONE, OP_NONE, 0) bx_define_opcode(BX_IA_NEG_Eb, &BX_CPU_C::NEG_EbM, &BX_CPU_C::NEG_EbR, 0, OP_Eb, OP_NONE, OP_NONE, OP_NONE, 0) @@ -1451,9 +1450,9 @@ bx_define_opcode(BX_IA_INC_Eq, &BX_CPU_C::INC_EqM, &BX_CPU_C::INC_EqR, 0, OP_Eq, bx_define_opcode(BX_IA_DEC_Eq, &BX_CPU_C::DEC_EqM, &BX_CPU_C::DEC_EqR, 0, OP_Eq, OP_NONE, OP_NONE, OP_NONE, 0) bx_define_opcode(BX_IA_CALL_Eq, &BX_CPU_C::LOAD_Eq, &BX_CPU_C::CALL_EqR, 0, OP_Eq, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_CALLFAR_Op64_Ep, &BX_CPU_C::CALL64_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_CALLF_Op64_Ep, &BX_CPU_C::CALL64_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_JMP_Eq, &BX_CPU_C::LOAD_Eq, &BX_CPU_C::JMP_EqR, 0, OP_Eq, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_JMPFAR_Op64_Ep, &BX_CPU_C::JMP64_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_JMPF_Op64_Ep, &BX_CPU_C::JMP64_Ep, &BX_CPU_C::BxError, 0, OP_M, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_PUSHF_Fq, NULL, &BX_CPU_C::PUSHF_Fq, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, 0) bx_define_opcode(BX_IA_POPF_Fq, NULL, &BX_CPU_C::POPF_Fq, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) @@ -1462,10 +1461,10 @@ bx_define_opcode(BX_IA_CDQE, NULL, &BX_CPU_C::CDQE, 0, OP_NONE, OP_NONE, OP_NONE bx_define_opcode(BX_IA_CQO, NULL, &BX_CPU_C::CQO, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, 0) bx_define_opcode(BX_IA_XADD_EqGq, &BX_CPU_C::XADD_EqGqM, &BX_CPU_C::XADD_EqGqR, 0, OP_Eq, OP_Gq, OP_NONE, OP_NONE, 0) -bx_define_opcode(BX_IA_RET_near_Op64_Iw, NULL, &BX_CPU_C::RETnear64_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RET_near_Op64, NULL, &BX_CPU_C::RETnear64, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RETfar_Op64_Iw, NULL, &BX_CPU_C::RETfar64_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) -bx_define_opcode(BX_IA_RETfar_Op64, NULL, &BX_CPU_C::RETfar64_Iw, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RET_Op64_Iw, NULL, &BX_CPU_C::RETnear64_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RET_Op64, NULL, &BX_CPU_C::RETnear64, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RETF_Op64_Iw, NULL, &BX_CPU_C::RETfar64_Iw, 0, OP_Iw, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) +bx_define_opcode(BX_IA_RETF_Op64, NULL, &BX_CPU_C::RETfar64_Iw, 0, OP_NONE, OP_NONE, OP_NONE, OP_NONE, BX_TRACE_END) bx_define_opcode(BX_IA_CMOVO_GqEq, &BX_CPU_C::LOAD_Eq, &BX_CPU_C::CMOVO_GqEqR, 0, OP_Gq, OP_Eq, OP_NONE, OP_NONE, 0) bx_define_opcode(BX_IA_CMOVNO_GqEq, &BX_CPU_C::LOAD_Eq, &BX_CPU_C::CMOVNO_GqEqR, 0, OP_Gq, OP_Eq, OP_NONE, OP_NONE, 0) diff --git a/bochs/disasm/opcodes.inc b/bochs/disasm/opcodes.inc index 6ede3447b..6ce023892 100644 --- a/bochs/disasm/opcodes.inc +++ b/bochs/disasm/opcodes.inc @@ -568,9 +568,9 @@ Ia_lahf = { "lahf", "lahf", XX, XX, XX, XX, 0 }, Ia_larl_Gd_Ew = { "lar", "larl", Gd, Ew, XX, XX, 0 }, Ia_larq_Gq_Ew = { "lar", "larq", Gq, Ew, XX, XX, 0 }, Ia_larw_Gw_Ew = { "lar", "larw", Gw, Ew, XX, XX, 0 }, -Ia_lcall_Apd = { "callfar", "lcall", Apd, XX, XX, XX, 0 }, -Ia_lcall_Apw = { "callfar", "lcall", Apw, XX, XX, XX, 0 }, -Ia_lcall_Mp = { "callfar", "lcall", Mp, XX, XX, XX, 0 }, +Ia_lcall_Apd = { "callf", "lcall", Apd, XX, XX, XX, 0 }, +Ia_lcall_Apw = { "callf", "lcall", Apw, XX, XX, XX, 0 }, +Ia_lcall_Mp = { "callf", "lcall", Mp, XX, XX, XX, 0 }, Ia_lddqu_Vdq_Mdq = { "lddqu", "lddqu", Vdq, Mdq, XX, XX, IA_SSE3 }, Ia_ldmxcsr = { "ldmxcsr", "ldmxcsr", Md, XX, XX, XX, IA_SSE }, Ia_ldsl_Gd_Mp = { "lds", "ldsl", Gd, Mp, XX, XX, 0 }, @@ -590,9 +590,9 @@ Ia_lgsl_Gd_Mp = { "lgs", "lgsl", Gd, Mp, XX, XX, 0 }, Ia_lgsq_Gq_Mp = { "lgs", "lgsq", Gq, Mp, XX, XX, 0 }, Ia_lgsw_Gw_Mp = { "lgs", "lgsw", Gw, Mp, XX, XX, 0 }, Ia_lidt = { "lidt", "lidt", Ms, XX, XX, XX, 0 }, -Ia_ljmp_Apd = { "jmpfar", "ljmp", Apd, XX, XX, XX, 0 }, -Ia_ljmp_Apw = { "jmpfar", "ljmp", Apw, XX, XX, XX, 0 }, -Ia_ljmp_Mp = { "jmpfar", "ljmp", Mp, XX, XX, XX, 0 }, +Ia_ljmp_Apd = { "jmpf", "ljmp", Apd, XX, XX, XX, 0 }, +Ia_ljmp_Apw = { "jmpf", "ljmp", Apw, XX, XX, XX, 0 }, +Ia_ljmp_Mp = { "jmpf", "ljmp", Mp, XX, XX, XX, 0 }, Ia_lldt = { "lldt", "lldt", Ew, XX, XX, XX, 0 }, Ia_lmsw_Ew = { "lmsw", "lmsw", Ew, XX, XX, XX, 0 }, Ia_lodsb_AL_Xb = { "lodsb", "lodsb", AL_Reg, Xb, XX, XX, 0 },