gwj / at91sam9263 · Commits

Commit 437a88a51cfa9a0e7080153f3a54cfa45f424b76

Authored by bellard
1 parent 4dc81f28

proper helper definition registering (all targets must do that) 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4530 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 3 changed files with 361 additions and 353 deletions
target-i386/helper.h
  View file @437a88a
1 -#define TCG_HELPER_PROTO 1 +#ifndef DEF_HELPER
  2 +#define DEF_HELPER(ret, name, params) ret name params;
  3 +#endif
2 4
3 -void helper_lock(void);  
4 -void helper_unlock(void);  
5 -void helper_write_eflags(target_ulong t0, uint32_t update_mask);  
6 -target_ulong helper_read_eflags(void);  
7 -void helper_divb_AL(target_ulong t0);  
8 -void helper_idivb_AL(target_ulong t0);  
9 -void helper_divw_AX(target_ulong t0);  
10 -void helper_idivw_AX(target_ulong t0);  
11 -void helper_divl_EAX(target_ulong t0);  
12 -void helper_idivl_EAX(target_ulong t0); 5 +DEF_HELPER(void, helper_lock, (void))
  6 +DEF_HELPER(void, helper_unlock, (void))
  7 +DEF_HELPER(void, helper_write_eflags, (target_ulong t0, uint32_t update_mask))
  8 +DEF_HELPER(target_ulong, helper_read_eflags, (void))
  9 +DEF_HELPER(void, helper_divb_AL, (target_ulong t0))
  10 +DEF_HELPER(void, helper_idivb_AL, (target_ulong t0))
  11 +DEF_HELPER(void, helper_divw_AX, (target_ulong t0))
  12 +DEF_HELPER(void, helper_idivw_AX, (target_ulong t0))
  13 +DEF_HELPER(void, helper_divl_EAX, (target_ulong t0))
  14 +DEF_HELPER(void, helper_idivl_EAX, (target_ulong t0))
13 #ifdef TARGET_X86_64 15 #ifdef TARGET_X86_64
14 -void helper_mulq_EAX_T0(target_ulong t0);  
15 -void helper_imulq_EAX_T0(target_ulong t0);  
16 -target_ulong helper_imulq_T0_T1(target_ulong t0, target_ulong t1);  
17 -void helper_divq_EAX(target_ulong t0);  
18 -void helper_idivq_EAX(target_ulong t0); 16 +DEF_HELPER(void, helper_mulq_EAX_T0, (target_ulong t0))
  17 +DEF_HELPER(void, helper_imulq_EAX_T0, (target_ulong t0))
  18 +DEF_HELPER(target_ulong, helper_imulq_T0_T1, (target_ulong t0, target_ulong t1))
  19 +DEF_HELPER(void, helper_divq_EAX, (target_ulong t0))
  20 +DEF_HELPER(void, helper_idivq_EAX, (target_ulong t0))
19 #endif 21 #endif
20 22
21 -void helper_aam(int base);  
22 -void helper_aad(int base);  
23 -void helper_aaa(void);  
24 -void helper_aas(void);  
25 -void helper_daa(void);  
26 -void helper_das(void); 23 +DEF_HELPER(void, helper_aam, (int base))
  24 +DEF_HELPER(void, helper_aad, (int base))
  25 +DEF_HELPER(void, helper_aaa, (void))
  26 +DEF_HELPER(void, helper_aas, (void))
  27 +DEF_HELPER(void, helper_daa, (void))
  28 +DEF_HELPER(void, helper_das, (void))
27 29
28 -target_ulong helper_lsl(target_ulong selector1);  
29 -target_ulong helper_lar(target_ulong selector1);  
30 -void helper_verr(target_ulong selector1);  
31 -void helper_verw(target_ulong selector1);  
32 -void helper_lldt(int selector);  
33 -void helper_ltr(int selector);  
34 -void helper_load_seg(int seg_reg, int selector);  
35 -void helper_ljmp_protected(int new_cs, target_ulong new_eip,  
36 - int next_eip_addend);  
37 -void helper_lcall_real(int new_cs, target_ulong new_eip1,  
38 - int shift, int next_eip);  
39 -void helper_lcall_protected(int new_cs, target_ulong new_eip,  
40 - int shift, int next_eip_addend);  
41 -void helper_iret_real(int shift);  
42 -void helper_iret_protected(int shift, int next_eip);  
43 -void helper_lret_protected(int shift, int addend);  
44 -void helper_movl_crN_T0(int reg, target_ulong t0);  
45 -void helper_lmsw(target_ulong t0);  
46 -void helper_clts(void); 30 +DEF_HELPER(target_ulong, helper_lsl, (target_ulong selector1))
  31 +DEF_HELPER(target_ulong, helper_lar, (target_ulong selector1))
  32 +DEF_HELPER(void, helper_verr, (target_ulong selector1))
  33 +DEF_HELPER(void, helper_verw, (target_ulong selector1))
  34 +DEF_HELPER(void, helper_lldt, (int selector))
  35 +DEF_HELPER(void, helper_ltr, (int selector))
  36 +DEF_HELPER(void, helper_load_seg, (int seg_reg, int selector))
  37 +DEF_HELPER(void, helper_ljmp_protected, (int new_cs, target_ulong new_eip,
  38 + int next_eip_addend))
  39 +DEF_HELPER(void, helper_lcall_real, (int new_cs, target_ulong new_eip1,
  40 + int shift, int next_eip))
  41 +DEF_HELPER(void, helper_lcall_protected, (int new_cs, target_ulong new_eip,
  42 + int shift, int next_eip_addend))
  43 +DEF_HELPER(void, helper_iret_real, (int shift))
  44 +DEF_HELPER(void, helper_iret_protected, (int shift, int next_eip))
  45 +DEF_HELPER(void, helper_lret_protected, (int shift, int addend))
  46 +DEF_HELPER(void, helper_movl_crN_T0, (int reg, target_ulong t0))
  47 +DEF_HELPER(void, helper_lmsw, (target_ulong t0))
  48 +DEF_HELPER(void, helper_clts, (void))
47 #if !defined(CONFIG_USER_ONLY) 49 #if !defined(CONFIG_USER_ONLY)
48 -target_ulong helper_movtl_T0_cr8(void); 50 +DEF_HELPER(target_ulong, helper_movtl_T0_cr8, (void))
49 #endif 51 #endif
50 -void helper_movl_drN_T0(int reg, target_ulong t0);  
51 -void helper_invlpg(target_ulong addr); 52 +DEF_HELPER(void, helper_movl_drN_T0, (int reg, target_ulong t0))
  53 +DEF_HELPER(void, helper_invlpg, (target_ulong addr))
52 54
53 -void helper_enter_level(int level, int data32, target_ulong t1); 55 +DEF_HELPER(void, helper_enter_level, (int level, int data32, target_ulong t1))
54 #ifdef TARGET_X86_64 56 #ifdef TARGET_X86_64
55 -void helper_enter64_level(int level, int data64, target_ulong t1); 57 +DEF_HELPER(void, helper_enter64_level, (int level, int data64, target_ulong t1))
56 #endif 58 #endif
57 -void helper_sysenter(void);  
58 -void helper_sysexit(void); 59 +DEF_HELPER(void, helper_sysenter, (void))
  60 +DEF_HELPER(void, helper_sysexit, (void))
