motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/i386: Pass host pointer and size to cpu_x86_{fxsave,fxrstor}

Browse source 
We have already validated the memory region in the course of
validating the signal frame.  No need to do it again within
the helper function.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-04-08 17:57:11 -10:00
parent 76d8d0f85c
commit 9c2fb9e1d5
3 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
linux-user/i386/signal.c
View file

@ -294,14 +294,11 @@ static abi_ptr get_sigframe(struct target_sigaction *ka, CPUX86State *env,
* Set up a signal frame. * Set up a signal frame.
*/ */
static void fxsave_sigcontext(CPUX86State *env, X86LegacyXSaveArea *fxstate, static void fxsave_sigcontext(CPUX86State *env, X86LegacyXSaveArea *fxstate)
abi_ptr fxstate_addr)
{ {
struct target_fpx_sw_bytes *sw = (void *)&fxstate->sw_reserved; struct target_fpx_sw_bytes *sw = (void *)&fxstate->sw_reserved;
/* fxstate_addr must be 16 byte aligned for fxsave */ cpu_x86_fxsave(env, fxstate, sizeof(*fxstate));
assert(!(fxstate_addr & 0xf));
cpu_x86_fxsave(env, fxstate_addr);
__put_user(0, &sw->magic1); __put_user(0, &sw->magic1);
} }
@ -412,7 +409,7 @@ static void setup_sigcontext(CPUX86State *env,
xsave_sigcontext(env, fxstate, fpstate_addr, fxstate_addr, fpend_addr); xsave_sigcontext(env, fxstate, fpstate_addr, fxstate_addr, fpend_addr);
break; break;
case FPSTATE_FXSAVE: case FPSTATE_FXSAVE:
fxsave_sigcontext(env, fxstate, fxstate_addr); fxsave_sigcontext(env, fxstate);
break; break;
default: default:
break; break;
@ -669,7 +666,7 @@ static bool xrstor_sigcontext(CPUX86State *env, FPStateKind fpkind,
break; break;
} }
cpu_x86_fxrstor(env, fxstate_addr); cpu_x86_fxrstor(env, fxstate, sizeof(*fxstate));
return true; return true;
} }
@ -687,7 +684,7 @@ static bool frstor_sigcontext(CPUX86State *env, FPStateKind fpkind,
} }
break; break;
case FPSTATE_FXSAVE: case FPSTATE_FXSAVE:
cpu_x86_fxrstor(env, fxstate_addr); cpu_x86_fxrstor(env, fxstate, sizeof(*fxstate));
break; break;
case FPSTATE_FSAVE: case FPSTATE_FSAVE:
break; break;

4
target/i386/cpu.h
View file

@ -2273,8 +2273,8 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector,
void cpu_x86_load_seg(CPUX86State *s, X86Seg seg_reg, int selector); void cpu_x86_load_seg(CPUX86State *s, X86Seg seg_reg, int selector);
void cpu_x86_fsave(CPUX86State *s, void *host, size_t len); void cpu_x86_fsave(CPUX86State *s, void *host, size_t len);
void cpu_x86_frstor(CPUX86State *s, void *host, size_t len); void cpu_x86_frstor(CPUX86State *s, void *host, size_t len);
void cpu_x86_fxsave(CPUX86State *s, target_ulong ptr); void cpu_x86_fxsave(CPUX86State *s, void *host, size_t len);
void cpu_x86_fxrstor(CPUX86State *s, target_ulong ptr); void cpu_x86_fxrstor(CPUX86State *s, void *host, size_t len);
void cpu_x86_xsave(CPUX86State *s, target_ulong ptr, uint64_t rbfm); void cpu_x86_xsave(CPUX86State *s, target_ulong ptr, uint64_t rbfm);
void cpu_x86_xrstor(CPUX86State *s, target_ulong ptr, uint64_t rbfm); void cpu_x86_xrstor(CPUX86State *s, target_ulong ptr, uint64_t rbfm);

26
target/i386/tcg/fpu_helper.c
View file

@ -3041,22 +3041,28 @@ void cpu_x86_frstor(CPUX86State *env, void *host, size_t len)
do_frstor(&ac, 0, true); do_frstor(&ac, 0, true);
} }
void cpu_x86_fxsave(CPUX86State *env, target_ulong ptr) void cpu_x86_fxsave(CPUX86State *env, void *host, size_t len)
{ {
X86Access ac; X86Access ac = {
.haddr1 = host,
.size = sizeof(X86LegacyXSaveArea),
.env = env,
};
access_prepare(&ac, env, ptr, sizeof(X86LegacyXSaveArea), assert(ac.size <= len);
MMU_DATA_STORE, 0); do_fxsave(&ac, 0);
do_fxsave(&ac, ptr);
} }
void cpu_x86_fxrstor(CPUX86State *env, target_ulong ptr) void cpu_x86_fxrstor(CPUX86State *env, void *host, size_t len)
{ {
X86Access ac; X86Access ac = {
.haddr1 = host,
.size = sizeof(X86LegacyXSaveArea),
.env = env,
};
access_prepare(&ac, env, ptr, sizeof(X86LegacyXSaveArea), assert(ac.size <= len);
MMU_DATA_LOAD, 0); do_fxrstor(&ac, 0);
do_fxrstor(&ac, ptr);
} }
void cpu_x86_xsave(CPUX86State *env, target_ulong ptr, uint64_t rfbm) void cpu_x86_xsave(CPUX86State *env, target_ulong ptr, uint64_t rfbm)