Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

[qemu.git] / target-i386 / helper.h

diff --git a/target-i386/helper.h b/target-i386/helper.h
index e0ff417b230d697e75253afb13499cbd4e1bdfdb..ecfcfd1a975e9c2e653fff633e0c83bda4c756d1 100644 (file)
--- a/target-i386/helper.h
+++ b/target-i386/helper.h
@@ -1,215 +1,221 @@
-#define TCG_HELPER_PROTO
+DEF_HELPER_FLAGS_4(cc_compute_all, TCG_CALL_NO_RWG_SE, tl, tl, tl, tl, int)
+DEF_HELPER_FLAGS_4(cc_compute_c, TCG_CALL_NO_RWG_SE, tl, tl, tl, tl, int)

 
 

-void helper_lock(void);
-void helper_unlock(void);
-void helper_divb_AL(target_ulong t0);
-void helper_idivb_AL(target_ulong t0);
-void helper_divw_AX(target_ulong t0);
-void helper_idivw_AX(target_ulong t0);
-void helper_divl_EAX(target_ulong t0);
-void helper_idivl_EAX(target_ulong t0);
+DEF_HELPER_0(lock, void)
+DEF_HELPER_0(unlock, void)
+DEF_HELPER_3(write_eflags, void, env, tl, i32)
+DEF_HELPER_1(read_eflags, tl, env)
+DEF_HELPER_2(divb_AL, void, env, tl)
+DEF_HELPER_2(idivb_AL, void, env, tl)
+DEF_HELPER_2(divw_AX, void, env, tl)
+DEF_HELPER_2(idivw_AX, void, env, tl)
+DEF_HELPER_2(divl_EAX, void, env, tl)
+DEF_HELPER_2(idivl_EAX, void, env, tl)

 #ifdef TARGET_X86_64
 #ifdef TARGET_X86_64

-void helper_mulq_EAX_T0(target_ulong t0);
-void helper_imulq_EAX_T0(target_ulong t0);
-target_ulong helper_imulq_T0_T1(target_ulong t0, target_ulong t1);
-void helper_divq_EAX(target_ulong t0);
-void helper_idivq_EAX(target_ulong t0);
+DEF_HELPER_2(divq_EAX, void, env, tl)
+DEF_HELPER_2(idivq_EAX, void, env, tl)

 #endif
 
 #endif
 

-void helper_aam(int base);
-void helper_aad(int base);
-void helper_aaa(void);
-void helper_aas(void);
-void helper_daa(void);
-void helper_das(void);
+DEF_HELPER_2(aam, void, env, int)
+DEF_HELPER_2(aad, void, env, int)
+DEF_HELPER_1(aaa, void, env)
+DEF_HELPER_1(aas, void, env)
+DEF_HELPER_1(daa, void, env)
+DEF_HELPER_1(das, void, env)

 
 

-target_ulong helper_lsl(target_ulong selector1);
-target_ulong helper_lar(target_ulong selector1);
-void helper_verr(target_ulong selector1);
-void helper_verw(target_ulong selector1);
-void helper_lldt(int selector);
-void helper_ltr(int selector);
-void helper_load_seg(int seg_reg, int selector);
-void helper_ljmp_protected(int new_cs, target_ulong new_eip,
-                           int next_eip_addend);
-void helper_lcall_real(int new_cs, target_ulong new_eip1,
-                       int shift, int next_eip);
-void helper_lcall_protected(int new_cs, target_ulong new_eip, 
-                            int shift, int next_eip_addend);
-void helper_iret_real(int shift);
-void helper_iret_protected(int shift, int next_eip);
-void helper_lret_protected(int shift, int addend);
-void helper_movl_crN_T0(int reg, target_ulong t0);
-void helper_lmsw(target_ulong t0);
-void helper_clts(void);
-#if !defined(CONFIG_USER_ONLY)
-target_ulong helper_movtl_T0_cr8(void);
-#endif
-void helper_movl_drN_T0(int reg, target_ulong t0);
-void helper_invlpg(target_ulong addr);
+DEF_HELPER_2(lsl, tl, env, tl)
+DEF_HELPER_2(lar, tl, env, tl)
+DEF_HELPER_2(verr, void, env, tl)
+DEF_HELPER_2(verw, void, env, tl)
+DEF_HELPER_2(lldt, void, env, int)
+DEF_HELPER_2(ltr, void, env, int)
+DEF_HELPER_3(load_seg, void, env, int, int)
+DEF_HELPER_4(ljmp_protected, void, env, int, tl, tl)
+DEF_HELPER_5(lcall_real, void, env, int, tl, int, int)
+DEF_HELPER_5(lcall_protected, void, env, int, tl, int, tl)
+DEF_HELPER_2(iret_real, void, env, int)
+DEF_HELPER_3(iret_protected, void, env, int, int)
+DEF_HELPER_3(lret_protected, void, env, int, int)
+DEF_HELPER_2(read_crN, tl, env, int)
+DEF_HELPER_3(write_crN, void, env, int, tl)
+DEF_HELPER_2(lmsw, void, env, tl)
+DEF_HELPER_1(clts, void, env)
+DEF_HELPER_FLAGS_3(set_dr, TCG_CALL_NO_WG, void, env, int, tl)
+DEF_HELPER_FLAGS_2(get_dr, TCG_CALL_NO_WG, tl, env, int)
+DEF_HELPER_2(invlpg, void, env, tl)

 
 

