ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/i386: Update FP ops to new api

This commit is contained in:
Matt Borgerson 2025-01-06 04:08:54 -07:00
parent 15be872de2
commit 3094d09fd4
2 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/i386/ops_fpu.h
View File

@ -22,7 +22,6 @@
#define PREC_SUFFIX glue(_, fPREC) #define PREC_SUFFIX glue(_, fPREC)
#define PREC_TYPE glue(TCGv_, fPREC) #define PREC_TYPE glue(TCGv_, fPREC)
#define tcg_temp_new_fp glue(tcg_temp_new_, fPREC) #define tcg_temp_new_fp glue(tcg_temp_new_, fPREC)
#define tcg_temp_free_fp glue(tcg_temp_free_, fPREC)
#define tcg_gen_st80f_fp glue(tcg_gen_st80f, PREC_SUFFIX) #define tcg_gen_st80f_fp glue(tcg_gen_st80f, PREC_SUFFIX)
#define tcg_gen_ld80f_fp glue(tcg_gen_ld80f, PREC_SUFFIX) #define tcg_gen_ld80f_fp glue(tcg_gen_ld80f, PREC_SUFFIX)
#define get_ft0 glue(get_ft0, PREC_SUFFIX) #define get_ft0 glue(get_ft0, PREC_SUFFIX)
@ -39,7 +38,6 @@ static PREC_TYPE get_ft0(DisasContext *s)
*v = tcg_temp_new_fp(); *v = tcg_temp_new_fp();
TCGv_ptr p = gen_ft0_ptr(); TCGv_ptr p = gen_ft0_ptr();
tcg_gen_ld80f_fp(*v, p); tcg_gen_ld80f_fp(*v, p);
tcg_temp_free_ptr(p);
} }
return *v; return *v;
@ -56,7 +54,6 @@ static PREC_TYPE get_stn(DisasContext *s, int opreg)
*t = tcg_temp_new_fp(); *t = tcg_temp_new_fp();
TCGv_ptr p = gen_stn_ptr(opreg); TCGv_ptr p = gen_stn_ptr(opreg);
tcg_gen_ld80f_fp(*t, p); tcg_gen_ld80f_fp(*t, p);
tcg_temp_free_ptr(p);
} }
return *t; return *t;
@ -74,8 +71,6 @@ static void glue(flush_fp_regs, PREC_SUFFIX)(DisasContext *s)
if (*t) { if (*t) {
TCGv_ptr ptr = gen_stn_ptr(i); TCGv_ptr ptr = gen_stn_ptr(i);
tcg_gen_st80f_fp(*t, ptr); tcg_gen_st80f_fp(*t, ptr);
tcg_temp_free_fp(*t);
tcg_temp_free_ptr(ptr);
*t = NULL; *t = NULL;
} }
} }
@ -83,7 +78,6 @@ static void glue(flush_fp_regs, PREC_SUFFIX)(DisasContext *s)
if (s->ft0) { if (s->ft0) {
TCGv_ptr ptr = gen_ft0_ptr(); TCGv_ptr ptr = gen_ft0_ptr();
tcg_gen_st80f_fp((PREC_TYPE)s->ft0, ptr); tcg_gen_st80f_fp((PREC_TYPE)s->ft0, ptr);
tcg_temp_free_ptr(ptr);
s->ft0 = NULL; s->ft0 = NULL;
} }
} }
@ -92,7 +86,6 @@ static void glue(gen_fpop, PREC_SUFFIX)(DisasContext *s)
{ {
PREC_TYPE *t = (PREC_TYPE *)&s->fpregs[s->fpstt_delta & 7]; PREC_TYPE *t = (PREC_TYPE *)&s->fpregs[s->fpstt_delta & 7];
if (*t) { if (*t) {
tcg_temp_free_fp(*t);
*t = NULL; *t = NULL;
} }
} }
@ -123,13 +116,11 @@ static void glue(gen_fcom, PREC_SUFFIX)(DisasContext *s, PREC_TYPE arg1,
tcg_gen_shli_i64(res, res, 8); tcg_gen_shli_i64(res, res, 8);
TCGv_i64 fpus = tcg_temp_new_i64(); TCGv_i64 fpus = tcg_temp_new_i64();
tcg_gen_ld16u_i64(fpus, cpu_env, offsetof(CPUX86State, fpus)); tcg_gen_ld16u_i64(fpus, tcg_env, offsetof(CPUX86State, fpus));
tcg_gen_andi_i64(fpus, fpus, ~0x4500); tcg_gen_andi_i64(fpus, fpus, ~0x4500);
tcg_gen_or_i64(fpus, fpus, res); tcg_gen_or_i64(fpus, fpus, res);
tcg_gen_st16_i64(fpus, cpu_env, offsetof(CPUX86State, fpus)); tcg_gen_st16_i64(fpus, tcg_env, offsetof(CPUX86State, fpus));
tcg_temp_free_i64(fpus);
tcg_temp_free_i64(res);
/* FIXME: Exceptions */ /* FIXME: Exceptions */
} }

