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

w/a compilation issue in gcc7

Browse Source
This commit is contained in:
Stanislav Shwartsman 2019-12-18 18:19:52 +00:00
parent 26b67c1942
commit 6b1992783e
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
bochs/cpu/crregs.cc
View File

@ -1642,28 +1642,28 @@ Bit32u BX_CPU_C::get_xcr0_allow_mask()
{
// XCR0[0]: x87 state
xsave_restore[xcr0_t::BX_XCR0_FPU_BIT].len = XSAVE_FPU_STATE_LEN;
xsave_restore[xcr0_t::BX_XCR0_FPU_BIT].xstate_in_use_method = xsave_x87_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_FPU_BIT].xsave_method = xsave_x87_state;
xsave_restore[xcr0_t::BX_XCR0_FPU_BIT].xrstor_method = xrstor_x87_state;
xsave_restore[xcr0_t::BX_XCR0_FPU_BIT].xrstor_init_method = xrstor_init_x87_state;
xsave_restore[xcr0_t::BX_XCR0_FPU_BIT].xstate_in_use_method = &xsave_x87_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_FPU_BIT].xsave_method = &xsave_x87_state;
xsave_restore[xcr0_t::BX_XCR0_FPU_BIT].xrstor_method = &xrstor_x87_state;
xsave_restore[xcr0_t::BX_XCR0_FPU_BIT].xrstor_init_method = &xrstor_init_x87_state;
// XCR0[1]: SSE state
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].len = XSAVE_SSE_STATE_LEN;
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].offset = XSAVE_SSE_STATE_OFFSET;
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].xstate_in_use_method = xsave_sse_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].xsave_method = xsave_sse_state;
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].xrstor_method = xrstor_sse_state;
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].xrstor_init_method = xrstor_init_sse_state;
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].xstate_in_use_method = &xsave_sse_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].xsave_method = &xsave_sse_state;
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].xrstor_method = &xrstor_sse_state;
xsave_restore[xcr0_t::BX_XCR0_SSE_BIT].xrstor_init_method = &xrstor_init_sse_state;
#if BX_SUPPORT_AVX
// XCR0[2]: YMM state
if (BX_CPUID_SUPPORT_ISA_EXTENSION(BX_ISA_AVX)) {
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].len = XSAVE_YMM_STATE_LEN;
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].offset = XSAVE_YMM_STATE_OFFSET;
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].xstate_in_use_method = xsave_ymm_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].xsave_method = xsave_ymm_state;
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].xrstor_method = xrstor_ymm_state;
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].xrstor_init_method = xrstor_init_ymm_state;
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].xstate_in_use_method = &xsave_ymm_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].xsave_method = &xsave_ymm_state;
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].xrstor_method = &xrstor_ymm_state;
xsave_restore[xcr0_t::BX_XCR0_YMM_BIT].xrstor_init_method = &xrstor_init_ymm_state;
}
#endif
@ -1675,26 +1675,26 @@ Bit32u BX_CPU_C::get_xcr0_allow_mask()
// XCR0[5]: OPMASK state
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].len = XSAVE_OPMASK_STATE_LEN;
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].offset = XSAVE_OPMASK_STATE_OFFSET;
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].xstate_in_use_method = xsave_opmask_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].xsave_method = xsave_opmask_state;
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].xrstor_method = xrstor_opmask_state;
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].xrstor_init_method = xrstor_init_opmask_state;
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].xstate_in_use_method = &xsave_opmask_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].xsave_method = &xsave_opmask_state;
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].xrstor_method = &xrstor_opmask_state;
xsave_restore[xcr0_t::BX_XCR0_OPMASK_BIT].xrstor_init_method = &xrstor_init_opmask_state;
// XCR0[6]: ZMM_HI256 state
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].len = XSAVE_ZMM_HI256_STATE_LEN;
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].offset = XSAVE_ZMM_HI256_STATE_OFFSET;
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].xstate_in_use_method = xsave_zmm_hi256_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].xsave_method = xsave_zmm_hi256_state;
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].xrstor_method = xrstor_zmm_hi256_state;
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].xrstor_init_method = xrstor_init_zmm_hi256_state;
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].xstate_in_use_method = &xsave_zmm_hi256_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].xsave_method = &xsave_zmm_hi256_state;
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].xrstor_method = &xrstor_zmm_hi256_state;
xsave_restore[xcr0_t::BX_XCR0_ZMM_HI256_BIT].xrstor_init_method = &xrstor_init_zmm_hi256_state;
// XCR0[7]: ZMM_HI state
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].len = XSAVE_HI_ZMM_STATE_LEN;
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].offset = XSAVE_HI_ZMM_STATE_OFFSET;
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].xstate_in_use_method = xsave_hi_zmm_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].xsave_method = xsave_hi_zmm_state;
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].xrstor_method = xrstor_hi_zmm_state;
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].xrstor_init_method = xrstor_init_hi_zmm_state;
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].xstate_in_use_method = &xsave_hi_zmm_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].xsave_method = &xsave_hi_zmm_state;
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].xrstor_method = &xrstor_hi_zmm_state;
xsave_restore[xcr0_t::BX_XCR0_HI_ZMM_BIT].xrstor_init_method = &xrstor_init_hi_zmm_state;
}
#endif
@ -1705,10 +1705,10 @@ Bit32u BX_CPU_C::get_xcr0_allow_mask()
// XCR0[9]: PKRU state
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].len = XSAVE_PKRU_STATE_LEN;
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].offset = XSAVE_PKRU_STATE_OFFSET;
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].xstate_in_use_method = xsave_pkru_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].xsave_method = xsave_pkru_state;
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].xrstor_method = xrstor_pkru_state;
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].xrstor_init_method = xrstor_init_pkru_state;
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].xstate_in_use_method = &xsave_pkru_state_xinuse;
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].xsave_method = &xsave_pkru_state;
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].xrstor_method = &xrstor_pkru_state;
xsave_restore[xcr0_t::BX_XCR0_PKRU_BIT].xrstor_init_method = &xrstor_init_pkru_state;
}
#endif