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

fixed compilation error

Browse Source
This commit is contained in:
Stanislav Shwartsman 2019-12-16 19:47:41 +00:00
parent 895c4b75df
commit eca847c8b3
2 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
bochs/cpu/cpu.h
View File

@ -4811,62 +4811,45 @@ public: // for now...
#if BX_CPU_LEVEL >= 6
BX_SMF Bit32u get_xcr0_allow_mask(void);
BX_SMF bx_bool xsave_x87_state_xinuse(void);
BX_SMF bx_bool xsave_sse_state_xinuse(void);
#if BX_SUPPORT_AVX
BX_SMF bx_bool xsave_ymm_state_xinuse(void);
#if BX_SUPPORT_EVEX
BX_SMF bx_bool xsave_opmask_state_xinuse(void);
BX_SMF bx_bool xsave_zmm_hi256_state_xinuse(void);
BX_SMF bx_bool xsave_hi_zmm_state_xinuse(void);
#endif
#endif
#if BX_SUPPORT_PKEYS
BX_SMF bx_bool xsave_pkru_state_xinuse(void);
#endif
BX_SMF Bit32u get_xinuse_vector(Bit32u requested_feature_bitmap);
BX_SMF bx_bool xsave_x87_state_xinuse(void);
BX_SMF void xsave_x87_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xsave_sse_state(bxInstruction_c *i, bx_address offset);
#if BX_SUPPORT_AVX
BX_SMF void xsave_ymm_state(bxInstruction_c *i, bx_address offset);
#if BX_SUPPORT_EVEX
BX_SMF void xsave_opmask_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xsave_zmm_hi256_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xsave_hi_zmm_state(bxInstruction_c *i, bx_address offset);
#endif
#endif
#if BX_SUPPORT_PKEYS
BX_SMF void xsave_pkru_state(bxInstruction_c *i, bx_address offset);
#endif
BX_SMF void xrstor_x87_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_sse_state(bxInstruction_c *i, bx_address offset);
#if BX_SUPPORT_AVX
BX_SMF void xrstor_ymm_state(bxInstruction_c *i, bx_address offset);
#if BX_SUPPORT_EVEX
BX_SMF void xrstor_opmask_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_zmm_hi256_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_hi_zmm_state(bxInstruction_c *i, bx_address offset);
#endif
#endif
#if BX_SUPPORT_PKEYS
BX_SMF void xrstor_pkru_state(bxInstruction_c *i, bx_address offset);
#endif
BX_SMF void xrstor_init_x87_state(void);
BX_SMF bx_bool xsave_sse_state_xinuse(void);
BX_SMF void xsave_sse_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_sse_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_init_sse_state(void);
#if BX_SUPPORT_AVX
BX_SMF bx_bool xsave_ymm_state_xinuse(void);
BX_SMF void xsave_ymm_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_ymm_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_init_ymm_state(void);
#if BX_SUPPORT_EVEX
BX_SMF bx_bool xsave_opmask_state_xinuse(void);
BX_SMF void xsave_opmask_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_opmask_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_init_opmask_state(void);
BX_SMF bx_bool xsave_zmm_hi256_state_xinuse(void);
BX_SMF void xsave_zmm_hi256_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_zmm_hi256_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_init_zmm_hi256_state(void);
BX_SMF bx_bool xsave_hi_zmm_state_xinuse(void);
BX_SMF void xsave_hi_zmm_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_hi_zmm_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_init_hi_zmm_state(void);
#endif
#endif
#if BX_SUPPORT_PKEYS
BX_SMF bx_bool xsave_pkru_state_xinuse(void);
BX_SMF void xsave_pkru_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_pkru_state(bxInstruction_c *i, bx_address offset);
BX_SMF void xrstor_init_pkru_state(void);
#endif
#endif

2
bochs/cpu/crregs.h
View File

@ -300,7 +300,7 @@ typedef void (*XSavePtr_tR)(bxInstruction_c *i, bx_address offset);
typedef void (*XRestorPtr_tR)(bxInstruction_c *i, bx_address offset);
typedef void (*XRestorInitPtr_tR)(void);
#else
typedef bx_bool (BX_CPU_C::*XsaveStateInUsePtr_tR)(void);
typedef bx_bool (BX_CPU_C::*XSaveStateInUsePtr_tR)(void);
typedef void (BX_CPU_C::*XSavePtr_tR)(bxInstruction_c *i, bx_address offset);
typedef void (BX_CPU_C::*XRestorPtr_tR)(bxInstruction_c *i, bx_address offset);
typedef void (BX_CPU_C::*XRestorInitPtr_tR)(void);