From: Zide Chen <[email protected]> Cache EGPR[16] in CPUX86State to store APX's EGPR value.
Tested-by: Xudong Hao <[email protected]> Signed-off-by: Zide Chen <[email protected]> Co-developed-by: Zhao Liu <[email protected]> Signed-off-by: Zhao Liu <[email protected]> --- target/i386/cpu.h | 1 + target/i386/xsave_helper.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index bc7e16d6e6c1..48d4d7fcbb9c 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1969,6 +1969,7 @@ typedef struct CPUArchState { #ifdef TARGET_X86_64 uint8_t xtilecfg[64]; uint8_t xtiledata[8192]; + uint64_t egprs[EGPR_NUM]; #endif /* sysenter registers */ diff --git a/target/i386/xsave_helper.c b/target/i386/xsave_helper.c index 996e9f3bfef5..2e9265045520 100644 --- a/target/i386/xsave_helper.c +++ b/target/i386/xsave_helper.c @@ -140,6 +140,13 @@ void x86_cpu_xsave_all_areas(X86CPU *cpu, void *buf, uint32_t buflen) memcpy(tiledata, &env->xtiledata, sizeof(env->xtiledata)); } + + e = &x86_ext_save_areas[XSTATE_APX_BIT]; + if (e->size && e->offset && buflen) { + XSaveAPX *apx = buf + e->offset; + + memcpy(apx, &env->egprs, sizeof(env->egprs)); + } #endif } @@ -275,5 +282,12 @@ void x86_cpu_xrstor_all_areas(X86CPU *cpu, const void *buf, uint32_t buflen) memcpy(&env->xtiledata, tiledata, sizeof(env->xtiledata)); } + + e = &x86_ext_save_areas[XSTATE_APX_BIT]; + if (e->size && e->offset) { + const XSaveAPX *apx = buf + e->offset; + + memcpy(&env->egprs, apx, sizeof(env->egprs)); + } #endif } -- 2.34.1
