Commit d3eb5eae authored by Blue Swirl's avatar Blue Swirl
Browse files

x86: avoid AREG0 for FPU helpers 



Make FPU helpers take a parameter for CPUState instead
of relying on global env.

Introduce temporary wrappers for FPU load and store ops. Remove
wrappers for non-AREG0 code. Don't call unconverted helpers
directly.

Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 633decd7

target-i386/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ obj-$(CONFIG_NO_KVM) += kvm-stub.o 
obj-$(CONFIG_LINUX_USER) += ioport-user.o

obj-$(CONFIG_BSD_USER) += ioport-user.o



$(obj)/fpu_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

$(obj)/cc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

$(obj)/int_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

$(obj)/svm_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

target-i386/cpu.h

+11 −0
Original line number Diff line number Diff line
@@ -1138,4 +1138,15 @@ void do_smm_enter(CPUX86State *env1); 


void cpu_report_tpr_access(CPUX86State *env, TPRAccess access);



/* temporary wrappers */

uint32_t cpu_ldub_data(CPUX86State *env, target_ulong ptr);

uint32_t cpu_lduw_data(CPUX86State *env, target_ulong ptr);

uint32_t cpu_ldl_data(CPUX86State *env, target_ulong ptr);

uint64_t cpu_ldq_data(CPUX86State *env, target_ulong ptr);



void cpu_stb_data(CPUX86State *env, target_ulong ptr, uint32_t data);

void cpu_stw_data(CPUX86State *env, target_ulong ptr, uint32_t data);

void cpu_stl_data(CPUX86State *env, target_ulong ptr, uint32_t data);

void cpu_stq_data(CPUX86State *env, target_ulong ptr, uint64_t data);



#endif /* CPU_I386_H */

target-i386/fpu_helper.c

+207 −226

File changed.

Preview size limit exceeded, changes collapsed.

target-i386/helper.h

+86 −86
Original line number Diff line number Diff line
@@ -109,98 +109,98 @@ DEF_HELPER_1(invlpga, void, int) 


/* x86 FPU */



DEF_HELPER_1(flds_FT0, void, i32)

DEF_HELPER_1(fldl_FT0, void, i64)

DEF_HELPER_1(fildl_FT0, void, s32)

DEF_HELPER_1(flds_ST0, void, i32)

DEF_HELPER_1(fldl_ST0, void, i64)

DEF_HELPER_1(fildl_ST0, void, s32)

DEF_HELPER_1(fildll_ST0, void, s64)

DEF_HELPER_0(fsts_ST0, i32)

DEF_HELPER_0(fstl_ST0, i64)

DEF_HELPER_0(fist_ST0, s32)

DEF_HELPER_0(fistl_ST0, s32)

DEF_HELPER_0(fistll_ST0, s64)

DEF_HELPER_0(fistt_ST0, s32)

DEF_HELPER_0(fisttl_ST0, s32)

DEF_HELPER_0(fisttll_ST0, s64)

DEF_HELPER_1(fldt_ST0, void, tl)

DEF_HELPER_1(fstt_ST0, void, tl)

DEF_HELPER_0(fpush, void)

DEF_HELPER_0(fpop, void)

DEF_HELPER_0(fdecstp, void)

DEF_HELPER_0(fincstp, void)

DEF_HELPER_1(ffree_STN, void, int)

DEF_HELPER_0(fmov_ST0_FT0, void)

DEF_HELPER_1(fmov_FT0_STN, void, int)

DEF_HELPER_1(fmov_ST0_STN, void, int)

DEF_HELPER_1(fmov_STN_ST0, void, int)

DEF_HELPER_1(fxchg_ST0_STN, void, int)

DEF_HELPER_0(fcom_ST0_FT0, void)

DEF_HELPER_0(fucom_ST0_FT0, void)

DEF_HELPER_0(fcomi_ST0_FT0, void)

DEF_HELPER_0(fucomi_ST0_FT0, void)

DEF_HELPER_0(fadd_ST0_FT0, void)

DEF_HELPER_0(fmul_ST0_FT0, void)

DEF_HELPER_0(fsub_ST0_FT0, void)

DEF_HELPER_0(fsubr_ST0_FT0, void)

DEF_HELPER_0(fdiv_ST0_FT0, void)

DEF_HELPER_0(fdivr_ST0_FT0, void)

DEF_HELPER_1(fadd_STN_ST0, void, int)

DEF_HELPER_1(fmul_STN_ST0, void, int)

DEF_HELPER_1(fsub_STN_ST0, void, int)

DEF_HELPER_1(fsubr_STN_ST0, void, int)

DEF_HELPER_1(fdiv_STN_ST0, void, int)

DEF_HELPER_1(fdivr_STN_ST0, void, int)

DEF_HELPER_0(fchs_ST0, void)

DEF_HELPER_0(fabs_ST0, void)

DEF_HELPER_0(fxam_ST0, void)

DEF_HELPER_0(fld1_ST0, void)