59 #ifdef TARGET_X86_64 61 #ifdef TARGET_X86_64
60 -void helper_syscall(int next_eip_addend);  
61 -void helper_sysret(int dflag); 62 +DEF_HELPER(void, helper_syscall, (int next_eip_addend))
  63 +DEF_HELPER(void, helper_sysret, (int dflag))
62 #endif 64 #endif
63 -void helper_hlt(void);  
64 -void helper_monitor(target_ulong ptr);  
65 -void helper_mwait(void);  
66 -void helper_debug(void);  
67 -void helper_raise_interrupt(int intno, int next_eip_addend);  
68 -void helper_raise_exception(int exception_index);  
69 -void helper_cli(void);  
70 -void helper_sti(void);  
71 -void helper_set_inhibit_irq(void);  
72 -void helper_reset_inhibit_irq(void);  
73 -void helper_boundw(target_ulong a0, int v);  
74 -void helper_boundl(target_ulong a0, int v);  
75 -void helper_rsm(void);  
76 -void helper_into(int next_eip_addend);  
77 -void helper_cmpxchg8b(target_ulong a0); 65 +DEF_HELPER(void, helper_hlt, (void))
  66 +DEF_HELPER(void, helper_monitor, (target_ulong ptr))
  67 +DEF_HELPER(void, helper_mwait, (void))
  68 +DEF_HELPER(void, helper_debug, (void))
  69 +DEF_HELPER(void, helper_raise_interrupt, (int intno, int next_eip_addend))
  70 +DEF_HELPER(void, helper_raise_exception, (int exception_index))
  71 +DEF_HELPER(void, helper_cli, (void))
  72 +DEF_HELPER(void, helper_sti, (void))
  73 +DEF_HELPER(void, helper_set_inhibit_irq, (void))
  74 +DEF_HELPER(void, helper_reset_inhibit_irq, (void))
  75 +DEF_HELPER(void, helper_boundw, (target_ulong a0, int v))
  76 +DEF_HELPER(void, helper_boundl, (target_ulong a0, int v))
  77 +DEF_HELPER(void, helper_rsm, (void))
  78 +DEF_HELPER(void, helper_into, (int next_eip_addend))
  79 +DEF_HELPER(void, helper_cmpxchg8b, (target_ulong a0))
78 #ifdef TARGET_X86_64 80 #ifdef TARGET_X86_64
79 -void helper_cmpxchg16b(target_ulong a0); 81 +DEF_HELPER(void, helper_cmpxchg16b, (target_ulong a0))
80 #endif 82 #endif
81 -void helper_single_step(void);  
82 -void helper_cpuid(void);  
83 -void helper_rdtsc(void);  
84 -void helper_rdpmc(void);  
85 -void helper_rdmsr(void);  
86 -void helper_wrmsr(void); 83 +DEF_HELPER(void, helper_single_step, (void))
  84 +DEF_HELPER(void, helper_cpuid, (void))
  85 +DEF_HELPER(void, helper_rdtsc, (void))
  86 +DEF_HELPER(void, helper_rdpmc, (void))
  87 +DEF_HELPER(void, helper_rdmsr, (void))
  88 +DEF_HELPER(void, helper_wrmsr, (void))
87 89
88 -void helper_check_iob(uint32_t t0);  
89 -void helper_check_iow(uint32_t t0);  
90 -void helper_check_iol(uint32_t t0);  
91 -void helper_outb(uint32_t port, uint32_t data);  
92 -target_ulong helper_inb(uint32_t port);  
93 -void helper_outw(uint32_t port, uint32_t data);  
94 -target_ulong helper_inw(uint32_t port);  
95 -void helper_outl(uint32_t port, uint32_t data);  
96 -target_ulong helper_inl(uint32_t port); 90 +DEF_HELPER(void, helper_check_iob, (uint32_t t0))
  91 +DEF_HELPER(void, helper_check_iow, (uint32_t t0))
  92 +DEF_HELPER(void, helper_check_iol, (uint32_t t0))
  93 +DEF_HELPER(void, helper_outb, (uint32_t port, uint32_t data))
  94 +DEF_HELPER(target_ulong, helper_inb, (uint32_t port))
  95 +DEF_HELPER(void, helper_outw, (uint32_t port, uint32_t data))
  96 +DEF_HELPER(target_ulong, helper_inw, (uint32_t port))
  97 +DEF_HELPER(void, helper_outl, (uint32_t port, uint32_t data))
  98 +DEF_HELPER(target_ulong, helper_inl, (uint32_t port))
97 99
98 -void helper_svm_check_intercept_param(uint32_t type, uint64_t param);  
99 -void helper_vmexit(uint32_t exit_code, uint64_t exit_info_1);  
100 -void helper_svm_check_io(uint32_t port, uint32_t param,  
101 - uint32_t next_eip_addend);  
102 -void helper_vmrun(void);  
103 -void helper_vmmcall(void);  
104 -void helper_vmload(void);  
105 -void helper_vmsave(void);  
106 -void helper_stgi(void);  
107 -void helper_clgi(void);  
108 -void helper_skinit(void);  
109 -void helper_invlpga(void); 100 +DEF_HELPER(void, helper_svm_check_intercept_param, (uint32_t type, uint64_t param))
  101 +DEF_HELPER(void, helper_vmexit, (uint32_t exit_code, uint64_t exit_info_1))
  102 +DEF_HELPER(void, helper_svm_check_io, (uint32_t port, uint32_t param,
  103 + uint32_t next_eip_addend))
  104 +DEF_HELPER(void, helper_vmrun, (void))
  105 +DEF_HELPER(void, helper_vmmcall, (void))
  106 +DEF_HELPER(void, helper_vmload, (void))
  107 +DEF_HELPER(void, helper_vmsave, (void))
  108 +DEF_HELPER(void, helper_stgi, (void))
  109 +DEF_HELPER(void, helper_clgi, (void))
  110 +DEF_HELPER(void, helper_skinit, (void))
  111 +DEF_HELPER(void, helper_invlpga, (void))
