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

fixed compilation errors with FPU off

Browse Source
This commit is contained in:
Stanislav Shwartsman 2014-04-29 18:49:38 +00:00
parent c6969d22cb
commit 8fbf673295
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bochs/bx_debug/dbg_main.cc
View File

@ -1194,11 +1194,16 @@ void bx_dbg_info_registers_command(int which_regs_mask)
else
#endif
{
#if BX_SUPPORT_AVX
if (which_regs_mask & BX_INFO_YMM_REGS) {
bx_dbg_print_avx_state(BX_VL256);
}
else if (which_regs_mask & BX_INFO_SSE_REGS) {
bx_dbg_print_sse_state();
else
#endif
{
if (which_regs_mask & BX_INFO_SSE_REGS) {
bx_dbg_print_sse_state();
}
}
}
}

2
bochs/cpu/disasm.cc
View File

@ -98,9 +98,11 @@ char *resolve_sib_scale(char *disbufptr, const bxInstruction_c *i, const char *r
{
unsigned sib_index = i->sibIndex(), sib_scale = i->sibScale();
#if BX_SUPPORT_AVX
if (src_index == BX_SRC_VSIB)
disbufptr = dis_sprintf(disbufptr, "%s%d", intel_vector_reg_name[i->getVL() - 1], sib_index);
else
#endif
disbufptr = dis_sprintf(disbufptr, "%s", regname[sib_index]);
if (sib_scale)

38
bochs/cpu/fetchdecode.cc
View File

@ -403,14 +403,14 @@ static const BxOpcodeInfo_t BxOpcodeInfo32[512*2] = {
/* DE /w */ { BxFPEscape, BX_IA_ERROR, BxOpcodeInfo_FloatingPointDE },
/* DF /w */ { BxFPEscape, BX_IA_ERROR, BxOpcodeInfo_FloatingPointDF },
#else
/* D8 /w */ { 0, BX_IA_FPU_ESC },
/* D9 /w */ { 0, BX_IA_FPU_ESC },
/* DA /w */ { 0, BX_IA_FPU_ESC },
/* DB /w */ { 0, BX_IA_FPU_ESC },
/* DC /w */ { 0, BX_IA_FPU_ESC },
/* DD /w */ { 0, BX_IA_FPU_ESC },
/* DE /w */ { 0, BX_IA_FPU_ESC },
/* DF /w */ { 0, BX_IA_FPU_ESC },
/* D8 /w */ { 0, BX_IA_FPUESC },
/* D9 /w */ { 0, BX_IA_FPUESC },
/* DA /w */ { 0, BX_IA_FPUESC },
/* DB /w */ { 0, BX_IA_FPUESC },
/* DC /w */ { 0, BX_IA_FPUESC },
/* DD /w */ { 0, BX_IA_FPUESC },
/* DE /w */ { 0, BX_IA_FPUESC },
/* DF /w */ { 0, BX_IA_FPUESC },
#endif
/* E0 /w */ { BxImmediate_BrOff8, BX_IA_LOOPNE_Op16_Jb },
/* E1 /w */ { BxImmediate_BrOff8, BX_IA_LOOPE_Op16_Jb },
@ -948,14 +948,14 @@ static const BxOpcodeInfo_t BxOpcodeInfo32[512*2] = {
/* DE /d */ { BxFPEscape, BX_IA_ERROR, BxOpcodeInfo_FloatingPointDE },
/* DF /d */ { BxFPEscape, BX_IA_ERROR, BxOpcodeInfo_FloatingPointDF },
#else
/* D8 /d */ { 0, BX_IA_FPU_ESC },
/* D9 /d */ { 0, BX_IA_FPU_ESC },
/* DA /d */ { 0, BX_IA_FPU_ESC },
/* DB /d */ { 0, BX_IA_FPU_ESC },
/* DC /d */ { 0, BX_IA_FPU_ESC },
/* DD /d */ { 0, BX_IA_FPU_ESC },
/* DE /d */ { 0, BX_IA_FPU_ESC },
/* DF /d */ { 0, BX_IA_FPU_ESC },
/* D8 /d */ { 0, BX_IA_FPUESC },
/* D9 /d */ { 0, BX_IA_FPUESC },
/* DA /d */ { 0, BX_IA_FPUESC },
/* DB /d */ { 0, BX_IA_FPUESC },
/* DC /d */ { 0, BX_IA_FPUESC },
/* DD /d */ { 0, BX_IA_FPUESC },
/* DE /d */ { 0, BX_IA_FPUESC },
/* DF /d */ { 0, BX_IA_FPUESC },
#endif
/* E0 /d */ { BxImmediate_BrOff8, BX_IA_LOOPNE_Op32_Jb },
/* E1 /d */ { BxImmediate_BrOff8, BX_IA_LOOPE_Op32_Jb },
@ -1862,7 +1862,11 @@ modrm_done:
i->setSrcReg(n, rm);
}
else {
i->setSrcReg(n, (type == BX_VMM_REG) ? BX_VECTOR_TMP_REGISTER : BX_TMP_REGISTER);
unsigned tmpreg = BX_TMP_REGISTER;
#if BX_SUPPORT_FPU
if (type == BX_VMM_REG) tmpreg = BX_VECTOR_TMP_REGISTER;
#endif
i->setSrcReg(n, tmpreg);
#if BX_SUPPORT_EVEX
if (b1 == 0x62 && type == BX_GPR32 && displ8) {
if (i->as32L())