DEF_HELPER_0(fldl2t_ST0, void)

DEF_HELPER_0(fldl2e_ST0, void)

DEF_HELPER_0(fldpi_ST0, void)

DEF_HELPER_0(fldlg2_ST0, void)

DEF_HELPER_0(fldln2_ST0, void)

DEF_HELPER_0(fldz_ST0, void)

DEF_HELPER_0(fldz_FT0, void)

DEF_HELPER_0(fnstsw, i32)

DEF_HELPER_0(fnstcw, i32)

DEF_HELPER_1(fldcw, void, i32)

DEF_HELPER_0(fclex, void)

DEF_HELPER_0(fwait, void)

DEF_HELPER_0(fninit, void)

DEF_HELPER_1(fbld_ST0, void, tl)

DEF_HELPER_1(fbst_ST0, void, tl)

DEF_HELPER_0(f2xm1, void)

DEF_HELPER_0(fyl2x, void)

DEF_HELPER_0(fptan, void)

DEF_HELPER_0(fpatan, void)

DEF_HELPER_0(fxtract, void)

DEF_HELPER_0(fprem1, void)

DEF_HELPER_0(fprem, void)

DEF_HELPER_0(fyl2xp1, void)

DEF_HELPER_0(fsqrt, void)

DEF_HELPER_0(fsincos, void)

DEF_HELPER_0(frndint, void)

DEF_HELPER_0(fscale, void)

DEF_HELPER_0(fsin, void)

DEF_HELPER_0(fcos, void)

DEF_HELPER_2(fstenv, void, tl, int)

DEF_HELPER_2(fldenv, void, tl, int)

DEF_HELPER_2(fsave, void, tl, int)

DEF_HELPER_2(frstor, void, tl, int)

DEF_HELPER_2(fxsave, void, tl, int)

DEF_HELPER_2(fxrstor, void, tl, int)

DEF_HELPER_2(flds_FT0, void, env, i32)

DEF_HELPER_2(fldl_FT0, void, env, i64)

DEF_HELPER_2(fildl_FT0, void, env, s32)

DEF_HELPER_2(flds_ST0, void, env, i32)

DEF_HELPER_2(fldl_ST0, void, env, i64)

DEF_HELPER_2(fildl_ST0, void, env, s32)

DEF_HELPER_2(fildll_ST0, void, env, s64)

DEF_HELPER_1(fsts_ST0, i32, env)

DEF_HELPER_1(fstl_ST0, i64, env)

DEF_HELPER_1(fist_ST0, s32, env)

DEF_HELPER_1(fistl_ST0, s32, env)

DEF_HELPER_1(fistll_ST0, s64, env)

DEF_HELPER_1(fistt_ST0, s32, env)

DEF_HELPER_1(fisttl_ST0, s32, env)

DEF_HELPER_1(fisttll_ST0, s64, env)

DEF_HELPER_2(fldt_ST0, void, env, tl)

DEF_HELPER_2(fstt_ST0, void, env, tl)

DEF_HELPER_1(fpush, void, env)

DEF_HELPER_1(fpop, void, env)

DEF_HELPER_1(fdecstp, void, env)

DEF_HELPER_1(fincstp, void, env)

DEF_HELPER_2(ffree_STN, void, env, int)

DEF_HELPER_1(fmov_ST0_FT0, void, env)

DEF_HELPER_2(fmov_FT0_STN, void, env, int)

DEF_HELPER_2(fmov_ST0_STN, void, env, int)

DEF_HELPER_2(fmov_STN_ST0, void, env, int)

DEF_HELPER_2(fxchg_ST0_STN, void, env, int)

DEF_HELPER_1(fcom_ST0_FT0, void, env)

DEF_HELPER_1(fucom_ST0_FT0, void, env)

DEF_HELPER_1(fcomi_ST0_FT0, void, env)

DEF_HELPER_1(fucomi_ST0_FT0, void, env)

DEF_HELPER_1(fadd_ST0_FT0, void, env)

DEF_HELPER_1(fmul_ST0_FT0, void, env)

DEF_HELPER_1(fsub_ST0_FT0, void, env)

DEF_HELPER_1(fsubr_ST0_FT0, void, env)

DEF_HELPER_1(fdiv_ST0_FT0, void, env)

DEF_HELPER_1(fdivr_ST0_FT0, void, env)

DEF_HELPER_2(fadd_STN_ST0, void, env, int)

DEF_HELPER_2(fmul_STN_ST0, void, env, int)

DEF_HELPER_2(fsub_STN_ST0, void, env, int)

DEF_HELPER_2(fsubr_STN_ST0, void, env, int)

DEF_HELPER_2(fdiv_STN_ST0, void, env, int)

DEF_HELPER_2(fdivr_STN_ST0, void, env, int)

DEF_HELPER_1(fchs_ST0, void, env)

DEF_HELPER_1(fabs_ST0, void, env)