110 112
111 /* x86 FPU */ 113 /* x86 FPU */
112 114
113 -void helper_flds_FT0(uint32_t val);  
114 -void helper_fldl_FT0(uint64_t val);  
115 -void helper_fildl_FT0(int32_t val);  
116 -void helper_flds_ST0(uint32_t val);  
117 -void helper_fldl_ST0(uint64_t val);  
118 -void helper_fildl_ST0(int32_t val);  
119 -void helper_fildll_ST0(int64_t val);  
120 -uint32_t helper_fsts_ST0(void);  
121 -uint64_t helper_fstl_ST0(void);  
122 -int32_t helper_fist_ST0(void);  
123 -int32_t helper_fistl_ST0(void);  
124 -int64_t helper_fistll_ST0(void);  
125 -int32_t helper_fistt_ST0(void);  
126 -int32_t helper_fisttl_ST0(void);  
127 -int64_t helper_fisttll_ST0(void);  
128 -void helper_fldt_ST0(target_ulong ptr);  
129 -void helper_fstt_ST0(target_ulong ptr);  
130 -void helper_fpush(void);  
131 -void helper_fpop(void);  
132 -void helper_fdecstp(void);  
133 -void helper_fincstp(void);  
134 -void helper_ffree_STN(int st_index);  
135 -void helper_fmov_ST0_FT0(void);  
136 -void helper_fmov_FT0_STN(int st_index);  
137 -void helper_fmov_ST0_STN(int st_index);  
138 -void helper_fmov_STN_ST0(int st_index);  
139 -void helper_fxchg_ST0_STN(int st_index);  
140 -void helper_fcom_ST0_FT0(void);  
141 -void helper_fucom_ST0_FT0(void);  
142 -void helper_fcomi_ST0_FT0(void);  
143 -void helper_fucomi_ST0_FT0(void);  
144 -void helper_fadd_ST0_FT0(void);  
145 -void helper_fmul_ST0_FT0(void);  
146 -void helper_fsub_ST0_FT0(void);  
147 -void helper_fsubr_ST0_FT0(void);  
148 -void helper_fdiv_ST0_FT0(void);  
149 -void helper_fdivr_ST0_FT0(void);  
150 -void helper_fadd_STN_ST0(int st_index);  
151 -void helper_fmul_STN_ST0(int st_index);  
152 -void helper_fsub_STN_ST0(int st_index);  
153 -void helper_fsubr_STN_ST0(int st_index);  
154 -void helper_fdiv_STN_ST0(int st_index);  
155 -void helper_fdivr_STN_ST0(int st_index);  
156 -void helper_fchs_ST0(void);  
157 -void helper_fabs_ST0(void);  
158 -void helper_fxam_ST0(void);  
159 -void helper_fld1_ST0(void);  
160 -void helper_fldl2t_ST0(void);  
161 -void helper_fldl2e_ST0(void);  
162 -void helper_fldpi_ST0(void);  
163 -void helper_fldlg2_ST0(void);  
164 -void helper_fldln2_ST0(void);  
165 -void helper_fldz_ST0(void);  
166 -void helper_fldz_FT0(void);  
167 -uint32_t helper_fnstsw(void);  
168 -uint32_t helper_fnstcw(void);  
169 -void helper_fldcw(uint32_t val);  
170 -void helper_fclex(void);  
171 -void helper_fwait(void);  
172 -void helper_fninit(void);  
173 -void helper_fbld_ST0(target_ulong ptr);  
174 -void helper_fbst_ST0(target_ulong ptr);  
175 -void helper_f2xm1(void);  
176 -void helper_fyl2x(void);  
177 -void helper_fptan(void);  
178 -void helper_fpatan(void);  
179 -void helper_fxtract(void);  
180 -void helper_fprem1(void);  
181 -void helper_fprem(void);  
182 -void helper_fyl2xp1(void);  
183 -void helper_fsqrt(void);  
184 -void helper_fsincos(void);  
185 -void helper_frndint(void);  
186 -void helper_fscale(void);  
187 -void helper_fsin(void);  
188 -void helper_fcos(void);  
189 -void helper_fxam_ST0(void);  
190 -void helper_fstenv(target_ulong ptr, int data32);  
191 -void helper_fldenv(target_ulong ptr, int data32);  
192 -void helper_fsave(target_ulong ptr, int data32);  
193 -void helper_frstor(target_ulong ptr, int data32);  
194 -void helper_fxsave(target_ulong ptr, int data64);  
195 -void helper_fxrstor(target_ulong ptr, int data64);  
196 -target_ulong helper_bsf(target_ulong t0);  
197 -target_ulong helper_bsr(target_ulong t0); 115 +DEF_HELPER(void, helper_flds_FT0, (uint32_t val))
  116 +DEF_HELPER(void, helper_fldl_FT0, (uint64_t val))
  117 +DEF_HELPER(void, helper_fildl_FT0, (int32_t val))
  118 +DEF_HELPER(void, helper_flds_ST0, (uint32_t val))
  119 +DEF_HELPER(void, helper_fldl_ST0, (uint64_t val))
  120 +DEF_HELPER(void, helper_fildl_ST0, (int32_t val))
  121 +DEF_HELPER(void, helper_fildll_ST0, (int64_t val))
  122 +DEF_HELPER(uint32_t, helper_fsts_ST0, (void))
  123 +DEF_HELPER(uint64_t, helper_fstl_ST0, (void))
  124 +DEF_HELPER(int32_t, helper_fist_ST0, (void))
  125 +DEF_HELPER(int32_t, helper_fistl_ST0, (void))
  126 +DEF_HELPER(int64_t, helper_fistll_ST0, (void))
  127 +DEF_HELPER(int32_t, helper_fistt_ST0, (void))
  128 +DEF_HELPER(int32_t, helper_fisttl_ST0, (void))
  129 +DEF_HELPER(int64_t, helper_fisttll_ST0, (void))
  130 +DEF_HELPER(void, helper_fldt_ST0, (target_ulong ptr))
  131 +DEF_HELPER(void, helper_fstt_ST0, (target_ulong ptr))
  132 +DEF_HELPER(void, helper_fpush, (void))
  133 +DEF_HELPER(void, helper_fpop, (void))
  134 +DEF_HELPER(void, helper_fdecstp, (void))
  135 +DEF_HELPER(void, helper_fincstp, (void))
  136 +DEF_HELPER(void, helper_ffree_STN, (int st_index))
  137 +DEF_HELPER(void, helper_fmov_ST0_FT0, (void))
  138 +DEF_HELPER(void, helper_fmov_FT0_STN, (int st_index))
  139 +DEF_HELPER(void, helper_fmov_ST0_STN, (int st_index))
  140 +DEF_HELPER(void, helper_fmov_STN_ST0, (int st_index))
  141 +DEF_HELPER(void, helper_fxchg_ST0_STN, (int st_index))
  142 +DEF_HELPER(void, helper_fcom_ST0_FT0, (void))
  143 +DEF_HELPER(void, helper_fucom_ST0_FT0, (void))
  144 +DEF_HELPER(void, helper_fcomi_ST0_FT0, (void))
  145 +DEF_HELPER(void, helper_fucomi_ST0_FT0, (void))
  146 +DEF_HELPER(void, helper_fadd_ST0_FT0, (void))
  147 +DEF_HELPER(void, helper_fmul_ST0_FT0, (void))
  148 +DEF_HELPER(void, helper_fsub_ST0_FT0, (void))
  149 +DEF_HELPER(void, helper_fsubr_ST0_FT0, (void))
  150 +DEF_HELPER(void, helper_fdiv_ST0_FT0, (void))
  151 +DEF_HELPER(void, helper_fdivr_ST0_FT0, (void))
  152 +DEF_HELPER(void, helper_fadd_STN_ST0, (int st_index))
  153 +DEF_HELPER(void, helper_fmul_STN_ST0, (int st_index))
  154 +DEF_HELPER(void, helper_fsub_STN_ST0, (int st_index))
  155 +DEF_HELPER(void, helper_fsubr_STN_ST0, (int st_index))
  156 +DEF_HELPER(void, helper_fdiv_STN_ST0, (int st_index))
  157 +DEF_HELPER(void, helper_fdivr_STN_ST0, (int st_index))
  158 +DEF_HELPER(void, helper_fchs_ST0, (void))
  159 +DEF_HELPER(void, helper_fabs_ST0, (void))
  160 +DEF_HELPER(void, helper_fxam_ST0, (void))
  161 +DEF_HELPER(void, helper_fld1_ST0, (void))
  162 +DEF_HELPER(void, helper_fldl2t_ST0, (void))
  163 +DEF_HELPER(void, helper_fldl2e_ST0, (void))
  164 +DEF_HELPER(void, helper_fldpi_ST0, (void))
  165 +DEF_HELPER(void, helper_fldlg2_ST0, (void))
  166 +DEF_HELPER(void, helper_fldln2_ST0, (void))
  167 +DEF_HELPER(void, helper_fldz_ST0, (void))
  168 +DEF_HELPER(void, helper_fldz_FT0, (void))
  169 +DEF_HELPER(uint32_t, helper_fnstsw, (void))
  170 +DEF_HELPER(uint32_t, helper_fnstcw, (void))
  171 +DEF_HELPER(void, helper_fldcw, (uint32_t val))
  172 +DEF_HELPER(void, helper_fclex, (void))
  173 +DEF_HELPER(void, helper_fwait, (void))
  174 +DEF_HELPER(void, helper_fninit, (void))
  175 +DEF_HELPER(void, helper_fbld_ST0, (target_ulong ptr))
  176 +DEF_HELPER(void, helper_fbst_ST0, (target_ulong ptr))
  177 +DEF_HELPER(void, helper_f2xm1, (void))
  178 +DEF_HELPER(void, helper_fyl2x, (void))
  179 +DEF_HELPER(void, helper_fptan, (void))
  180 +DEF_HELPER(void, helper_fpatan, (void))
  181 +DEF_HELPER(void, helper_fxtract, (void))
  182 +DEF_HELPER(void, helper_fprem1, (void))
  183 +DEF_HELPER(void, helper_fprem, (void))
  184 +DEF_HELPER(void, helper_fyl2xp1, (void))
  185 +DEF_HELPER(void, helper_fsqrt, (void))
  186 +DEF_HELPER(void, helper_fsincos, (void))
  187 +DEF_HELPER(void, helper_frndint, (void))
  188 +DEF_HELPER(void, helper_fscale, (void))
  189 +DEF_HELPER(void, helper_fsin, (void))
  190 +DEF_HELPER(void, helper_fcos, (void))
  191 +DEF_HELPER(void, helper_fxam_ST0, (void))
  192 +DEF_HELPER(void, helper_fstenv, (target_ulong ptr, int data32))
  193 +DEF_HELPER(void, helper_fldenv, (target_ulong ptr, int data32))
  194 +DEF_HELPER(void, helper_fsave, (target_ulong ptr, int data32))
  195 +DEF_HELPER(void, helper_frstor, (target_ulong ptr, int data32))
  196 +DEF_HELPER(void, helper_fxsave, (target_ulong ptr, int data64))
  197 +DEF_HELPER(void, helper_fxrstor, (target_ulong ptr, int data64))
  198 +DEF_HELPER(target_ulong, helper_bsf, (target_ulong t0))
  199 +DEF_HELPER(target_ulong, helper_bsr, (target_ulong t0))