-void helper_enter_level(int level, int data32, target_ulong t1);
+DEF_HELPER_4(enter_level, void, env, int, int, tl)
+#ifdef TARGET_X86_64
+DEF_HELPER_4(enter64_level, void, env, int, int, tl)
+#endif
+DEF_HELPER_1(sysenter, void, env)
+DEF_HELPER_2(sysexit, void, env, int)

 #ifdef TARGET_X86_64
 #ifdef TARGET_X86_64

-void helper_enter64_level(int level, int data64, target_ulong t1);
+DEF_HELPER_2(syscall, void, env, int)
+DEF_HELPER_2(sysret, void, env, int)

 #endif
 #endif

-void helper_sysenter(void);
-void helper_sysexit(void);
+DEF_HELPER_2(hlt, void, env, int)
+DEF_HELPER_2(monitor, void, env, tl)
+DEF_HELPER_2(mwait, void, env, int)
+DEF_HELPER_2(pause, void, env, int)
+DEF_HELPER_1(debug, void, env)
+DEF_HELPER_1(reset_rf, void, env)
+DEF_HELPER_3(raise_interrupt, void, env, int, int)
+DEF_HELPER_2(raise_exception, void, env, int)
+DEF_HELPER_1(cli, void, env)
+DEF_HELPER_1(sti, void, env)
+DEF_HELPER_1(clac, void, env)
+DEF_HELPER_1(stac, void, env)
+DEF_HELPER_1(set_inhibit_irq, void, env)
+DEF_HELPER_1(reset_inhibit_irq, void, env)
+DEF_HELPER_3(boundw, void, env, tl, int)
+DEF_HELPER_3(boundl, void, env, tl, int)
+DEF_HELPER_1(rsm, void, env)
+DEF_HELPER_2(into, void, env, int)
+DEF_HELPER_2(cmpxchg8b, void, env, tl)

 #ifdef TARGET_X86_64
 #ifdef TARGET_X86_64

-void helper_syscall(int next_eip_addend);
-void helper_sysret(int dflag);
+DEF_HELPER_2(cmpxchg16b, void, env, tl)

 #endif
 #endif

-void helper_hlt(void);
-void helper_monitor(target_ulong ptr);
-void helper_mwait(void);
-void helper_debug(void);
-void helper_raise_interrupt(int intno, int next_eip_addend);
-void helper_raise_exception(int exception_index);
-void helper_cli(void);
-void helper_sti(void);
-void helper_set_inhibit_irq(void);
-void helper_reset_inhibit_irq(void);
-void helper_boundw(target_ulong a0, int v);
-void helper_boundl(target_ulong a0, int v);
-void helper_rsm(void);
-void helper_into(int next_eip_addend);
-void helper_cmpxchg8b(target_ulong a0);
-void helper_single_step(void);
-void helper_cpuid(void);
-void helper_rdtsc(void);
-void helper_rdpmc(void);
-void helper_rdmsr(void);
-void helper_wrmsr(void);
+DEF_HELPER_1(single_step, void, env)
+DEF_HELPER_1(cpuid, void, env)
+DEF_HELPER_1(rdtsc, void, env)
+DEF_HELPER_1(rdtscp, void, env)
+DEF_HELPER_1(rdpmc, void, env)
+DEF_HELPER_1(rdmsr, void, env)
+DEF_HELPER_1(wrmsr, void, env)

 
 

