Merge remote-tracking branch 'afaerber/qom-cpu.v5' into staging

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

diff --git a/target-i386/helper.h b/target-i386/helper.h
index 9bbf4fc180de702d78f46fdce007c81dafcf47e8..761954e9256a3e75a34c942bd8659cfc06a709a4 100644 (file)
--- a/target-i386/helper.h
+++ b/target-i386/helper.h
@@ -1,220 +1,221 @@
-#define TCG_HELPER_PROTO
+#include "def-helper.h"

 
 

-void helper_lock(void);
-void helper_unlock(void);
-void helper_write_eflags(target_ulong t0, uint32_t update_mask);
-target_ulong helper_read_eflags(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_FLAGS_1(cc_compute_all, TCG_CALL_PURE, i32, int)
+DEF_HELPER_FLAGS_1(cc_compute_c, TCG_CALL_PURE, i32, int)
+
+DEF_HELPER_0(lock, void)
+DEF_HELPER_0(unlock, void)
+DEF_HELPER_2(write_eflags, void, tl, i32)
+DEF_HELPER_0(read_eflags, tl)
+DEF_HELPER_1(divb_AL, void, tl)
+DEF_HELPER_1(idivb_AL, void, tl)
+DEF_HELPER_1(divw_AX, void, tl)
+DEF_HELPER_1(idivw_AX, void, tl)
+DEF_HELPER_1(divl_EAX, void, tl)
+DEF_HELPER_1(idivl_EAX, void, 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_1(mulq_EAX_T0, void, tl)
+DEF_HELPER_1(imulq_EAX_T0, void, tl)
+DEF_HELPER_2(imulq_T0_T1, tl, tl, tl)
+DEF_HELPER_1(divq_EAX, void, tl)
+DEF_HELPER_1(idivq_EAX, void, 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_1(aam, void, int)
+DEF_HELPER_1(aad, void, int)
+DEF_HELPER_0(aaa, void)
+DEF_HELPER_0(aas, void)
+DEF_HELPER_0(daa, void)
+DEF_HELPER_0(das, void)

 
 

-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_1(lsl, tl, tl)
+DEF_HELPER_1(lar, tl, tl)
+DEF_HELPER_1(verr, void, tl)
+DEF_HELPER_1(verw, void, tl)
+DEF_HELPER_1(lldt, void, int)
+DEF_HELPER_1(ltr, void, int)
+DEF_HELPER_2(load_seg, void, int, int)
+DEF_HELPER_3(ljmp_protected, void, int, tl, int)
+DEF_HELPER_4(lcall_real, void, int, tl, int, int)
+DEF_HELPER_4(lcall_protected, void, int, tl, int, int)
+DEF_HELPER_1(iret_real, void, int)
+DEF_HELPER_2(iret_protected, void, int, int)
+DEF_HELPER_2(lret_protected, void, int, int)
+DEF_HELPER_1(read_crN, tl, int)
+DEF_HELPER_2(write_crN, void, int, tl)
+DEF_HELPER_1(lmsw, void, tl)
+DEF_HELPER_0(clts, void)
+DEF_HELPER_2(movl_drN_T0, void, int, tl)
+DEF_HELPER_1(invlpg, void, tl)

 
 

-void helper_enter_level(int level, int data32, target_ulong t1);
+DEF_HELPER_3(enter_level, void, int, int, tl)

 #ifdef TARGET_X86_64
 #ifdef TARGET_X86_64

-void helper_enter64_level(int level, int data64, target_ulong t1);
+DEF_HELPER_3(enter64_level, void, int, int, tl)

 #endif
 #endif

-void helper_sysenter(void);
-void helper_sysexit(void);
+DEF_HELPER_0(sysenter, void)
+DEF_HELPER_1(sysexit, void, int)

 #ifdef TARGET_X86_64
 #ifdef TARGET_X86_64

-void helper_syscall(int next_eip_addend);
-void helper_sysret(int dflag);
+DEF_HELPER_1(syscall, void, int)
+DEF_HELPER_1(sysret, void, int)

 #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);
+DEF_HELPER_1(hlt, void, int)
+DEF_HELPER_1(monitor, void, tl)
+DEF_HELPER_1(mwait, void, int)
+DEF_HELPER_0(debug, void)
+DEF_HELPER_0(reset_rf, void)
+DEF_HELPER_2(raise_interrupt, void, int, int)
+DEF_HELPER_1(raise_exception, void, int)
+DEF_HELPER_0(cli, void)
+DEF_HELPER_0(sti, void)
+DEF_HELPER_0(set_inhibit_irq, void)
+DEF_HELPER_0(reset_inhibit_irq, void)
+DEF_HELPER_2(boundw, void, tl, int)
+DEF_HELPER_2(boundl, void, tl, int)
+DEF_HELPER_0(rsm, void)
+DEF_HELPER_1(into, void, int)
+DEF_HELPER_1(cmpxchg8b, void, tl)

 #ifdef TARGET_X86_64
 #ifdef TARGET_X86_64

-void helper_cmpxchg16b(target_ulong a0);
+DEF_HELPER_1(cmpxchg16b, void, tl)

 #endif
 #endif

-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_0(single_step, void)
+DEF_HELPER_0(cpuid, void)
+DEF_HELPER_0(rdtsc, void)
+DEF_HELPER_0(rdtscp, void)
+DEF_HELPER_0(rdpmc, void)
+DEF_HELPER_0(rdmsr, void)
+DEF_HELPER_0(wrmsr, void)

 
 

-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_1(check_iob, void, i32)
+DEF_HELPER_1(check_iow, void, i32)
+DEF_HELPER_1(check_iol, void, i32)
+DEF_HELPER_2(outb, void, i32, i32)
+DEF_HELPER_1(inb, tl, i32)
+DEF_HELPER_2(outw, void, i32, i32)
+DEF_HELPER_1(inw, tl, i32)
+DEF_HELPER_2(outl, void, i32, i32)
+DEF_HELPER_1(inl, tl, i32)

 
 

-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_2(svm_check_intercept_param, void, i32, i64)
+DEF_HELPER_2(vmexit, void, i32, i64)
+DEF_HELPER_3(svm_check_io, void, i32, i32, i32)
+DEF_HELPER_2(vmrun, void, int, int)
+DEF_HELPER_0(vmmcall, void)
+DEF_HELPER_1(vmload, void, int)
+DEF_HELPER_1(vmsave, void, int)
+DEF_HELPER_0(stgi, void)
+DEF_HELPER_0(clgi, void)
+DEF_HELPER_0(skinit, void)
+DEF_HELPER_1(invlpga, void, 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_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_1(bsf, tl, tl)
+DEF_HELPER_1(bsr, tl, tl)
+DEF_HELPER_2(lzcnt, tl, tl, int)

 
 /* 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_1(ldmxcsr, void, i32)
+DEF_HELPER_0(enter_mmx, void)
+DEF_HELPER_0(emms, void)
+DEF_HELPER_2(movq, void, 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_2(rclb, tl, tl, tl)
+DEF_HELPER_2(rclw, tl, tl, tl)
+DEF_HELPER_2(rcll, tl, tl, tl)
+DEF_HELPER_2(rcrb, tl, tl, tl)
+DEF_HELPER_2(rcrw, tl, tl, tl)
+DEF_HELPER_2(rcrl, tl, 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_2(rclq, tl, tl, tl)
+DEF_HELPER_2(rcrq, tl, tl, tl)

 #endif
 
 #endif
 

+#include "def-helper.h"