198 200
199 /* MMX/SSE */ 201 /* MMX/SSE */
200 202
201 -void TCG_HELPER_PROTO helper_enter_mmx(void);  
202 -void TCG_HELPER_PROTO helper_emms(void);  
203 -void TCG_HELPER_PROTO helper_movq(uint64_t *d, uint64_t *s); 203 +DEF_HELPER(void, helper_enter_mmx, (void))
  204 +DEF_HELPER(void, helper_emms, (void))
  205 +DEF_HELPER(void, helper_movq, (uint64_t *d, uint64_t *s))
204 206
205 #define SHIFT 0 207 #define SHIFT 0
206 #include "ops_sse_header.h" 208 #include "ops_sse_header.h"
207 #define SHIFT 1 209 #define SHIFT 1
208 #include "ops_sse_header.h" 210 #include "ops_sse_header.h"
209 211
210 -target_ulong helper_rclb(target_ulong t0, target_ulong t1);  
211 -target_ulong helper_rclw(target_ulong t0, target_ulong t1);  
212 -target_ulong helper_rcll(target_ulong t0, target_ulong t1);  
213 -target_ulong helper_rcrb(target_ulong t0, target_ulong t1);  
214 -target_ulong helper_rcrw(target_ulong t0, target_ulong t1);  
215 -target_ulong helper_rcrl(target_ulong t0, target_ulong t1); 212 +DEF_HELPER(target_ulong, helper_rclb, (target_ulong t0, target_ulong t1))
  213 +DEF_HELPER(target_ulong, helper_rclw, (target_ulong t0, target_ulong t1))
  214 +DEF_HELPER(target_ulong, helper_rcll, (target_ulong t0, target_ulong t1))
  215 +DEF_HELPER(target_ulong, helper_rcrb, (target_ulong t0, target_ulong t1))
  216 +DEF_HELPER(target_ulong, helper_rcrw, (target_ulong t0, target_ulong t1))
  217 +DEF_HELPER(target_ulong, helper_rcrl, (target_ulong t0, target_ulong t1))
216 #ifdef TARGET_X86_64 218 #ifdef TARGET_X86_64
217 -target_ulong helper_rclq(target_ulong t0, target_ulong t1);  
218 -target_ulong helper_rcrq(target_ulong t0, target_ulong t1); 219 +DEF_HELPER(target_ulong, helper_rclq, (target_ulong t0, target_ulong t1))
  220 +DEF_HELPER(target_ulong, helper_rcrq, (target_ulong t0, target_ulong t1))
219 #endif 221 #endif
220 222
  223 +#undef DEF_HELPER
target-i386/ops_sse_header.h
  View file @437a88a
@@ -25,99 +25,99 @@ @@ -25,99 +25,99 @@
25 #define SUFFIX _xmm 25 #define SUFFIX _xmm
26 #endif 26 #endif
27 27
28 -void glue(helper_psrlw, SUFFIX)(Reg *d, Reg *s);  
29 -void glue(helper_psraw, SUFFIX)(Reg *d, Reg *s);  
30 -void glue(helper_psllw, SUFFIX)(Reg *d, Reg *s);  
31 -void glue(helper_psrld, SUFFIX)(Reg *d, Reg *s);  
32 -void glue(helper_psrad, SUFFIX)(Reg *d, Reg *s);  
33 -void glue(helper_pslld, SUFFIX)(Reg *d, Reg *s);  
34 -void glue(helper_psrlq, SUFFIX)(Reg *d, Reg *s);  
35 -void glue(helper_psllq, SUFFIX)(Reg *d, Reg *s); 28 +DEF_HELPER(void, glue(helper_psrlw, SUFFIX), (Reg *d, Reg *s))
  29 +DEF_HELPER(void, glue(helper_psraw, SUFFIX), (Reg *d, Reg *s))
  30 +DEF_HELPER(void, glue(helper_psllw, SUFFIX), (Reg *d, Reg *s))
  31 +DEF_HELPER(void, glue(helper_psrld, SUFFIX), (Reg *d, Reg *s))
  32 +DEF_HELPER(void, glue(helper_psrad, SUFFIX), (Reg *d, Reg *s))
  33 +DEF_HELPER(void, glue(helper_pslld, SUFFIX), (Reg *d, Reg *s))
  34 +DEF_HELPER(void, glue(helper_psrlq, SUFFIX), (Reg *d, Reg *s))
  35 +DEF_HELPER(void, glue(helper_psllq, SUFFIX), (Reg *d, Reg *s))
36 36
37 #if SHIFT == 1 37 #if SHIFT == 1
38 -void glue(helper_psrldq, SUFFIX)(Reg *d, Reg *s);  
39 -void glue(helper_pslldq, SUFFIX)(Reg *d, Reg *s); 38 +DEF_HELPER(void, glue(helper_psrldq, SUFFIX), (Reg *d, Reg *s))
  39 +DEF_HELPER(void, glue(helper_pslldq, SUFFIX), (Reg *d, Reg *s))