-void helper_check_iob(uint32_t t0);
-void helper_check_iow(uint32_t t0);
-void helper_check_iol(uint32_t t0);
-void helper_outb(uint32_t port, uint32_t data);
-target_ulong helper_inb(uint32_t port);
-void helper_outw(uint32_t port, uint32_t data);
-target_ulong helper_inw(uint32_t port);
-void helper_outl(uint32_t port, uint32_t data);
-target_ulong helper_inl(uint32_t port);
+DEF_HELPER_2(check_iob, void, env, i32)
+DEF_HELPER_2(check_iow, void, env, i32)
+DEF_HELPER_2(check_iol, void, env, i32)
+DEF_HELPER_3(outb, void, env, i32, i32)
+DEF_HELPER_2(inb, tl, env, i32)
+DEF_HELPER_3(outw, void, env, i32, i32)
+DEF_HELPER_2(inw, tl, env, i32)
+DEF_HELPER_3(outl, void, env, i32, i32)
+DEF_HELPER_2(inl, tl, env, i32)
+DEF_HELPER_FLAGS_4(bpt_io, TCG_CALL_NO_WG, void, env, i32, i32, tl)

 
 

-void helper_svm_check_intercept_param(uint32_t type, uint64_t param);
-void helper_vmexit(uint32_t exit_code, uint64_t exit_info_1);
-void helper_svm_check_io(uint32_t port, uint32_t param, 
-                         uint32_t next_eip_addend);
-void helper_vmrun(void);
-void helper_vmmcall(void);
-void helper_vmload(void);
-void helper_vmsave(void);
-void helper_stgi(void);
-void helper_clgi(void);
-void helper_skinit(void);
-void helper_invlpga(void);
+DEF_HELPER_3(svm_check_intercept_param, void, env, i32, i64)
+DEF_HELPER_3(vmexit, void, env, i32, i64)
+DEF_HELPER_4(svm_check_io, void, env, i32, i32, i32)
+DEF_HELPER_3(vmrun, void, env, int, int)
+DEF_HELPER_1(vmmcall, void, env)
+DEF_HELPER_2(vmload, void, env, int)
+DEF_HELPER_2(vmsave, void, env, int)
+DEF_HELPER_1(stgi, void, env)
+DEF_HELPER_1(clgi, void, env)
+DEF_HELPER_1(skinit, void, env)
+DEF_HELPER_2(invlpga, void, env, int)

 
 /* x86 FPU */
 
 
 /* x86 FPU */
 

