SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386: Convert do_fldenv to X86Access

Browse Source 
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 00:14:48 -10:00
parent 4526f58a27
commit bc13c2dd01
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
target/i386/tcg/fpu_helper.c
View File

@ -2442,20 +2442,15 @@ static void cpu_set_fpus(CPUX86State *env, uint16_t fpus)
#endif #endif
} }
static void do_fldenv(CPUX86State *env, target_ulong ptr, int data32, static void do_fldenv(X86Access *ac, target_ulong ptr, int data32)
uintptr_t retaddr)
{ {
int i, fpus, fptag; int i, fpus, fptag;
CPUX86State *env = ac->env;
cpu_set_fpuc(env, access_ldw(ac, ptr));
fpus = access_ldw(ac, ptr + (2 << data32));
fptag = access_ldw(ac, ptr + (4 << data32));
if (data32) {
cpu_set_fpuc(env, cpu_lduw_data_ra(env, ptr, retaddr));
fpus = cpu_lduw_data_ra(env, ptr + 4, retaddr);
fptag = cpu_lduw_data_ra(env, ptr + 8, retaddr);
} else {
cpu_set_fpuc(env, cpu_lduw_data_ra(env, ptr, retaddr));
fpus = cpu_lduw_data_ra(env, ptr + 2, retaddr);
fptag = cpu_lduw_data_ra(env, ptr + 4, retaddr);
}
cpu_set_fpus(env, fpus); cpu_set_fpus(env, fpus);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
env->fptags[i] = ((fptag & 3) == 3); env->fptags[i] = ((fptag & 3) == 3);
@ -2465,7 +2460,10 @@ static void do_fldenv(CPUX86State *env, target_ulong ptr, int data32,
void helper_fldenv(CPUX86State *env, target_ulong ptr, int data32) void helper_fldenv(CPUX86State *env, target_ulong ptr, int data32)
{ {
do_fldenv(env, ptr, data32, GETPC()); X86Access ac;
access_prepare(&ac, env, ptr, 14 << data32, MMU_DATA_STORE, GETPC());
do_fldenv(&ac, ptr, data32);
} }
static void do_fsave(CPUX86State *env, target_ulong ptr, int data32, static void do_fsave(CPUX86State *env, target_ulong ptr, int data32,
@ -2499,12 +2497,12 @@ static void do_frstor(CPUX86State *env, target_ulong ptr, int data32,
{ {
X86Access ac; X86Access ac;
floatx80 tmp; floatx80 tmp;
int i; int i, envsize = 14 << data32;
do_fldenv(env, ptr, data32, retaddr); access_prepare(&ac, env, ptr, envsize + 80, MMU_DATA_LOAD, retaddr);
ptr += (target_ulong)14 << data32;
access_prepare(&ac, env, ptr, 80, MMU_DATA_LOAD, retaddr); do_fldenv(&ac, ptr, data32);
ptr += envsize;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
tmp = do_fldt(&ac, ptr); tmp = do_fldt(&ac, ptr);