40 #endif 40 #endif
41 41
42 #define SSE_HELPER_B(name, F)\ 42 #define SSE_HELPER_B(name, F)\
43 - void glue(name, SUFFIX) (Reg *d, Reg *s); 43 + DEF_HELPER(void, glue(name, SUFFIX), (Reg *d, Reg *s))
44 44
45 #define SSE_HELPER_W(name, F)\ 45 #define SSE_HELPER_W(name, F)\
46 - void glue(name, SUFFIX) (Reg *d, Reg *s); 46 + DEF_HELPER(void, glue(name, SUFFIX), (Reg *d, Reg *s))
47 47
48 #define SSE_HELPER_L(name, F)\ 48 #define SSE_HELPER_L(name, F)\
49 - void glue(name, SUFFIX) (Reg *d, Reg *s); 49 + DEF_HELPER(void, glue(name, SUFFIX), (Reg *d, Reg *s))
50 50
51 #define SSE_HELPER_Q(name, F)\ 51 #define SSE_HELPER_Q(name, F)\
52 - void glue(name, SUFFIX) (Reg *d, Reg *s); 52 + DEF_HELPER(void, glue(name, SUFFIX), (Reg *d, Reg *s))
53 53
54 -SSE_HELPER_B(helper_paddb, FADD);  
55 -SSE_HELPER_W(helper_paddw, FADD);  
56 -SSE_HELPER_L(helper_paddl, FADD);  
57 -SSE_HELPER_Q(helper_paddq, FADD); 54 +SSE_HELPER_B(helper_paddb, FADD)
  55 +SSE_HELPER_W(helper_paddw, FADD)
  56 +SSE_HELPER_L(helper_paddl, FADD)
  57 +SSE_HELPER_Q(helper_paddq, FADD)
58 58
59 -SSE_HELPER_B(helper_psubb, FSUB);  
60 -SSE_HELPER_W(helper_psubw, FSUB);  
61 -SSE_HELPER_L(helper_psubl, FSUB);  
62 -SSE_HELPER_Q(helper_psubq, FSUB); 59 +SSE_HELPER_B(helper_psubb, FSUB)
  60 +SSE_HELPER_W(helper_psubw, FSUB)
  61 +SSE_HELPER_L(helper_psubl, FSUB)
  62 +SSE_HELPER_Q(helper_psubq, FSUB)
63 63
64 -SSE_HELPER_B(helper_paddusb, FADDUB);  
65 -SSE_HELPER_B(helper_paddsb, FADDSB);  
66 -SSE_HELPER_B(helper_psubusb, FSUBUB);  
67 -SSE_HELPER_B(helper_psubsb, FSUBSB); 64 +SSE_HELPER_B(helper_paddusb, FADDUB)
  65 +SSE_HELPER_B(helper_paddsb, FADDSB)
  66 +SSE_HELPER_B(helper_psubusb, FSUBUB)
  67 +SSE_HELPER_B(helper_psubsb, FSUBSB)
68 68
69 -SSE_HELPER_W(helper_paddusw, FADDUW);  
70 -SSE_HELPER_W(helper_paddsw, FADDSW);  
71 -SSE_HELPER_W(helper_psubusw, FSUBUW);  
72 -SSE_HELPER_W(helper_psubsw, FSUBSW); 69 +SSE_HELPER_W(helper_paddusw, FADDUW)
  70 +SSE_HELPER_W(helper_paddsw, FADDSW)
  71 +SSE_HELPER_W(helper_psubusw, FSUBUW)
  72 +SSE_HELPER_W(helper_psubsw, FSUBSW)
73 73
74 -SSE_HELPER_B(helper_pminub, FMINUB);  
75 -SSE_HELPER_B(helper_pmaxub, FMAXUB); 74 +SSE_HELPER_B(helper_pminub, FMINUB)
  75 +SSE_HELPER_B(helper_pmaxub, FMAXUB)
76 76
77 -SSE_HELPER_W(helper_pminsw, FMINSW);  
78 -SSE_HELPER_W(helper_pmaxsw, FMAXSW); 77 +SSE_HELPER_W(helper_pminsw, FMINSW)
  78 +SSE_HELPER_W(helper_pmaxsw, FMAXSW)
79 79
80 -SSE_HELPER_Q(helper_pand, FAND);  
81 -SSE_HELPER_Q(helper_pandn, FANDN);  
82 -SSE_HELPER_Q(helper_por, FOR);  
83 -SSE_HELPER_Q(helper_pxor, FXOR); 80 +SSE_HELPER_Q(helper_pand, FAND)
  81 +SSE_HELPER_Q(helper_pandn, FANDN)
  82 +SSE_HELPER_Q(helper_por, FOR)
  83 +SSE_HELPER_Q(helper_pxor, FXOR)
84 84
85 -SSE_HELPER_B(helper_pcmpgtb, FCMPGTB);  
86 -SSE_HELPER_W(helper_pcmpgtw, FCMPGTW);  
87 -SSE_HELPER_L(helper_pcmpgtl, FCMPGTL); 85 +SSE_HELPER_B(helper_pcmpgtb, FCMPGTB)
  86 +SSE_HELPER_W(helper_pcmpgtw, FCMPGTW)
  87 +SSE_HELPER_L(helper_pcmpgtl, FCMPGTL)
88 88
89 -SSE_HELPER_B(helper_pcmpeqb, FCMPEQ);  
90 -SSE_HELPER_W(helper_pcmpeqw, FCMPEQ);  
91 -SSE_HELPER_L(helper_pcmpeql, FCMPEQ); 89 +SSE_HELPER_B(helper_pcmpeqb, FCMPEQ)
  90 +SSE_HELPER_W(helper_pcmpeqw, FCMPEQ)
  91 +SSE_HELPER_L(helper_pcmpeql, FCMPEQ)
92 92
93 -SSE_HELPER_W(helper_pmullw, FMULLW); 93 +SSE_HELPER_W(helper_pmullw, FMULLW)
94 #if SHIFT == 0 94 #if SHIFT == 0
95 -SSE_HELPER_W(helper_pmulhrw, FMULHRW); 95 +SSE_HELPER_W(helper_pmulhrw, FMULHRW)
96 #endif 96 #endif
97 -SSE_HELPER_W(helper_pmulhuw, FMULHUW);  
98 -SSE_HELPER_W(helper_pmulhw, FMULHW); 97 +SSE_HELPER_W(helper_pmulhuw, FMULHUW)
  98 +SSE_HELPER_W(helper_pmulhw, FMULHW)
99 99
100 -SSE_HELPER_B(helper_pavgb, FAVG);  
101 -SSE_HELPER_W(helper_pavgw, FAVG); 100 +SSE_HELPER_B(helper_pavgb, FAVG)
  101 +SSE_HELPER_W(helper_pavgw, FAVG)
102 102
103 -void glue(helper_pmuludq, SUFFIX) (Reg *d, Reg *s);  
104 -void glue(helper_pmaddwd, SUFFIX) (Reg *d, Reg *s); 103 +DEF_HELPER(void, glue(helper_pmuludq, SUFFIX) , (Reg *d, Reg *s))
  104 +DEF_HELPER(void, glue(helper_pmaddwd, SUFFIX) , (Reg *d, Reg *s))