-void helper_flds_FT0(uint32_t val);
-void helper_fldl_FT0(uint64_t val);
-void helper_fildl_FT0(int32_t val);
-void helper_flds_ST0(uint32_t val);
-void helper_fldl_ST0(uint64_t val);
-void helper_fildl_ST0(int32_t val);
-void helper_fildll_ST0(int64_t val);
-uint32_t helper_fsts_ST0(void);
-uint64_t helper_fstl_ST0(void);
-int32_t helper_fist_ST0(void);
-int32_t helper_fistl_ST0(void);
-int64_t helper_fistll_ST0(void);
-int32_t helper_fistt_ST0(void);
-int32_t helper_fisttl_ST0(void);
-int64_t helper_fisttll_ST0(void);
-void helper_fldt_ST0(target_ulong ptr);
-void helper_fstt_ST0(target_ulong ptr);
-void helper_fpush(void);
-void helper_fpop(void);
-void helper_fdecstp(void);
-void helper_fincstp(void);
-void helper_ffree_STN(int st_index);
-void helper_fmov_ST0_FT0(void);
-void helper_fmov_FT0_STN(int st_index);
-void helper_fmov_ST0_STN(int st_index);
-void helper_fmov_STN_ST0(int st_index);
-void helper_fxchg_ST0_STN(int st_index);
-void helper_fcom_ST0_FT0(void);
-void helper_fucom_ST0_FT0(void);
-void helper_fcomi_ST0_FT0(void);
-void helper_fucomi_ST0_FT0(void);
-void helper_fadd_ST0_FT0(void);
-void helper_fmul_ST0_FT0(void);
-void helper_fsub_ST0_FT0(void);
-void helper_fsubr_ST0_FT0(void);
-void helper_fdiv_ST0_FT0(void);
-void helper_fdivr_ST0_FT0(void);
-void helper_fadd_STN_ST0(int st_index);
-void helper_fmul_STN_ST0(int st_index);
-void helper_fsub_STN_ST0(int st_index);
-void helper_fsubr_STN_ST0(int st_index);
-void helper_fdiv_STN_ST0(int st_index);
-void helper_fdivr_STN_ST0(int st_index);
-void helper_fchs_ST0(void);
-void helper_fabs_ST0(void);
-void helper_fxam_ST0(void);
-void helper_fld1_ST0(void);
-void helper_fldl2t_ST0(void);
-void helper_fldl2e_ST0(void);
-void helper_fldpi_ST0(void);
-void helper_fldlg2_ST0(void);
-void helper_fldln2_ST0(void);
-void helper_fldz_ST0(void);
-void helper_fldz_FT0(void);
-uint32_t helper_fnstsw(void);
-uint32_t helper_fnstcw(void);
-void helper_fldcw(uint32_t val);
-void helper_fclex(void);
-void helper_fwait(void);
-void helper_fninit(void);
-void helper_fbld_ST0(target_ulong ptr);
-void helper_fbst_ST0(target_ulong ptr);
-void helper_f2xm1(void);
-void helper_fyl2x(void);
-void helper_fptan(void);
-void helper_fpatan(void);
-void helper_fxtract(void);
-void helper_fprem1(void);
-void helper_fprem(void);
-void helper_fyl2xp1(void);
-void helper_fsqrt(void);
-void helper_fsincos(void);
-void helper_frndint(void);
-void helper_fscale(void);
-void helper_fsin(void);
-void helper_fcos(void);
-void helper_fxam_ST0(void);
-void helper_fstenv(target_ulong ptr, int data32);
-void helper_fldenv(target_ulong ptr, int data32);
-void helper_fsave(target_ulong ptr, int data32);
-void helper_frstor(target_ulong ptr, int data32);
-void helper_fxsave(target_ulong ptr, int data64);
-void helper_fxrstor(target_ulong ptr, int data64);
-target_ulong helper_bsf(target_ulong t0);
-target_ulong helper_bsr(target_ulong t0);
+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_FLAGS_1(clz, TCG_CALL_NO_RWG_SE, tl, tl)
+DEF_HELPER_FLAGS_1(ctz, TCG_CALL_NO_RWG_SE, tl, tl)
+DEF_HELPER_FLAGS_2(pdep, TCG_CALL_NO_RWG_SE, tl, tl, tl)
+DEF_HELPER_FLAGS_2(pext, TCG_CALL_NO_RWG_SE, tl, tl, tl)

 
 /* MMX/SSE */
 
 
 /* MMX/SSE */
 

-void TCG_HELPER_PROTO helper_enter_mmx(void);
-void TCG_HELPER_PROTO helper_emms(void);
-void TCG_HELPER_PROTO helper_movq(uint64_t *d, uint64_t *s);
+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"
 #define SHIFT 1
 #include "ops_sse_header.h"
 
 
 #define SHIFT 0
 #include "ops_sse_header.h"
 #define SHIFT 1
 #include "ops_sse_header.h"
 

-target_ulong helper_rclb(target_ulong t0, target_ulong t1);
-target_ulong helper_rclw(target_ulong t0, target_ulong t1);
-target_ulong helper_rcll(target_ulong t0, target_ulong t1);
-target_ulong helper_rcrb(target_ulong t0, target_ulong t1);
-target_ulong helper_rcrw(target_ulong t0, target_ulong t1);
-target_ulong helper_rcrl(target_ulong t0, target_ulong t1);
+DEF_HELPER_3(rclb, tl, env, tl, tl)
+DEF_HELPER_3(rclw, tl, env, tl, tl)
+DEF_HELPER_3(rcll, tl, env, tl, tl)
+DEF_HELPER_3(rcrb, tl, env, tl, tl)
+DEF_HELPER_3(rcrw, tl, env, tl, tl)
+DEF_HELPER_3(rcrl, tl, env, tl, tl)

 #ifdef TARGET_X86_64
 #ifdef TARGET_X86_64

-target_ulong helper_rclq(target_ulong t0, target_ulong t1);
-target_ulong helper_rcrq(target_ulong t0, target_ulong t1);
+DEF_HELPER_3(rclq, tl, env, tl, tl)
+DEF_HELPER_3(rcrq, tl, env, tl, tl)

 #endif
 #endif

-