DEF_HELPER_1(fxam_ST0, void, env)

DEF_HELPER_1(fld1_ST0, void, env)

DEF_HELPER_1(fldl2t_ST0, void, env)

DEF_HELPER_1(fldl2e_ST0, void, env)

DEF_HELPER_1(fldpi_ST0, void, env)

DEF_HELPER_1(fldlg2_ST0, void, env)

DEF_HELPER_1(fldln2_ST0, void, env)

DEF_HELPER_1(fldz_ST0, void, env)

DEF_HELPER_1(fldz_FT0, void, env)

DEF_HELPER_1(fnstsw, i32, env)

DEF_HELPER_1(fnstcw, i32, env)

DEF_HELPER_2(fldcw, void, env, i32)

DEF_HELPER_1(fclex, void, env)

DEF_HELPER_1(fwait, void, env)

DEF_HELPER_1(fninit, void, env)

DEF_HELPER_2(fbld_ST0, void, env, tl)

DEF_HELPER_2(fbst_ST0, void, env, tl)

DEF_HELPER_1(f2xm1, void, env)

DEF_HELPER_1(fyl2x, void, env)

DEF_HELPER_1(fptan, void, env)

DEF_HELPER_1(fpatan, void, env)

DEF_HELPER_1(fxtract, void, env)

DEF_HELPER_1(fprem1, void, env)

DEF_HELPER_1(fprem, void, env)

DEF_HELPER_1(fyl2xp1, void, env)

DEF_HELPER_1(fsqrt, void, env)

DEF_HELPER_1(fsincos, void, env)

DEF_HELPER_1(frndint, void, env)

DEF_HELPER_1(fscale, void, env)

DEF_HELPER_1(fsin, void, env)

DEF_HELPER_1(fcos, void, env)

DEF_HELPER_3(fstenv, void, env, tl, int)

DEF_HELPER_3(fldenv, void, env, tl, int)

DEF_HELPER_3(fsave, void, env, tl, int)

DEF_HELPER_3(frstor, void, env, tl, int)

DEF_HELPER_3(fxsave, void, env, tl, int)

DEF_HELPER_3(fxrstor, void, env, tl, int)

DEF_HELPER_1(bsf, tl, tl)

DEF_HELPER_1(bsr, tl, tl)

DEF_HELPER_2(lzcnt, tl, tl, int)



/* MMX/SSE */



DEF_HELPER_1(ldmxcsr, void, i32)

DEF_HELPER_0(enter_mmx, void)

DEF_HELPER_0(emms, void)

DEF_HELPER_2(movq, void, ptr, ptr)

DEF_HELPER_2(ldmxcsr, void, env, i32)

DEF_HELPER_1(enter_mmx, void, env)

DEF_HELPER_1(emms, void, env)

DEF_HELPER_3(movq, void, env, ptr, ptr)



#define SHIFT 0

#include "ops_sse_header.h"

target-i386/mem_helper.c

+49 −0
Original line number Diff line number Diff line
@@ -159,3 +159,52 @@ void tlb_fill(CPUX86State *env1, target_ulong addr, int is_write, int mmu_idx, 
    env = saved_env;

}

#endif



/* temporary wrappers */

#if defined(CONFIG_USER_ONLY)

#define ldub_data(addr) ldub_raw(addr)

#define lduw_data(addr) lduw_raw(addr)

#define ldl_data(addr) ldl_raw(addr)

#define ldq_data(addr) ldq_raw(addr)



#define stb_data(addr, data) stb_raw(addr, data)

#define stw_data(addr, data) stw_raw(addr, data)

#define stl_data(addr, data) stl_raw(addr, data)

#define stq_data(addr, data) stq_raw(addr, data)

#endif



#define WRAP_LD(rettype, fn)                                    \

    rettype cpu_ ## fn(CPUX86State *env1, target_ulong addr)    \

    {                                                           \

        CPUX86State *saved_env;                                 \

        rettype ret;                                            \

                                                                \

        saved_env = env;                                        \

        env = env1;                                             \

        ret = fn(addr);                                         \

        env = saved_env;                                        \

        return ret;                                             \

    }



WRAP_LD(uint32_t, ldub_data)

WRAP_LD(uint32_t, lduw_data)

WRAP_LD(uint32_t, ldl_data)

WRAP_LD(uint64_t, ldq_data)

#undef WRAP_LD



#define WRAP_ST(datatype, fn)                                           \

    void cpu_ ## fn(CPUX86State *env1, target_ulong addr, datatype val) \

    {                                                                   \

        CPUX86State *saved_env;                                         \

                                                                        \

        saved_env = env;                                                \

        env = env1;                                                     \

        fn(addr, val);                                                  \

        env = saved_env;                                                \

    }



WRAP_ST(uint32_t, stb_data)

WRAP_ST(uint32_t, stw_data)

WRAP_ST(uint32_t, stl_data)

WRAP_ST(uint64_t, stq_data)

#undef WRAP_ST