105 105
106 -void glue(helper_psadbw, SUFFIX) (Reg *d, Reg *s);  
107 -void glue(helper_maskmov, SUFFIX) (Reg *d, Reg *s, target_ulong a0);  
108 -void glue(helper_movl_mm_T0, SUFFIX) (Reg *d, uint32_t val); 106 +DEF_HELPER(void, glue(helper_psadbw, SUFFIX) , (Reg *d, Reg *s))
  107 +DEF_HELPER(void, glue(helper_maskmov, SUFFIX) , (Reg *d, Reg *s, target_ulong a0))
  108 +DEF_HELPER(void, glue(helper_movl_mm_T0, SUFFIX) , (Reg *d, uint32_t val))
109 #ifdef TARGET_X86_64 109 #ifdef TARGET_X86_64
110 -void glue(helper_movq_mm_T0, SUFFIX) (Reg *d, uint64_t val); 110 +DEF_HELPER(void, glue(helper_movq_mm_T0, SUFFIX) , (Reg *d, uint64_t val))
111 #endif 111 #endif
112 112
113 #if SHIFT == 0 113 #if SHIFT == 0
114 -void glue(helper_pshufw, SUFFIX) (Reg *d, Reg *s, int order); 114 +DEF_HELPER(void, glue(helper_pshufw, SUFFIX) , (Reg *d, Reg *s, int order))
115 #else 115 #else
116 -void helper_shufps(Reg *d, Reg *s, int order);  
117 -void helper_shufpd(Reg *d, Reg *s, int order);  
118 -void glue(helper_pshufd, SUFFIX) (Reg *d, Reg *s, int order);  
119 -void glue(helper_pshuflw, SUFFIX) (Reg *d, Reg *s, int order);  
120 -void glue(helper_pshufhw, SUFFIX) (Reg *d, Reg *s, int order); 116 +DEF_HELPER(void, helper_shufps, (Reg *d, Reg *s, int order))
  117 +DEF_HELPER(void, helper_shufpd, (Reg *d, Reg *s, int order))
  118 +DEF_HELPER(void, glue(helper_pshufd, SUFFIX) , (Reg *d, Reg *s, int order))
  119 +DEF_HELPER(void, glue(helper_pshuflw, SUFFIX) , (Reg *d, Reg *s, int order))
  120 +DEF_HELPER(void, glue(helper_pshufhw, SUFFIX) , (Reg *d, Reg *s, int order))