43
target/i386/tcg/translate.c
View File

@ -1459,16 +1459,15 @@ static TCGv_ptr gen_stn_ptr(int opreg)
tcg_gen_addi_i32(offset, offset, offsetof(CPUX86State, fpregs[0].d)); tcg_gen_addi_i32(offset, offset, offsetof(CPUX86State, fpregs[0].d));
TCGv_ptr ptr = tcg_temp_new_ptr(); TCGv_ptr ptr = tcg_temp_new_ptr();
tcg_gen_ext_i32_ptr(ptr, offset); tcg_gen_ext_i32_ptr(ptr, offset);
tcg_gen_add_ptr(ptr, ptr, cpu_env); tcg_gen_add_ptr(ptr, ptr, tcg_env);
tcg_temp_free_i32(offset);
return ptr; return ptr;
} }
static TCGv_ptr gen_ft0_ptr(void) static TCGv_ptr gen_ft0_ptr(void)
{ {
TCGv_ptr ft0 = tcg_temp_new_ptr(); TCGv_ptr ft0 = tcg_temp_new_ptr();
tcg_gen_addi_ptr(ft0, cpu_env, offsetof(CPUX86State, ft0)); tcg_gen_addi_ptr(ft0, tcg_env, offsetof(CPUX86State, ft0));
return ft0; return ft0;
} }
@ -1476,11 +1475,9 @@ static void gen_set_fptag(int offs, int value)
{ {
TCGv_ptr p = tcg_temp_new_ptr(); TCGv_ptr p = tcg_temp_new_ptr();
tcg_gen_ext_i32_ptr(p, fpstt); tcg_gen_ext_i32_ptr(p, fpstt);
tcg_gen_add_ptr(p, cpu_env, p); tcg_gen_add_ptr(p, tcg_env, p);
TCGv_i32 tmp = tcg_constant_i32(value); TCGv_i32 tmp = tcg_constant_i32(value);
tcg_gen_st8_i32(tmp, p, offsetof(CPUX86State, fptags[0]) + offs); tcg_gen_st8_i32(tmp, p, offsetof(CPUX86State, fptags[0]) + offs);
tcg_temp_free_i32(tmp);
tcg_temp_free_ptr(p);
} }
static bool fpu_using_double_precision(DisasContext *s) static bool fpu_using_double_precision(DisasContext *s)
@ -1510,12 +1507,11 @@ static void gen_flcr(DisasContext *s)
} }
TCGv_i32 v = tcg_temp_new_i32(); TCGv_i32 v = tcg_temp_new_i32();
tcg_gen_ld16u_i32(v, cpu_env, offsetof(CPUX86State, fpuc)); tcg_gen_ld16u_i32(v, tcg_env, offsetof(CPUX86State, fpuc));
tcg_gen_andi_i32(v, v, 0xc00); tcg_gen_andi_i32(v, v, 0xc00);
tcg_gen_shli_i32(v, v, 3); tcg_gen_shli_i32(v, v, 3);
tcg_gen_ori_i32(v, v, 0x1f80); tcg_gen_ori_i32(v, v, 0x1f80);
tcg_gen_flcr(v); tcg_gen_flcr(v);
tcg_temp_free_i32(v);
s->flcr_set = true; s->flcr_set = true;
} }
@ -1524,7 +1520,6 @@ static void gen_mov32f_i64(TCGv_i64 ret, TCGv_f32 arg)
TCGv_f64 t = tcg_temp_new_f64(); TCGv_f64 t = tcg_temp_new_f64();
tcg_gen_cvt32f_f64(t, arg); tcg_gen_cvt32f_f64(t, arg);
tcg_gen_mov64f_i64(ret, t); tcg_gen_mov64f_i64(ret, t);
tcg_temp_free_f64(t);
} }
static void gen_mov32f_i32(TCGv_i32 ret, TCGv_f32 arg) static void gen_mov32f_i32(TCGv_i32 ret, TCGv_f32 arg)
@ -1537,7 +1532,6 @@ static void gen_mov32i_f64(TCGv_f64 ret, TCGv_i32 arg)
TCGv_f32 t = tcg_temp_new_f32(); TCGv_f32 t = tcg_temp_new_f32();
tcg_gen_mov32i_f32(t, arg); tcg_gen_mov32i_f32(t, arg);
tcg_gen_cvt32f_f64(ret, t); tcg_gen_cvt32f_f64(ret, t);
tcg_temp_free_f32(t);
} }
static void gen_mov32i_f32(TCGv_f32 ret, TCGv_i32 arg) static void gen_mov32i_f32(TCGv_f32 ret, TCGv_i32 arg)
@ -1550,7 +1544,6 @@ static void gen_mov64f_i32(TCGv_i32 ret, TCGv_f64 arg)
TCGv_f32 t = tcg_temp_new_f32(); TCGv_f32 t = tcg_temp_new_f32();
tcg_gen_cvt64f_f32(t, arg); tcg_gen_cvt64f_f32(t, arg);
tcg_gen_mov32f_i32(ret, t); tcg_gen_mov32f_i32(ret, t);
tcg_temp_free_f32(t);
} }
static void gen_mov64f_i64(TCGv_i64 ret, TCGv_f64 arg) static void gen_mov64f_i64(TCGv_i64 ret, TCGv_f64 arg)
@ -1563,7 +1556,6 @@ static void gen_mov64i_f32(TCGv_f32 ret, TCGv_i64 arg)
TCGv_f64 t = tcg_temp_new_f64(); TCGv_f64 t = tcg_temp_new_f64();
tcg_gen_mov64i_f64(t, arg); tcg_gen_mov64i_f64(t, arg);
tcg_gen_cvt64f_f32(ret, t); tcg_gen_cvt64f_f32(ret, t);
tcg_temp_free_f64(t);
} }
static void gen_mov64i_f64(TCGv_f64 ret, TCGv_i64 arg) static void gen_mov64i_f64(TCGv_f64 ret, TCGv_i64 arg)
@ -1594,25 +1586,25 @@ static void gen_flush_fp(DisasContext *s)
*/ */
#define GEN_HELPER_FALLBACK_v_v(func) do { \ #define GEN_HELPER_FALLBACK_v_v(func) do { \
if (!g_use_hard_fpu) { \ if (!g_use_hard_fpu) { \
gen_helper_ ## func(cpu_env); \ gen_helper_ ## func(tcg_env); \
return; \ return; \
}} while(0) }} while(0)
#define GEN_HELPER_FALLBACK_v_i(func, arg) do { \ #define GEN_HELPER_FALLBACK_v_i(func, arg) do { \
if (!g_use_hard_fpu) { \ if (!g_use_hard_fpu) { \
gen_helper_ ## func(cpu_env, tcg_const_i32(arg)); \ gen_helper_ ## func(tcg_env, tcg_constant_i32(arg)); \
return; \ return; \
}} while(0) }} while(0)
#define GEN_HELPER_FALLBACK_v_T(func, arg) do { \ #define GEN_HELPER_FALLBACK_v_T(func, arg) do { \
if (!g_use_hard_fpu) { \ if (!g_use_hard_fpu) { \
gen_helper_ ## func(cpu_env, arg); \ gen_helper_ ## func(tcg_env, arg); \
return; \ return; \
}} while(0) }} while(0)
#define GEN_HELPER_FALLBACK_T_v(func, arg) do { \ #define GEN_HELPER_FALLBACK_T_v(func, arg) do { \
if (!g_use_hard_fpu) { \ if (!g_use_hard_fpu) { \
gen_helper_ ## func(arg, cpu_env); \ gen_helper_ ## func(arg, tcg_env); \
return; \ return; \
}} while(0) }} while(0)
@ -1683,11 +1675,10 @@ static void gen_enter_mmx(DisasContext *s)
tcg_gen_movi_i32(fpstt, 0); tcg_gen_movi_i32(fpstt, 0);
TCGv_i32 v = tcg_const_i32(0); TCGv_i32 v = tcg_constant_i32(0);
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
tcg_gen_st8_i32(v, cpu_env, offsetof(CPUX86State, fptags[0]) + i); tcg_gen_st8_i32(v, tcg_env, offsetof(CPUX86State, fptags[0]) + i);
} }
tcg_temp_free_i32(v);
} }
static void gen_flds_FT0(DisasContext *s, TCGv_i32 arg) static void gen_flds_FT0(DisasContext *s, TCGv_i32 arg)
@ -1781,9 +1772,9 @@ static void gen_fsqrt(DisasContext *s)
static void gen_clear_fpus_c2(DisasContext *s) static void gen_clear_fpus_c2(DisasContext *s)
{ {
TCGv_i32 v = tcg_temp_new_i32(); TCGv_i32 v = tcg_temp_new_i32();
tcg_gen_ld16u_i32(v, cpu_env, offsetof(CPUX86State, fpus)); tcg_gen_ld16u_i32(v, tcg_env, offsetof(CPUX86State, fpus));
tcg_gen_andi_i32(v, v, ~0x400); /* C2 <-- 0 */ tcg_gen_andi_i32(v, v, ~0x400); /* C2 <-- 0 */
tcg_gen_st16_i32(v, cpu_env, offsetof(CPUX86State, fpus)); tcg_gen_st16_i32(v, tcg_env, offsetof(CPUX86State, fpus));
} }
static void gen_fsin(DisasContext *s) static void gen_fsin(DisasContext *s)
@ -2965,7 +2956,7 @@ static void gen_x87(DisasContext *s, X86DecodedInsn *decode)
tcg_constant_i32(s->dflag - 1)); tcg_constant_i32(s->dflag - 1));
update_fip = update_fdp = false; update_fip = update_fdp = false;
gen_update_eip_next(s); gen_update_eip_next(s);
gen_eob(s); gen_eob(s, DISAS_EOB_ONLY);
break; break;
case 0x0d: /* fldcw mem */ case 0x0d: /* fldcw mem */
tcg_gen_qemu_ld_i32(s->tmp2_i32, s->A0, tcg_gen_qemu_ld_i32(s->tmp2_i32, s->A0,
@ -2973,7 +2964,7 @@ static void gen_x87(DisasContext *s, X86DecodedInsn *decode)
gen_helper_fldcw(tcg_env, s->tmp2_i32); gen_helper_fldcw(tcg_env, s->tmp2_i32);
update_fip = update_fdp = false; update_fip = update_fdp = false;
gen_update_eip_next(s); gen_update_eip_next(s);
gen_eob(s); gen_eob(s, DISAS_EOB_ONLY);
break; break;
case 0x0e: /* fnstenv mem */ case 0x0e: /* fnstenv mem */
gen_helper_fstenv(tcg_env, s->A0, gen_helper_fstenv(tcg_env, s->A0,
@ -3198,7 +3189,7 @@ static void gen_x87(DisasContext *s, X86DecodedInsn *decode)
} }
} else { } else {
gen_fmov_FT0_STN(s, opreg); gen_fmov_FT0_STN(s, opreg);
gen_fp_arith_ST0_FT0(s, op1); gen_helper_fp_arith_ST0_FT0(s, op1);
} }
} }
break; break;
@ -3240,7 +3231,7 @@ static void gen_x87(DisasContext *s, X86DecodedInsn *decode)
gen_helper_fninit(tcg_env); gen_helper_fninit(tcg_env);
update_fip = false; update_fip = false;
gen_update_eip_next(s); gen_update_eip_next(s);
gen_eob(s); gen_eob(s, DISAS_EOB_ONLY);
break; break;
case 4: /* fsetpm (287 only, just do nop here) */ case 4: /* fsetpm (287 only, just do nop here) */
break; break;
@ -4106,7 +4097,7 @@ void tcg_x86_init(void)
bnd_regu_names[i]); bnd_regu_names[i]);
} }
fpstt = tcg_global_mem_new_i32(cpu_env, fpstt = tcg_global_mem_new_i32(tcg_env,
offsetof(CPUX86State, fpstt), "fpstt"); offsetof(CPUX86State, fpstt), "fpstt");
#if defined(XBOX) && defined(__x86_64__) #if defined(XBOX) && defined(__x86_64__)