diff options
Diffstat (limited to '')
-rw-r--r-- | src/lj_ircall.h | 166 |
1 files changed, 119 insertions, 47 deletions
diff --git a/src/lj_ircall.h b/src/lj_ircall.h index 916df462..144135a4 100644 --- a/src/lj_ircall.h +++ b/src/lj_ircall.h | |||
@@ -16,7 +16,7 @@ typedef struct CCallInfo { | |||
16 | uint32_t flags; /* Number of arguments and flags. */ | 16 | uint32_t flags; /* Number of arguments and flags. */ |
17 | } CCallInfo; | 17 | } CCallInfo; |
18 | 18 | ||
19 | #define CCI_NARGS(ci) ((ci)->flags & 0xff) /* Extract # of args. */ | 19 | #define CCI_NARGS(ci) ((ci)->flags & 0xff) /* # of args. */ |
20 | #define CCI_NARGS_MAX 32 /* Max. # of args. */ | 20 | #define CCI_NARGS_MAX 32 /* Max. # of args. */ |
21 | 21 | ||
22 | #define CCI_OTSHIFT 16 | 22 | #define CCI_OTSHIFT 16 |
@@ -25,6 +25,7 @@ typedef struct CCallInfo { | |||
25 | #define CCI_OP(ci) ((ci)->flags >> CCI_OPSHIFT) /* Get op. */ | 25 | #define CCI_OP(ci) ((ci)->flags >> CCI_OPSHIFT) /* Get op. */ |
26 | 26 | ||
27 | #define CCI_CALL_N (IR_CALLN << CCI_OPSHIFT) | 27 | #define CCI_CALL_N (IR_CALLN << CCI_OPSHIFT) |
28 | #define CCI_CALL_A (IR_CALLA << CCI_OPSHIFT) | ||
28 | #define CCI_CALL_L (IR_CALLL << CCI_OPSHIFT) | 29 | #define CCI_CALL_L (IR_CALLL << CCI_OPSHIFT) |
29 | #define CCI_CALL_S (IR_CALLS << CCI_OPSHIFT) | 30 | #define CCI_CALL_S (IR_CALLS << CCI_OPSHIFT) |
30 | #define CCI_CALL_FN (CCI_CALL_N|CCI_CC_FASTCALL) | 31 | #define CCI_CALL_FN (CCI_CALL_N|CCI_CC_FASTCALL) |
@@ -45,6 +46,17 @@ typedef struct CCallInfo { | |||
45 | #define CCI_CC_FASTCALL 0x2000 /* Fastcall calling convention. */ | 46 | #define CCI_CC_FASTCALL 0x2000 /* Fastcall calling convention. */ |
46 | #define CCI_CC_STDCALL 0x3000 /* Stdcall calling convention. */ | 47 | #define CCI_CC_STDCALL 0x3000 /* Stdcall calling convention. */ |
47 | 48 | ||
49 | /* Extra args for SOFTFP, SPLIT 64 bit. */ | ||
50 | #define CCI_XARGS_SHIFT 14 | ||
51 | #define CCI_XARGS(ci) (((ci)->flags >> CCI_XARGS_SHIFT) & 3) | ||
52 | #define CCI_XA (1u << CCI_XARGS_SHIFT) | ||
53 | |||
54 | #if LJ_SOFTFP || (LJ_32 && LJ_HASFFI) | ||
55 | #define CCI_XNARGS(ci) (CCI_NARGS((ci)) + CCI_XARGS((ci))) | ||
56 | #else | ||
57 | #define CCI_XNARGS(ci) CCI_NARGS((ci)) | ||
58 | #endif | ||
59 | |||
48 | /* Helpers for conditional function definitions. */ | 60 | /* Helpers for conditional function definitions. */ |
49 | #define IRCALLCOND_ANY(x) x | 61 | #define IRCALLCOND_ANY(x) x |
50 | 62 | ||
@@ -66,6 +78,12 @@ typedef struct CCallInfo { | |||
66 | #define IRCALLCOND_SOFTFP_FFI(x) NULL | 78 | #define IRCALLCOND_SOFTFP_FFI(x) NULL |
67 | #endif | 79 | #endif |
68 | 80 | ||
81 | #if LJ_SOFTFP && LJ_TARGET_MIPS | ||
82 | #define IRCALLCOND_SOFTFP_MIPS(x) x | ||
83 | #else | ||
84 | #define IRCALLCOND_SOFTFP_MIPS(x) NULL | ||
85 | #endif | ||
86 | |||
69 | #define LJ_NEED_FP64 (LJ_TARGET_ARM || LJ_TARGET_PPC || LJ_TARGET_MIPS) | 87 | #define LJ_NEED_FP64 (LJ_TARGET_ARM || LJ_TARGET_PPC || LJ_TARGET_MIPS) |
70 | 88 | ||
71 | #if LJ_HASFFI && (LJ_SOFTFP || LJ_NEED_FP64) | 89 | #if LJ_HASFFI && (LJ_SOFTFP || LJ_NEED_FP64) |
@@ -93,26 +111,52 @@ typedef struct CCallInfo { | |||
93 | #endif | 111 | #endif |
94 | 112 | ||
95 | #if LJ_SOFTFP | 113 | #if LJ_SOFTFP |
96 | #define ARG1_FP 2 /* Treat as 2 32 bit arguments. */ | 114 | #define XA_FP CCI_XA |
115 | #define XA2_FP (CCI_XA+CCI_XA) | ||
97 | #else | 116 | #else |
98 | #define ARG1_FP 1 | 117 | #define XA_FP 0 |
118 | #define XA2_FP 0 | ||
99 | #endif | 119 | #endif |
100 | 120 | ||
101 | #if LJ_32 | 121 | #if LJ_32 |
102 | #define ARG2_64 4 /* Treat as 4 32 bit arguments. */ | 122 | #define XA_64 CCI_XA |
123 | #define XA2_64 (CCI_XA+CCI_XA) | ||
103 | #else | 124 | #else |
104 | #define ARG2_64 2 | 125 | #define XA_64 0 |
126 | #define XA2_64 0 | ||
105 | #endif | 127 | #endif |
106 | 128 | ||
107 | /* Function definitions for CALL* instructions. */ | 129 | /* Function definitions for CALL* instructions. */ |
108 | #define IRCALLDEF(_) \ | 130 | #define IRCALLDEF(_) \ |
109 | _(ANY, lj_str_cmp, 2, FN, INT, CCI_NOFPRCLOBBER) \ | 131 | _(ANY, lj_str_cmp, 2, FN, INT, CCI_NOFPRCLOBBER) \ |
132 | _(ANY, lj_str_find, 4, N, P32, 0) \ | ||
110 | _(ANY, lj_str_new, 3, S, STR, CCI_L) \ | 133 | _(ANY, lj_str_new, 3, S, STR, CCI_L) \ |
111 | _(ANY, lj_strscan_num, 2, FN, INT, 0) \ | 134 | _(ANY, lj_strscan_num, 2, FN, INT, 0) \ |
112 | _(ANY, lj_str_fromint, 2, FN, STR, CCI_L) \ | 135 | _(ANY, lj_strfmt_int, 2, FN, STR, CCI_L) \ |
113 | _(ANY, lj_str_fromnum, 2, FN, STR, CCI_L) \ | 136 | _(ANY, lj_strfmt_num, 2, FN, STR, CCI_L) \ |
137 | _(ANY, lj_strfmt_char, 2, FN, STR, CCI_L) \ | ||
138 | _(ANY, lj_strfmt_putint, 2, FL, P32, 0) \ | ||
139 | _(ANY, lj_strfmt_putnum, 2, FL, P32, 0) \ | ||
140 | _(ANY, lj_strfmt_putquoted, 2, FL, P32, 0) \ | ||
141 | _(ANY, lj_strfmt_putfxint, 3, L, P32, XA_64) \ | ||
142 | _(ANY, lj_strfmt_putfnum_int, 3, L, P32, XA_FP) \ | ||
143 | _(ANY, lj_strfmt_putfnum_uint, 3, L, P32, XA_FP) \ | ||
144 | _(ANY, lj_strfmt_putfnum, 3, L, P32, XA_FP) \ | ||
145 | _(ANY, lj_strfmt_putfstr, 3, L, P32, 0) \ | ||
146 | _(ANY, lj_strfmt_putfchar, 3, L, P32, 0) \ | ||
147 | _(ANY, lj_buf_putmem, 3, S, P32, 0) \ | ||
148 | _(ANY, lj_buf_putstr, 2, FL, P32, 0) \ | ||
149 | _(ANY, lj_buf_putchar, 2, FL, P32, 0) \ | ||
150 | _(ANY, lj_buf_putstr_reverse, 2, FL, P32, 0) \ | ||
151 | _(ANY, lj_buf_putstr_lower, 2, FL, P32, 0) \ | ||
152 | _(ANY, lj_buf_putstr_upper, 2, FL, P32, 0) \ | ||
153 | _(ANY, lj_buf_putstr_rep, 3, L, P32, 0) \ | ||
154 | _(ANY, lj_buf_puttab, 5, L, P32, 0) \ | ||
155 | _(ANY, lj_buf_tostr, 1, FL, STR, 0) \ | ||
156 | _(ANY, lj_tab_new_ah, 3, A, TAB, CCI_L) \ | ||
114 | _(ANY, lj_tab_new1, 2, FS, TAB, CCI_L) \ | 157 | _(ANY, lj_tab_new1, 2, FS, TAB, CCI_L) \ |
115 | _(ANY, lj_tab_dup, 2, FS, TAB, CCI_L) \ | 158 | _(ANY, lj_tab_dup, 2, FS, TAB, CCI_L) \ |
159 | _(ANY, lj_tab_clear, 1, FS, NIL, 0) \ | ||
116 | _(ANY, lj_tab_newkey, 3, S, P32, CCI_L) \ | 160 | _(ANY, lj_tab_newkey, 3, S, P32, CCI_L) \ |
117 | _(ANY, lj_tab_len, 1, FL, INT, 0) \ | 161 | _(ANY, lj_tab_len, 1, FL, INT, 0) \ |
118 | _(ANY, lj_gc_step_jit, 2, FS, NIL, CCI_L) \ | 162 | _(ANY, lj_gc_step_jit, 2, FS, NIL, CCI_L) \ |
@@ -120,29 +164,29 @@ typedef struct CCallInfo { | |||
120 | _(ANY, lj_mem_newgco, 2, FS, P32, CCI_L) \ | 164 | _(ANY, lj_mem_newgco, 2, FS, P32, CCI_L) \ |
121 | _(ANY, lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_RANDFPR)\ | 165 | _(ANY, lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_RANDFPR)\ |
122 | _(ANY, lj_vm_modi, 2, FN, INT, 0) \ | 166 | _(ANY, lj_vm_modi, 2, FN, INT, 0) \ |
123 | _(ANY, sinh, ARG1_FP, N, NUM, 0) \ | 167 | _(ANY, sinh, 1, N, NUM, XA_FP) \ |
124 | _(ANY, cosh, ARG1_FP, N, NUM, 0) \ | 168 | _(ANY, cosh, 1, N, NUM, XA_FP) \ |
125 | _(ANY, tanh, ARG1_FP, N, NUM, 0) \ | 169 | _(ANY, tanh, 1, N, NUM, XA_FP) \ |
126 | _(ANY, fputc, 2, S, INT, 0) \ | 170 | _(ANY, fputc, 2, S, INT, 0) \ |
127 | _(ANY, fwrite, 4, S, INT, 0) \ | 171 | _(ANY, fwrite, 4, S, INT, 0) \ |
128 | _(ANY, fflush, 1, S, INT, 0) \ | 172 | _(ANY, fflush, 1, S, INT, 0) \ |
129 | /* ORDER FPM */ \ | 173 | /* ORDER FPM */ \ |
130 | _(FPMATH, lj_vm_floor, ARG1_FP, N, NUM, 0) \ | 174 | _(FPMATH, lj_vm_floor, 1, N, NUM, XA_FP) \ |
131 | _(FPMATH, lj_vm_ceil, ARG1_FP, N, NUM, 0) \ | 175 | _(FPMATH, lj_vm_ceil, 1, N, NUM, XA_FP) \ |
132 | _(FPMATH, lj_vm_trunc, ARG1_FP, N, NUM, 0) \ | 176 | _(FPMATH, lj_vm_trunc, 1, N, NUM, XA_FP) \ |
133 | _(FPMATH, sqrt, ARG1_FP, N, NUM, 0) \ | 177 | _(FPMATH, sqrt, 1, N, NUM, XA_FP) \ |
134 | _(FPMATH, exp, ARG1_FP, N, NUM, 0) \ | 178 | _(ANY, exp, 1, N, NUM, XA_FP) \ |
135 | _(FPMATH, lj_vm_exp2, ARG1_FP, N, NUM, 0) \ | 179 | _(ANY, lj_vm_exp2, 1, N, NUM, XA_FP) \ |
136 | _(FPMATH, log, ARG1_FP, N, NUM, 0) \ | 180 | _(ANY, log, 1, N, NUM, XA_FP) \ |
137 | _(FPMATH, lj_vm_log2, ARG1_FP, N, NUM, 0) \ | 181 | _(ANY, lj_vm_log2, 1, N, NUM, XA_FP) \ |
138 | _(FPMATH, log10, ARG1_FP, N, NUM, 0) \ | 182 | _(ANY, log10, 1, N, NUM, XA_FP) \ |
139 | _(FPMATH, sin, ARG1_FP, N, NUM, 0) \ | 183 | _(ANY, sin, 1, N, NUM, XA_FP) \ |
140 | _(FPMATH, cos, ARG1_FP, N, NUM, 0) \ | 184 | _(ANY, cos, 1, N, NUM, XA_FP) \ |
141 | _(FPMATH, tan, ARG1_FP, N, NUM, 0) \ | 185 | _(ANY, tan, 1, N, NUM, XA_FP) \ |
142 | _(FPMATH, lj_vm_powi, ARG1_FP+1, N, NUM, 0) \ | 186 | _(ANY, lj_vm_powi, 2, N, NUM, XA_FP) \ |
143 | _(FPMATH, pow, ARG1_FP*2, N, NUM, 0) \ | 187 | _(ANY, pow, 2, N, NUM, XA2_FP) \ |
144 | _(FPMATH, atan2, ARG1_FP*2, N, NUM, 0) \ | 188 | _(ANY, atan2, 2, N, NUM, XA2_FP) \ |
145 | _(FPMATH, ldexp, ARG1_FP+1, N, NUM, 0) \ | 189 | _(ANY, ldexp, 2, N, NUM, XA_FP) \ |
146 | _(SOFTFP, lj_vm_tobit, 2, N, INT, 0) \ | 190 | _(SOFTFP, lj_vm_tobit, 2, N, INT, 0) \ |
147 | _(SOFTFP, softfp_add, 4, N, NUM, 0) \ | 191 | _(SOFTFP, softfp_add, 4, N, NUM, 0) \ |
148 | _(SOFTFP, softfp_sub, 4, N, NUM, 0) \ | 192 | _(SOFTFP, softfp_sub, 4, N, NUM, 0) \ |
@@ -151,6 +195,8 @@ typedef struct CCallInfo { | |||
151 | _(SOFTFP, softfp_cmp, 4, N, NIL, 0) \ | 195 | _(SOFTFP, softfp_cmp, 4, N, NIL, 0) \ |
152 | _(SOFTFP, softfp_i2d, 1, N, NUM, 0) \ | 196 | _(SOFTFP, softfp_i2d, 1, N, NUM, 0) \ |
153 | _(SOFTFP, softfp_d2i, 2, N, INT, 0) \ | 197 | _(SOFTFP, softfp_d2i, 2, N, INT, 0) \ |
198 | _(SOFTFP_MIPS, lj_vm_sfmin, 4, N, NUM, 0) \ | ||
199 | _(SOFTFP_MIPS, lj_vm_sfmax, 4, N, NUM, 0) \ | ||
154 | _(SOFTFP_FFI, softfp_ui2d, 1, N, NUM, 0) \ | 200 | _(SOFTFP_FFI, softfp_ui2d, 1, N, NUM, 0) \ |
155 | _(SOFTFP_FFI, softfp_f2d, 1, N, NUM, 0) \ | 201 | _(SOFTFP_FFI, softfp_f2d, 1, N, NUM, 0) \ |
156 | _(SOFTFP_FFI, softfp_d2ui, 2, N, INT, 0) \ | 202 | _(SOFTFP_FFI, softfp_d2ui, 2, N, INT, 0) \ |
@@ -159,26 +205,32 @@ typedef struct CCallInfo { | |||
159 | _(SOFTFP_FFI, softfp_ui2f, 1, N, FLOAT, 0) \ | 205 | _(SOFTFP_FFI, softfp_ui2f, 1, N, FLOAT, 0) \ |
160 | _(SOFTFP_FFI, softfp_f2i, 1, N, INT, 0) \ | 206 | _(SOFTFP_FFI, softfp_f2i, 1, N, INT, 0) \ |
161 | _(SOFTFP_FFI, softfp_f2ui, 1, N, INT, 0) \ | 207 | _(SOFTFP_FFI, softfp_f2ui, 1, N, INT, 0) \ |
162 | _(FP64_FFI, fp64_l2d, 2, N, NUM, 0) \ | 208 | _(FP64_FFI, fp64_l2d, 1, N, NUM, XA_64) \ |
163 | _(FP64_FFI, fp64_ul2d, 2, N, NUM, 0) \ | 209 | _(FP64_FFI, fp64_ul2d, 1, N, NUM, XA_64) \ |
164 | _(FP64_FFI, fp64_l2f, 2, N, FLOAT, 0) \ | 210 | _(FP64_FFI, fp64_l2f, 1, N, FLOAT, XA_64) \ |
165 | _(FP64_FFI, fp64_ul2f, 2, N, FLOAT, 0) \ | 211 | _(FP64_FFI, fp64_ul2f, 1, N, FLOAT, XA_64) \ |
166 | _(FP64_FFI, fp64_d2l, ARG1_FP, N, I64, 0) \ | 212 | _(FP64_FFI, fp64_d2l, 1, N, I64, XA_FP) \ |
167 | _(FP64_FFI, fp64_d2ul, ARG1_FP, N, U64, 0) \ | 213 | _(FP64_FFI, fp64_d2ul, 1, N, U64, XA_FP) \ |
168 | _(FP64_FFI, fp64_f2l, 1, N, I64, 0) \ | 214 | _(FP64_FFI, fp64_f2l, 1, N, I64, 0) \ |
169 | _(FP64_FFI, fp64_f2ul, 1, N, U64, 0) \ | 215 | _(FP64_FFI, fp64_f2ul, 1, N, U64, 0) \ |
170 | _(FFI, lj_carith_divi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \ | 216 | _(FFI, lj_carith_divi64, 2, N, I64, XA2_64|CCI_NOFPRCLOBBER) \ |
171 | _(FFI, lj_carith_divu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \ | 217 | _(FFI, lj_carith_divu64, 2, N, U64, XA2_64|CCI_NOFPRCLOBBER) \ |
172 | _(FFI, lj_carith_modi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \ | 218 | _(FFI, lj_carith_modi64, 2, N, I64, XA2_64|CCI_NOFPRCLOBBER) \ |
173 | _(FFI, lj_carith_modu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \ | 219 | _(FFI, lj_carith_modu64, 2, N, U64, XA2_64|CCI_NOFPRCLOBBER) \ |
174 | _(FFI, lj_carith_powi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \ | 220 | _(FFI, lj_carith_powi64, 2, N, I64, XA2_64|CCI_NOFPRCLOBBER) \ |
175 | _(FFI, lj_carith_powu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \ | 221 | _(FFI, lj_carith_powu64, 2, N, U64, XA2_64|CCI_NOFPRCLOBBER) \ |
176 | _(FFI, lj_cdata_setfin, 2, FN, P32, CCI_L) \ | 222 | _(FFI, lj_cdata_newv, 4, S, CDATA, CCI_L) \ |
177 | _(FFI, strlen, 1, L, INTP, 0) \ | 223 | _(FFI, lj_cdata_setfin, 4, S, NIL, CCI_L) \ |
178 | _(FFI, memcpy, 3, S, PTR, 0) \ | 224 | _(FFI, strlen, 1, L, INTP, 0) \ |
179 | _(FFI, memset, 3, S, PTR, 0) \ | 225 | _(FFI, memcpy, 3, S, PTR, 0) \ |
180 | _(FFI, lj_vm_errno, 0, S, INT, CCI_NOFPRCLOBBER) \ | 226 | _(FFI, memset, 3, S, PTR, 0) \ |
181 | _(FFI32, lj_carith_mul64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) | 227 | _(FFI, lj_vm_errno, 0, S, INT, CCI_NOFPRCLOBBER) \ |
228 | _(FFI32, lj_carith_mul64, 2, N, I64, XA2_64|CCI_NOFPRCLOBBER) \ | ||
229 | _(FFI32, lj_carith_shl64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
230 | _(FFI32, lj_carith_shr64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
231 | _(FFI32, lj_carith_sar64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
232 | _(FFI32, lj_carith_rol64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
233 | _(FFI32, lj_carith_ror64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
182 | \ | 234 | \ |
183 | /* End of list. */ | 235 | /* End of list. */ |
184 | 236 | ||
@@ -226,6 +278,22 @@ LJ_DATA const CCallInfo lj_ir_callinfo[IRCALL__MAX+1]; | |||
226 | #define fp64_f2l __aeabi_f2lz | 278 | #define fp64_f2l __aeabi_f2lz |
227 | #define fp64_f2ul __aeabi_f2ulz | 279 | #define fp64_f2ul __aeabi_f2ulz |
228 | #endif | 280 | #endif |
281 | #elif LJ_TARGET_MIPS | ||
282 | #define softfp_add __adddf3 | ||
283 | #define softfp_sub __subdf3 | ||
284 | #define softfp_mul __muldf3 | ||
285 | #define softfp_div __divdf3 | ||
286 | #define softfp_cmp __ledf2 | ||
287 | #define softfp_i2d __floatsidf | ||
288 | #define softfp_d2i __fixdfsi | ||
289 | #define softfp_ui2d __floatunsidf | ||
290 | #define softfp_f2d __extendsfdf2 | ||
291 | #define softfp_d2ui __fixunsdfsi | ||
292 | #define softfp_d2f __truncdfsf2 | ||
293 | #define softfp_i2f __floatsisf | ||
294 | #define softfp_ui2f __floatunsisf | ||
295 | #define softfp_f2i __fixsfsi | ||
296 | #define softfp_f2ui __fixunssfsi | ||
229 | #else | 297 | #else |
230 | #error "Missing soft-float definitions for target architecture" | 298 | #error "Missing soft-float definitions for target architecture" |
231 | #endif | 299 | #endif |
@@ -246,6 +314,10 @@ extern float softfp_ui2f(uint32_t a); | |||
246 | extern int32_t softfp_f2i(float a); | 314 | extern int32_t softfp_f2i(float a); |
247 | extern uint32_t softfp_f2ui(float a); | 315 | extern uint32_t softfp_f2ui(float a); |
248 | #endif | 316 | #endif |
317 | #if LJ_TARGET_MIPS | ||
318 | extern double lj_vm_sfmin(double a, double b); | ||
319 | extern double lj_vm_sfmax(double a, double b); | ||
320 | #endif | ||
249 | #endif | 321 | #endif |
250 | 322 | ||
251 | #if LJ_HASFFI && LJ_NEED_FP64 && !(LJ_TARGET_ARM && LJ_SOFTFP) | 323 | #if LJ_HASFFI && LJ_NEED_FP64 && !(LJ_TARGET_ARM && LJ_SOFTFP) |