121 #endif 121 #endif
122 122
123 #if SHIFT == 1 123 #if SHIFT == 1
@@ -125,130 +125,130 @@ void glue(helper_pshufhw, SUFFIX) (Reg *d, Reg *s, int order); @@ -125,130 +125,130 @@ void glue(helper_pshufhw, SUFFIX) (Reg *d, Reg *s, int order);
125 /* XXX: not accurate */ 125 /* XXX: not accurate */
126 126
127 #define SSE_HELPER_S(name, F)\ 127 #define SSE_HELPER_S(name, F)\
128 - void helper_ ## name ## ps (Reg *d, Reg *s); \  
129 - void helper_ ## name ## ss (Reg *d, Reg *s); \  
130 - void helper_ ## name ## pd (Reg *d, Reg *s); \  
131 - void helper_ ## name ## sd (Reg *d, Reg *s);  
132 -  
133 -SSE_HELPER_S(add, FPU_ADD);  
134 -SSE_HELPER_S(sub, FPU_SUB);  
135 -SSE_HELPER_S(mul, FPU_MUL);  
136 -SSE_HELPER_S(div, FPU_DIV);  
137 -SSE_HELPER_S(min, FPU_MIN);  
138 -SSE_HELPER_S(max, FPU_MAX);  
139 -SSE_HELPER_S(sqrt, FPU_SQRT);  
140 -  
141 -  
142 -void helper_cvtps2pd(Reg *d, Reg *s);  
143 -void helper_cvtpd2ps(Reg *d, Reg *s);  
144 -void helper_cvtss2sd(Reg *d, Reg *s);  
145 -void helper_cvtsd2ss(Reg *d, Reg *s);  
146 -void helper_cvtdq2ps(Reg *d, Reg *s);  
147 -void helper_cvtdq2pd(Reg *d, Reg *s);  
148 -void helper_cvtpi2ps(XMMReg *d, MMXReg *s);  
149 -void helper_cvtpi2pd(XMMReg *d, MMXReg *s);  
150 -void helper_cvtsi2ss(XMMReg *d, uint32_t val);  
151 -void helper_cvtsi2sd(XMMReg *d, uint32_t val); 128 + DEF_HELPER(void, helper_ ## name ## ps , (Reg *d, Reg *s)) \
  129 + DEF_HELPER(void, helper_ ## name ## ss , (Reg *d, Reg *s)) \
  130 + DEF_HELPER(void, helper_ ## name ## pd , (Reg *d, Reg *s)) \
  131 + DEF_HELPER(void, helper_ ## name ## sd , (Reg *d, Reg *s))
  132 +
  133 +SSE_HELPER_S(add, FPU_ADD)
  134 +SSE_HELPER_S(sub, FPU_SUB)
  135 +SSE_HELPER_S(mul, FPU_MUL)
  136 +SSE_HELPER_S(div, FPU_DIV)
  137 +SSE_HELPER_S(min, FPU_MIN)
  138 +SSE_HELPER_S(max, FPU_MAX)
  139 +SSE_HELPER_S(sqrt, FPU_SQRT)
  140 +
  141 +
  142 +DEF_HELPER(void, helper_cvtps2pd, (Reg *d, Reg *s))
  143 +DEF_HELPER(void, helper_cvtpd2ps, (Reg *d, Reg *s))
  144 +DEF_HELPER(void, helper_cvtss2sd, (Reg *d, Reg *s))
  145 +DEF_HELPER(void, helper_cvtsd2ss, (Reg *d, Reg *s))
  146 +DEF_HELPER(void, helper_cvtdq2ps, (Reg *d, Reg *s))
  147 +DEF_HELPER(void, helper_cvtdq2pd, (Reg *d, Reg *s))
  148 +DEF_HELPER(void, helper_cvtpi2ps, (XMMReg *d, MMXReg *s))
  149 +DEF_HELPER(void, helper_cvtpi2pd, (XMMReg *d, MMXReg *s))
  150 +DEF_HELPER(void, helper_cvtsi2ss, (XMMReg *d, uint32_t val))
  151 +DEF_HELPER(void, helper_cvtsi2sd, (XMMReg *d, uint32_t val))
152 152
153 #ifdef TARGET_X86_64 153 #ifdef TARGET_X86_64
154 -void helper_cvtsq2ss(XMMReg *d, uint64_t val);  
155 -void helper_cvtsq2sd(XMMReg *d, uint64_t val); 154 +DEF_HELPER(void, helper_cvtsq2ss, (XMMReg *d, uint64_t val))
  155 +DEF_HELPER(void, helper_cvtsq2sd, (XMMReg *d, uint64_t val))
156 #endif 156 #endif
157 157
158 -void helper_cvtps2dq(XMMReg *d, XMMReg *s);  
159 -void helper_cvtpd2dq(XMMReg *d, XMMReg *s);  
160 -void helper_cvtps2pi(MMXReg *d, XMMReg *s);  
161 -void helper_cvtpd2pi(MMXReg *d, XMMReg *s);  
162 -int32_t helper_cvtss2si(XMMReg *s);  
163 -int32_t helper_cvtsd2si(XMMReg *s); 158 +DEF_HELPER(void, helper_cvtps2dq, (XMMReg *d, XMMReg *s))
  159 +DEF_HELPER(void, helper_cvtpd2dq, (XMMReg *d, XMMReg *s))
  160 +DEF_HELPER(void, helper_cvtps2pi, (MMXReg *d, XMMReg *s))
  161 +DEF_HELPER(void, helper_cvtpd2pi, (MMXReg *d, XMMReg *s))
  162 +DEF_HELPER(int32_t, helper_cvtss2si, (XMMReg *s))
  163 +DEF_HELPER(int32_t, helper_cvtsd2si, (XMMReg *s))
164 #ifdef TARGET_X86_64 164 #ifdef TARGET_X86_64
165 -int64_t helper_cvtss2sq(XMMReg *s);  
166 -int64_t helper_cvtsd2sq(XMMReg *s); 165 +DEF_HELPER(int64_t, helper_cvtss2sq, (XMMReg *s))
  166 +DEF_HELPER(int64_t, helper_cvtsd2sq, (XMMReg *s))
167 #endif 167 #endif
168 168
169 -void helper_cvttps2dq(XMMReg *d, XMMReg *s);  
170 -void helper_cvttpd2dq(XMMReg *d, XMMReg *s);  
171 -void helper_cvttps2pi(MMXReg *d, XMMReg *s);  
172 -void helper_cvttpd2pi(MMXReg *d, XMMReg *s);  
173 -int32_t helper_cvttss2si(XMMReg *s);  
174 -int32_t helper_cvttsd2si(XMMReg *s); 169 +DEF_HELPER(void, helper_cvttps2dq, (XMMReg *d, XMMReg *s))
  170 +DEF_HELPER(void, helper_cvttpd2dq, (XMMReg *d, XMMReg *s))
  171 +DEF_HELPER(void, helper_cvttps2pi, (MMXReg *d, XMMReg *s))
  172 +DEF_HELPER(void, helper_cvttpd2pi, (MMXReg *d, XMMReg *s))
  173 +DEF_HELPER(int32_t, helper_cvttss2si, (XMMReg *s))
  174 +DEF_HELPER(int32_t, helper_cvttsd2si, (XMMReg *s))
175 #ifdef TARGET_X86_64 175 #ifdef TARGET_X86_64
176 -int64_t helper_cvttss2sq(XMMReg *s);  
177 -int64_t helper_cvttsd2sq(XMMReg *s); 176 +DEF_HELPER(int64_t, helper_cvttss2sq, (XMMReg *s))
  177 +DEF_HELPER(int64_t, helper_cvttsd2sq, (XMMReg *s))
178 #endif 178 #endif
179 179
180 -void helper_rsqrtps(XMMReg *d, XMMReg *s);  
181 -void helper_rsqrtss(XMMReg *d, XMMReg *s);  
182 -void helper_rcpps(XMMReg *d, XMMReg *s);  
183 -void helper_rcpss(XMMReg *d, XMMReg *s);  
184 -void helper_haddps(XMMReg *d, XMMReg *s);  
185 -void helper_haddpd(XMMReg *d, XMMReg *s);  
186 -void helper_hsubps(XMMReg *d, XMMReg *s);  
187 -void helper_hsubpd(XMMReg *d, XMMReg *s);  
188 -void helper_addsubps(XMMReg *d, XMMReg *s);  
189 -void helper_addsubpd(XMMReg *d, XMMReg *s); 180 +DEF_HELPER(void, helper_rsqrtps, (XMMReg *d, XMMReg *s))
  181 +DEF_HELPER(void, helper_rsqrtss, (XMMReg *d, XMMReg *s))
  182 +DEF_HELPER(void, helper_rcpps, (XMMReg *d, XMMReg *s))
  183 +DEF_HELPER(void, helper_rcpss, (XMMReg *d, XMMReg *s))
  184 +DEF_HELPER(void, helper_haddps, (XMMReg *d, XMMReg *s))
  185 +DEF_HELPER(void, helper_haddpd, (XMMReg *d, XMMReg *s))
  186 +DEF_HELPER(void, helper_hsubps, (XMMReg *d, XMMReg *s))
  187 +DEF_HELPER(void, helper_hsubpd, (XMMReg *d, XMMReg *s))
  188 +DEF_HELPER(void, helper_addsubps, (XMMReg *d, XMMReg *s))
  189 +DEF_HELPER(void, helper_addsubpd, (XMMReg *d, XMMReg *s))
190 190
191 #define SSE_HELPER_CMP(name, F)\ 191 #define SSE_HELPER_CMP(name, F)\
192 - void helper_ ## name ## ps (Reg *d, Reg *s); \  
193 - void helper_ ## name ## ss (Reg *d, Reg *s); \  
194 - void helper_ ## name ## pd (Reg *d, Reg *s); \  
195 - void helper_ ## name ## sd (Reg *d, Reg *s);  
196 -  
197 -SSE_HELPER_CMP(cmpeq, FPU_CMPEQ);  
198 -SSE_HELPER_CMP(cmplt, FPU_CMPLT);  
199 -SSE_HELPER_CMP(cmple, FPU_CMPLE);  
200 -SSE_HELPER_CMP(cmpunord, FPU_CMPUNORD);  
201 -SSE_HELPER_CMP(cmpneq, FPU_CMPNEQ);  
202 -SSE_HELPER_CMP(cmpnlt, FPU_CMPNLT);  
203 -SSE_HELPER_CMP(cmpnle, FPU_CMPNLE);  
204 -SSE_HELPER_CMP(cmpord, FPU_CMPORD);  
205 -  
206 -void helper_ucomiss(Reg *d, Reg *s);  
207 -void helper_comiss(Reg *d, Reg *s);  
208 -void helper_ucomisd(Reg *d, Reg *s);  
209 -void helper_comisd(Reg *d, Reg *s);  
210 -uint32_t helper_movmskps(Reg *s);  
211 -uint32_t helper_movmskpd(Reg *s); 192 + DEF_HELPER(void, helper_ ## name ## ps , (Reg *d, Reg *s)) \
  193 + DEF_HELPER(void, helper_ ## name ## ss , (Reg *d, Reg *s)) \
  194 + DEF_HELPER(void, helper_ ## name ## pd , (Reg *d, Reg *s)) \
  195 + DEF_HELPER(void, helper_ ## name ## sd , (Reg *d, Reg *s))
  196 +
  197 +SSE_HELPER_CMP(cmpeq, FPU_CMPEQ)
  198 +SSE_HELPER_CMP(cmplt, FPU_CMPLT)
  199 +SSE_HELPER_CMP(cmple, FPU_CMPLE)
  200 +SSE_HELPER_CMP(cmpunord, FPU_CMPUNORD)
  201 +SSE_HELPER_CMP(cmpneq, FPU_CMPNEQ)
  202 +SSE_HELPER_CMP(cmpnlt, FPU_CMPNLT)
  203 +SSE_HELPER_CMP(cmpnle, FPU_CMPNLE)
  204 +SSE_HELPER_CMP(cmpord, FPU_CMPORD)
  205 +
  206 +DEF_HELPER(void, helper_ucomiss, (Reg *d, Reg *s))
  207 +DEF_HELPER(void, helper_comiss, (Reg *d, Reg *s))
  208 +DEF_HELPER(void, helper_ucomisd, (Reg *d, Reg *s))
  209 +DEF_HELPER(void, helper_comisd, (Reg *d, Reg *s))
  210 +DEF_HELPER(uint32_t, helper_movmskps, (Reg *s))
  211 +DEF_HELPER(uint32_t, helper_movmskpd, (Reg *s))
212 #endif 212 #endif
213 213
214 -uint32_t glue(helper_pmovmskb, SUFFIX)(Reg *s);  
215 -void glue(helper_packsswb, SUFFIX) (Reg *d, Reg *s);  
216 -void glue(helper_packuswb, SUFFIX) (Reg *d, Reg *s);  
217 -void glue(helper_packssdw, SUFFIX) (Reg *d, Reg *s); 214 +DEF_HELPER(uint32_t, glue(helper_pmovmskb, SUFFIX), (Reg *s))
  215 +DEF_HELPER(void, glue(helper_packsswb, SUFFIX) , (Reg *d, Reg *s))
  216 +DEF_HELPER(void, glue(helper_packuswb, SUFFIX) , (Reg *d, Reg *s))
  217 +DEF_HELPER(void, glue(helper_packssdw, SUFFIX) , (Reg *d, Reg *s))
218 #define UNPCK_OP(base_name, base) \ 218 #define UNPCK_OP(base_name, base) \
219 - void glue(helper_punpck ## base_name ## bw, SUFFIX) (Reg *d, Reg *s); \  
220 - void glue(helper_punpck ## base_name ## wd, SUFFIX) (Reg *d, Reg *s); \  
221 - void glue(helper_punpck ## base_name ## dq, SUFFIX) (Reg *d, Reg *s); 219 + DEF_HELPER(void, glue(helper_punpck ## base_name ## bw, SUFFIX) , (Reg *d, Reg *s)) \
  220 + DEF_HELPER(void, glue(helper_punpck ## base_name ## wd, SUFFIX) , (Reg *d, Reg *s)) \
  221 + DEF_HELPER(void, glue(helper_punpck ## base_name ## dq, SUFFIX) , (Reg *d, Reg *s))
222 222
223 -UNPCK_OP(l, 0);  
224 -UNPCK_OP(h, 1); 223 +UNPCK_OP(l, 0)
  224 +UNPCK_OP(h, 1)
225 225
226 #if SHIFT == 1 226 #if SHIFT == 1
227 -void glue(helper_punpcklqdq, SUFFIX) (Reg *d, Reg *s);  
228 -void glue(helper_punpckhqdq, SUFFIX) (Reg *d, Reg *s); 227 +DEF_HELPER(void, glue(helper_punpcklqdq, SUFFIX) , (Reg *d, Reg *s))
  228 +DEF_HELPER(void, glue(helper_punpckhqdq, SUFFIX) , (Reg *d, Reg *s))
229 #endif 229 #endif
230 230
231 /* 3DNow! float ops */ 231 /* 3DNow! float ops */
232 #if SHIFT == 0 232 #if SHIFT == 0
233 -void helper_pi2fd(MMXReg *d, MMXReg *s);  
234 -void helper_pi2fw(MMXReg *d, MMXReg *s);  
235 -void helper_pf2id(MMXReg *d, MMXReg *s);  
236 -void helper_pf2iw(MMXReg *d, MMXReg *s);  
237 -void helper_pfacc(MMXReg *d, MMXReg *s);  
238 -void helper_pfadd(MMXReg *d, MMXReg *s);  
239 -void helper_pfcmpeq(MMXReg *d, MMXReg *s);  
240 -void helper_pfcmpge(MMXReg *d, MMXReg *s);  
241 -void helper_pfcmpgt(MMXReg *d, MMXReg *s);  
242 -void helper_pfmax(MMXReg *d, MMXReg *s);  
243 -void helper_pfmin(MMXReg *d, MMXReg *s);  
244 -void helper_pfmul(MMXReg *d, MMXReg *s);  
245 -void helper_pfnacc(MMXReg *d, MMXReg *s);  
246 -void helper_pfpnacc(MMXReg *d, MMXReg *s);  
247 -void helper_pfrcp(MMXReg *d, MMXReg *s);  
248 -void helper_pfrsqrt(MMXReg *d, MMXReg *s);  
249 -void helper_pfsub(MMXReg *d, MMXReg *s);  
250 -void helper_pfsubr(MMXReg *d, MMXReg *s);  
251 -void helper_pswapd(MMXReg *d, MMXReg *s); 233 +DEF_HELPER(void, helper_pi2fd, (MMXReg *d, MMXReg *s))
  234 +DEF_HELPER(void, helper_pi2fw, (MMXReg *d, MMXReg *s))
  235 +DEF_HELPER(void, helper_pf2id, (MMXReg *d, MMXReg *s))
  236 +DEF_HELPER(void, helper_pf2iw, (MMXReg *d, MMXReg *s))
  237 +DEF_HELPER(void, helper_pfacc, (MMXReg *d, MMXReg *s))
  238 +DEF_HELPER(void, helper_pfadd, (MMXReg *d, MMXReg *s))
  239 +DEF_HELPER(void, helper_pfcmpeq, (MMXReg *d, MMXReg *s))
  240 +DEF_HELPER(void, helper_pfcmpge, (MMXReg *d, MMXReg *s))
  241 +DEF_HELPER(void, helper_pfcmpgt, (MMXReg *d, MMXReg *s))
  242 +DEF_HELPER(void, helper_pfmax, (MMXReg *d, MMXReg *s))
  243 +DEF_HELPER(void, helper_pfmin, (MMXReg *d, MMXReg *s))
  244 +DEF_HELPER(void, helper_pfmul, (MMXReg *d, MMXReg *s))
  245 +DEF_HELPER(void, helper_pfnacc, (MMXReg *d, MMXReg *s))
  246 +DEF_HELPER(void, helper_pfpnacc, (MMXReg *d, MMXReg *s))
  247 +DEF_HELPER(void, helper_pfrcp, (MMXReg *d, MMXReg *s))
  248 +DEF_HELPER(void, helper_pfrsqrt, (MMXReg *d, MMXReg *s))
  249 +DEF_HELPER(void, helper_pfsub, (MMXReg *d, MMXReg *s))
  250 +DEF_HELPER(void, helper_pfsubr, (MMXReg *d, MMXReg *s))
  251 +DEF_HELPER(void, helper_pswapd, (MMXReg *d, MMXReg *s))
252 #endif 252 #endif
253 253
254 #undef SHIFT 254 #undef SHIFT
target-i386/translate.c
  View file @437a88a
@@ -7075,6 +7075,11 @@ void optimize_flags_init(void) @@ -7075,6 +7075,11 @@ void optimize_flags_init(void)
7075 TCG_AREG0, offsetof(CPUState, cc_src), "cc_src"); 7075 TCG_AREG0, offsetof(CPUState, cc_src), "cc_src");
7076 cpu_cc_dst = tcg_global_mem_new(TCG_TYPE_TL, 7076 cpu_cc_dst = tcg_global_mem_new(TCG_TYPE_TL,
7077 TCG_AREG0, offsetof(CPUState, cc_dst), "cc_dst"); 7077 TCG_AREG0, offsetof(CPUState, cc_dst), "cc_dst");
  7078 +
  7079 + /* register helpers */
  7080 +
  7081 +#define DEF_HELPER(ret, name, params) tcg_register_helper(name, #name);
  7082 +#include "helper.h"
7078 } 7083 }
7079 7084
7080 /* generate intermediate code in gen_opc_buf and gen_opparam_buf for 7085 /* generate intermediate code in gen_opc_buf and gen_opparam_buf for