diff options
Diffstat (limited to 'src/lj_ircall.h')
-rw-r--r-- | src/lj_ircall.h | 239 |
1 files changed, 176 insertions, 63 deletions
diff --git a/src/lj_ircall.h b/src/lj_ircall.h index 9ddfb156..7fc3d1fd 100644 --- a/src/lj_ircall.h +++ b/src/lj_ircall.h | |||
@@ -16,22 +16,26 @@ 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 |
23 | #define CCI_OPTYPE(ci) ((ci)->flags >> CCI_OTSHIFT) /* Get op/type. */ | 23 | #define CCI_OPTYPE(ci) ((ci)->flags >> CCI_OTSHIFT) /* Get op/type. */ |
24 | #define CCI_TYPE(ci) (((ci)->flags>>CCI_OTSHIFT) & IRT_TYPE) | ||
24 | #define CCI_OPSHIFT 24 | 25 | #define CCI_OPSHIFT 24 |
25 | #define CCI_OP(ci) ((ci)->flags >> CCI_OPSHIFT) /* Get op. */ | 26 | #define CCI_OP(ci) ((ci)->flags >> CCI_OPSHIFT) /* Get op. */ |
26 | 27 | ||
27 | #define CCI_CALL_N (IR_CALLN << CCI_OPSHIFT) | 28 | #define CCI_CALL_N (IR_CALLN << CCI_OPSHIFT) |
29 | #define CCI_CALL_A (IR_CALLA << CCI_OPSHIFT) | ||
28 | #define CCI_CALL_L (IR_CALLL << CCI_OPSHIFT) | 30 | #define CCI_CALL_L (IR_CALLL << CCI_OPSHIFT) |
29 | #define CCI_CALL_S (IR_CALLS << CCI_OPSHIFT) | 31 | #define CCI_CALL_S (IR_CALLS << CCI_OPSHIFT) |
30 | #define CCI_CALL_FN (CCI_CALL_N|CCI_CC_FASTCALL) | 32 | #define CCI_CALL_FN (CCI_CALL_N|CCI_CC_FASTCALL) |
33 | #define CCI_CALL_FA (CCI_CALL_A|CCI_CC_FASTCALL) | ||
31 | #define CCI_CALL_FL (CCI_CALL_L|CCI_CC_FASTCALL) | 34 | #define CCI_CALL_FL (CCI_CALL_L|CCI_CC_FASTCALL) |
32 | #define CCI_CALL_FS (CCI_CALL_S|CCI_CC_FASTCALL) | 35 | #define CCI_CALL_FS (CCI_CALL_S|CCI_CC_FASTCALL) |
33 | 36 | ||
34 | /* C call info flags. */ | 37 | /* C call info flags. */ |
38 | #define CCI_T (IRT_GUARD << CCI_OTSHIFT) /* May throw. */ | ||
35 | #define CCI_L 0x0100 /* Implicit L arg. */ | 39 | #define CCI_L 0x0100 /* Implicit L arg. */ |
36 | #define CCI_CASTU64 0x0200 /* Cast u64 result to number. */ | 40 | #define CCI_CASTU64 0x0200 /* Cast u64 result to number. */ |
37 | #define CCI_NOFPRCLOBBER 0x0400 /* Does not clobber any FPRs. */ | 41 | #define CCI_NOFPRCLOBBER 0x0400 /* Does not clobber any FPRs. */ |
@@ -45,6 +49,17 @@ typedef struct CCallInfo { | |||
45 | #define CCI_CC_FASTCALL 0x2000 /* Fastcall calling convention. */ | 49 | #define CCI_CC_FASTCALL 0x2000 /* Fastcall calling convention. */ |
46 | #define CCI_CC_STDCALL 0x3000 /* Stdcall calling convention. */ | 50 | #define CCI_CC_STDCALL 0x3000 /* Stdcall calling convention. */ |
47 | 51 | ||
52 | /* Extra args for SOFTFP, SPLIT 64 bit. */ | ||
53 | #define CCI_XARGS_SHIFT 14 | ||
54 | #define CCI_XARGS(ci) (((ci)->flags >> CCI_XARGS_SHIFT) & 3) | ||
55 | #define CCI_XA (1u << CCI_XARGS_SHIFT) | ||
56 | |||
57 | #if LJ_SOFTFP32 || (LJ_32 && LJ_HASFFI) | ||
58 | #define CCI_XNARGS(ci) (CCI_NARGS((ci)) + CCI_XARGS((ci))) | ||
59 | #else | ||
60 | #define CCI_XNARGS(ci) CCI_NARGS((ci)) | ||
61 | #endif | ||
62 | |||
48 | /* Helpers for conditional function definitions. */ | 63 | /* Helpers for conditional function definitions. */ |
49 | #define IRCALLCOND_ANY(x) x | 64 | #define IRCALLCOND_ANY(x) x |
50 | 65 | ||
@@ -66,6 +81,18 @@ typedef struct CCallInfo { | |||
66 | #define IRCALLCOND_SOFTFP_FFI(x) NULL | 81 | #define IRCALLCOND_SOFTFP_FFI(x) NULL |
67 | #endif | 82 | #endif |
68 | 83 | ||
84 | #if LJ_SOFTFP && LJ_TARGET_MIPS | ||
85 | #define IRCALLCOND_SOFTFP_MIPS(x) x | ||
86 | #else | ||
87 | #define IRCALLCOND_SOFTFP_MIPS(x) NULL | ||
88 | #endif | ||
89 | |||
90 | #if LJ_SOFTFP && LJ_TARGET_MIPS64 | ||
91 | #define IRCALLCOND_SOFTFP_MIPS64(x) x | ||
92 | #else | ||
93 | #define IRCALLCOND_SOFTFP_MIPS64(x) NULL | ||
94 | #endif | ||
95 | |||
69 | #define LJ_NEED_FP64 (LJ_TARGET_ARM || LJ_TARGET_PPC || LJ_TARGET_MIPS) | 96 | #define LJ_NEED_FP64 (LJ_TARGET_ARM || LJ_TARGET_PPC || LJ_TARGET_MIPS) |
70 | 97 | ||
71 | #if LJ_HASFFI && (LJ_SOFTFP || LJ_NEED_FP64) | 98 | #if LJ_HASFFI && (LJ_SOFTFP || LJ_NEED_FP64) |
@@ -86,93 +113,159 @@ typedef struct CCallInfo { | |||
86 | #define IRCALLCOND_FFI32(x) NULL | 113 | #define IRCALLCOND_FFI32(x) NULL |
87 | #endif | 114 | #endif |
88 | 115 | ||
116 | #if LJ_HASBUFFER | ||
117 | #define IRCALLCOND_BUFFER(x) x | ||
118 | #else | ||
119 | #define IRCALLCOND_BUFFER(x) NULL | ||
120 | #endif | ||
121 | |||
122 | #if LJ_HASBUFFER && LJ_HASFFI | ||
123 | #define IRCALLCOND_BUFFFI(x) x | ||
124 | #else | ||
125 | #define IRCALLCOND_BUFFFI(x) NULL | ||
126 | #endif | ||
127 | |||
89 | #if LJ_SOFTFP | 128 | #if LJ_SOFTFP |
90 | #define ARG1_FP 2 /* Treat as 2 32 bit arguments. */ | 129 | #define XA_FP CCI_XA |
130 | #define XA2_FP (CCI_XA+CCI_XA) | ||
91 | #else | 131 | #else |
92 | #define ARG1_FP 1 | 132 | #define XA_FP 0 |
133 | #define XA2_FP 0 | ||
134 | #endif | ||
135 | |||
136 | #if LJ_SOFTFP32 | ||
137 | #define XA_FP32 CCI_XA | ||
138 | #define XA2_FP32 (CCI_XA+CCI_XA) | ||
139 | #else | ||
140 | #define XA_FP32 0 | ||
141 | #define XA2_FP32 0 | ||
93 | #endif | 142 | #endif |
94 | 143 | ||
95 | #if LJ_32 | 144 | #if LJ_32 |
96 | #define ARG2_64 4 /* Treat as 4 32 bit arguments. */ | 145 | #define XA_64 CCI_XA |
146 | #define XA2_64 (CCI_XA+CCI_XA) | ||
97 | #else | 147 | #else |
98 | #define ARG2_64 2 | 148 | #define XA_64 0 |
149 | #define XA2_64 0 | ||
99 | #endif | 150 | #endif |
100 | 151 | ||
101 | /* Function definitions for CALL* instructions. */ | 152 | /* Function definitions for CALL* instructions. */ |
102 | #define IRCALLDEF(_) \ | 153 | #define IRCALLDEF(_) \ |
103 | _(ANY, lj_str_cmp, 2, FN, INT, CCI_NOFPRCLOBBER) \ | 154 | _(ANY, lj_str_cmp, 2, FN, INT, CCI_NOFPRCLOBBER) \ |
104 | _(ANY, lj_str_new, 3, S, STR, CCI_L) \ | 155 | _(ANY, lj_str_find, 4, N, PGC, 0) \ |
156 | _(ANY, lj_str_new, 3, S, STR, CCI_L|CCI_T) \ | ||
105 | _(ANY, lj_strscan_num, 2, FN, INT, 0) \ | 157 | _(ANY, lj_strscan_num, 2, FN, INT, 0) \ |
106 | _(ANY, lj_str_fromint, 2, FN, STR, CCI_L) \ | 158 | _(ANY, lj_strfmt_int, 2, FN, STR, CCI_L|CCI_T) \ |
107 | _(ANY, lj_str_fromnum, 2, FN, STR, CCI_L) \ | 159 | _(ANY, lj_strfmt_num, 2, FN, STR, CCI_L|CCI_T) \ |
108 | _(ANY, lj_tab_new1, 2, FS, TAB, CCI_L) \ | 160 | _(ANY, lj_strfmt_char, 2, FN, STR, CCI_L|CCI_T) \ |
109 | _(ANY, lj_tab_dup, 2, FS, TAB, CCI_L) \ | 161 | _(ANY, lj_strfmt_putint, 2, FL, PGC, CCI_T) \ |
110 | _(ANY, lj_tab_newkey, 3, S, P32, CCI_L) \ | 162 | _(ANY, lj_strfmt_putnum, 2, FL, PGC, CCI_T) \ |
163 | _(ANY, lj_strfmt_putquoted, 2, FL, PGC, CCI_T) \ | ||
164 | _(ANY, lj_strfmt_putfxint, 3, L, PGC, XA_64|CCI_T) \ | ||
165 | _(ANY, lj_strfmt_putfnum_int, 3, L, PGC, XA_FP|CCI_T) \ | ||
166 | _(ANY, lj_strfmt_putfnum_uint, 3, L, PGC, XA_FP|CCI_T) \ | ||
167 | _(ANY, lj_strfmt_putfnum, 3, L, PGC, XA_FP|CCI_T) \ | ||
168 | _(ANY, lj_strfmt_putfstr, 3, L, PGC, CCI_T) \ | ||
169 | _(ANY, lj_strfmt_putfchar, 3, L, PGC, CCI_T) \ | ||
170 | _(ANY, lj_buf_putmem, 3, S, PGC, CCI_T) \ | ||
171 | _(ANY, lj_buf_putstr, 2, FL, PGC, CCI_T) \ | ||
172 | _(ANY, lj_buf_putchar, 2, FL, PGC, CCI_T) \ | ||
173 | _(ANY, lj_buf_putstr_reverse, 2, FL, PGC, CCI_T) \ | ||
174 | _(ANY, lj_buf_putstr_lower, 2, FL, PGC, CCI_T) \ | ||
175 | _(ANY, lj_buf_putstr_upper, 2, FL, PGC, CCI_T) \ | ||
176 | _(ANY, lj_buf_putstr_rep, 3, L, PGC, CCI_T) \ | ||
177 | _(ANY, lj_buf_puttab, 5, L, PGC, CCI_T) \ | ||
178 | _(BUFFER, lj_bufx_set, 4, S, NIL, 0) \ | ||
179 | _(BUFFFI, lj_bufx_more, 2, FS, INT, CCI_T) \ | ||
180 | _(BUFFER, lj_serialize_put, 2, FS, PGC, CCI_T) \ | ||
181 | _(BUFFER, lj_serialize_get, 2, FS, PTR, CCI_T) \ | ||
182 | _(BUFFER, lj_serialize_encode, 2, FA, STR, CCI_L|CCI_T) \ | ||
183 | _(BUFFER, lj_serialize_decode, 3, A, INT, CCI_L|CCI_T) \ | ||
184 | _(ANY, lj_buf_tostr, 1, FL, STR, CCI_T) \ | ||
185 | _(ANY, lj_tab_new_ah, 3, A, TAB, CCI_L|CCI_T) \ | ||
186 | _(ANY, lj_tab_new1, 2, FA, TAB, CCI_L|CCI_T) \ | ||
187 | _(ANY, lj_tab_dup, 2, FA, TAB, CCI_L|CCI_T) \ | ||
188 | _(ANY, lj_tab_clear, 1, FS, NIL, 0) \ | ||
189 | _(ANY, lj_tab_newkey, 3, S, PGC, CCI_L|CCI_T) \ | ||
190 | _(ANY, lj_tab_keyindex, 2, FL, INT, 0) \ | ||
191 | _(ANY, lj_vm_next, 2, FL, PTR, 0) \ | ||
111 | _(ANY, lj_tab_len, 1, FL, INT, 0) \ | 192 | _(ANY, lj_tab_len, 1, FL, INT, 0) \ |
193 | _(ANY, lj_tab_len_hint, 2, FL, INT, 0) \ | ||
112 | _(ANY, lj_gc_step_jit, 2, FS, NIL, CCI_L) \ | 194 | _(ANY, lj_gc_step_jit, 2, FS, NIL, CCI_L) \ |
113 | _(ANY, lj_gc_barrieruv, 2, FS, NIL, 0) \ | 195 | _(ANY, lj_gc_barrieruv, 2, FS, NIL, 0) \ |
114 | _(ANY, lj_mem_newgco, 2, FS, P32, CCI_L) \ | 196 | _(ANY, lj_mem_newgco, 2, FA, PGC, CCI_L|CCI_T) \ |
115 | _(ANY, lj_math_random_step, 1, FS, NUM, CCI_CASTU64) \ | 197 | _(ANY, lj_prng_u64d, 1, FS, NUM, CCI_CASTU64) \ |
116 | _(ANY, lj_vm_modi, 2, FN, INT, 0) \ | 198 | _(ANY, lj_vm_modi, 2, FN, INT, 0) \ |
117 | _(ANY, sinh, ARG1_FP, N, NUM, 0) \ | 199 | _(ANY, log10, 1, N, NUM, XA_FP) \ |
118 | _(ANY, cosh, ARG1_FP, N, NUM, 0) \ | 200 | _(ANY, exp, 1, N, NUM, XA_FP) \ |
119 | _(ANY, tanh, ARG1_FP, N, NUM, 0) \ | 201 | _(ANY, sin, 1, N, NUM, XA_FP) \ |
120 | _(ANY, fputc, 2, S, INT, 0) \ | 202 | _(ANY, cos, 1, N, NUM, XA_FP) \ |
121 | _(ANY, fwrite, 4, S, INT, 0) \ | 203 | _(ANY, tan, 1, N, NUM, XA_FP) \ |
122 | _(ANY, fflush, 1, S, INT, 0) \ | 204 | _(ANY, asin, 1, N, NUM, XA_FP) \ |
205 | _(ANY, acos, 1, N, NUM, XA_FP) \ | ||
206 | _(ANY, atan, 1, N, NUM, XA_FP) \ | ||
207 | _(ANY, sinh, 1, N, NUM, XA_FP) \ | ||
208 | _(ANY, cosh, 1, N, NUM, XA_FP) \ | ||
209 | _(ANY, tanh, 1, N, NUM, XA_FP) \ | ||
210 | _(ANY, fputc, 2, S, INT, 0) \ | ||
211 | _(ANY, fwrite, 4, S, INT, 0) \ | ||
212 | _(ANY, fflush, 1, S, INT, 0) \ | ||
123 | /* ORDER FPM */ \ | 213 | /* ORDER FPM */ \ |
124 | _(FPMATH, lj_vm_floor, ARG1_FP, N, NUM, 0) \ | 214 | _(FPMATH, lj_vm_floor, 1, N, NUM, XA_FP) \ |
125 | _(FPMATH, lj_vm_ceil, ARG1_FP, N, NUM, 0) \ | 215 | _(FPMATH, lj_vm_ceil, 1, N, NUM, XA_FP) \ |
126 | _(FPMATH, lj_vm_trunc, ARG1_FP, N, NUM, 0) \ | 216 | _(FPMATH, lj_vm_trunc, 1, N, NUM, XA_FP) \ |
127 | _(FPMATH, sqrt, ARG1_FP, N, NUM, 0) \ | 217 | _(FPMATH, sqrt, 1, N, NUM, XA_FP) \ |
128 | _(FPMATH, exp, ARG1_FP, N, NUM, 0) \ | 218 | _(ANY, log, 1, N, NUM, XA_FP) \ |
129 | _(FPMATH, lj_vm_exp2, ARG1_FP, N, NUM, 0) \ | 219 | _(ANY, lj_vm_log2, 1, N, NUM, XA_FP) \ |
130 | _(FPMATH, log, ARG1_FP, N, NUM, 0) \ | 220 | _(ANY, lj_vm_powi, 2, N, NUM, XA_FP) \ |
131 | _(FPMATH, lj_vm_log2, ARG1_FP, N, NUM, 0) \ | 221 | _(ANY, pow, 2, N, NUM, XA2_FP) \ |
132 | _(FPMATH, log10, ARG1_FP, N, NUM, 0) \ | 222 | _(ANY, atan2, 2, N, NUM, XA2_FP) \ |
133 | _(FPMATH, sin, ARG1_FP, N, NUM, 0) \ | 223 | _(ANY, ldexp, 2, N, NUM, XA_FP) \ |
134 | _(FPMATH, cos, ARG1_FP, N, NUM, 0) \ | 224 | _(SOFTFP, lj_vm_tobit, 1, N, INT, XA_FP32) \ |
135 | _(FPMATH, tan, ARG1_FP, N, NUM, 0) \ | 225 | _(SOFTFP, softfp_add, 2, N, NUM, XA2_FP32) \ |
136 | _(FPMATH, lj_vm_powi, ARG1_FP+1, N, NUM, 0) \ | 226 | _(SOFTFP, softfp_sub, 2, N, NUM, XA2_FP32) \ |
137 | _(FPMATH, pow, ARG1_FP*2, N, NUM, 0) \ | 227 | _(SOFTFP, softfp_mul, 2, N, NUM, XA2_FP32) \ |
138 | _(FPMATH, atan2, ARG1_FP*2, N, NUM, 0) \ | 228 | _(SOFTFP, softfp_div, 2, N, NUM, XA2_FP32) \ |
139 | _(FPMATH, ldexp, ARG1_FP+1, N, NUM, 0) \ | 229 | _(SOFTFP, softfp_cmp, 2, N, NIL, XA2_FP32) \ |
140 | _(SOFTFP, lj_vm_tobit, 2, N, INT, 0) \ | ||
141 | _(SOFTFP, softfp_add, 4, N, NUM, 0) \ | ||
142 | _(SOFTFP, softfp_sub, 4, N, NUM, 0) \ | ||
143 | _(SOFTFP, softfp_mul, 4, N, NUM, 0) \ | ||
144 | _(SOFTFP, softfp_div, 4, N, NUM, 0) \ | ||
145 | _(SOFTFP, softfp_cmp, 4, N, NIL, 0) \ | ||
146 | _(SOFTFP, softfp_i2d, 1, N, NUM, 0) \ | 230 | _(SOFTFP, softfp_i2d, 1, N, NUM, 0) \ |
147 | _(SOFTFP, softfp_d2i, 2, N, INT, 0) \ | 231 | _(SOFTFP, softfp_d2i, 1, N, INT, XA_FP32) \ |
232 | _(SOFTFP_MIPS, lj_vm_sfmin, 2, N, NUM, XA2_FP32) \ | ||
233 | _(SOFTFP_MIPS, lj_vm_sfmax, 2, N, NUM, XA2_FP32) \ | ||
234 | _(SOFTFP_MIPS64, lj_vm_tointg, 1, N, INT, 0) \ | ||
148 | _(SOFTFP_FFI, softfp_ui2d, 1, N, NUM, 0) \ | 235 | _(SOFTFP_FFI, softfp_ui2d, 1, N, NUM, 0) \ |
149 | _(SOFTFP_FFI, softfp_f2d, 1, N, NUM, 0) \ | 236 | _(SOFTFP_FFI, softfp_f2d, 1, N, NUM, 0) \ |
150 | _(SOFTFP_FFI, softfp_d2ui, 2, N, INT, 0) \ | 237 | _(SOFTFP_FFI, softfp_d2ui, 1, N, INT, XA_FP32) \ |
151 | _(SOFTFP_FFI, softfp_d2f, 2, N, FLOAT, 0) \ | 238 | _(SOFTFP_FFI, softfp_d2f, 1, N, FLOAT, XA_FP32) \ |
152 | _(SOFTFP_FFI, softfp_i2f, 1, N, FLOAT, 0) \ | 239 | _(SOFTFP_FFI, softfp_i2f, 1, N, FLOAT, 0) \ |
153 | _(SOFTFP_FFI, softfp_ui2f, 1, N, FLOAT, 0) \ | 240 | _(SOFTFP_FFI, softfp_ui2f, 1, N, FLOAT, 0) \ |
154 | _(SOFTFP_FFI, softfp_f2i, 1, N, INT, 0) \ | 241 | _(SOFTFP_FFI, softfp_f2i, 1, N, INT, 0) \ |
155 | _(SOFTFP_FFI, softfp_f2ui, 1, N, INT, 0) \ | 242 | _(SOFTFP_FFI, softfp_f2ui, 1, N, INT, 0) \ |
156 | _(FP64_FFI, fp64_l2d, 2, N, NUM, 0) \ | 243 | _(FP64_FFI, fp64_l2d, 1, N, NUM, XA_64) \ |
157 | _(FP64_FFI, fp64_ul2d, 2, N, NUM, 0) \ | 244 | _(FP64_FFI, fp64_ul2d, 1, N, NUM, XA_64) \ |
158 | _(FP64_FFI, fp64_l2f, 2, N, FLOAT, 0) \ | 245 | _(FP64_FFI, fp64_l2f, 1, N, FLOAT, XA_64) \ |
159 | _(FP64_FFI, fp64_ul2f, 2, N, FLOAT, 0) \ | 246 | _(FP64_FFI, fp64_ul2f, 1, N, FLOAT, XA_64) \ |
160 | _(FP64_FFI, fp64_d2l, ARG1_FP, N, I64, 0) \ | 247 | _(FP64_FFI, fp64_d2l, 1, N, I64, XA_FP) \ |
161 | _(FP64_FFI, fp64_d2ul, ARG1_FP, N, U64, 0) \ | 248 | _(FP64_FFI, fp64_d2ul, 1, N, U64, XA_FP) \ |
162 | _(FP64_FFI, fp64_f2l, 1, N, I64, 0) \ | 249 | _(FP64_FFI, fp64_f2l, 1, N, I64, 0) \ |
163 | _(FP64_FFI, fp64_f2ul, 1, N, U64, 0) \ | 250 | _(FP64_FFI, fp64_f2ul, 1, N, U64, 0) \ |
164 | _(FFI, lj_carith_divi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \ | 251 | _(FFI, lj_carith_divi64, 2, N, I64, XA2_64|CCI_NOFPRCLOBBER) \ |
165 | _(FFI, lj_carith_divu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \ | 252 | _(FFI, lj_carith_divu64, 2, N, U64, XA2_64|CCI_NOFPRCLOBBER) \ |
166 | _(FFI, lj_carith_modi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \ | 253 | _(FFI, lj_carith_modi64, 2, N, I64, XA2_64|CCI_NOFPRCLOBBER) \ |
167 | _(FFI, lj_carith_modu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \ | 254 | _(FFI, lj_carith_modu64, 2, N, U64, XA2_64|CCI_NOFPRCLOBBER) \ |
168 | _(FFI, lj_carith_powi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \ | 255 | _(FFI, lj_carith_powi64, 2, N, I64, XA2_64|CCI_NOFPRCLOBBER) \ |
169 | _(FFI, lj_carith_powu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \ | 256 | _(FFI, lj_carith_powu64, 2, N, U64, XA2_64|CCI_NOFPRCLOBBER) \ |
170 | _(FFI, lj_cdata_setfin, 2, FN, P32, CCI_L) \ | 257 | _(FFI, lj_cdata_newv, 4, S, CDATA, CCI_L) \ |
171 | _(FFI, strlen, 1, L, INTP, 0) \ | 258 | _(FFI, lj_cdata_setfin, 4, S, NIL, CCI_L) \ |
172 | _(FFI, memcpy, 3, S, PTR, 0) \ | 259 | _(FFI, strlen, 1, L, INTP, 0) \ |
173 | _(FFI, memset, 3, S, PTR, 0) \ | 260 | _(FFI, memcpy, 3, S, PTR, 0) \ |
174 | _(FFI, lj_vm_errno, 0, S, INT, CCI_NOFPRCLOBBER) \ | 261 | _(FFI, memset, 3, S, PTR, 0) \ |
175 | _(FFI32, lj_carith_mul64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) | 262 | _(FFI, lj_vm_errno, 0, S, INT, CCI_NOFPRCLOBBER) \ |
263 | _(FFI32, lj_carith_mul64, 2, N, I64, XA2_64|CCI_NOFPRCLOBBER) \ | ||
264 | _(FFI32, lj_carith_shl64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
265 | _(FFI32, lj_carith_shr64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
266 | _(FFI32, lj_carith_sar64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
267 | _(FFI32, lj_carith_rol64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
268 | _(FFI32, lj_carith_ror64, 2, N, U64, XA_64|CCI_NOFPRCLOBBER) \ | ||
176 | \ | 269 | \ |
177 | /* End of list. */ | 270 | /* End of list. */ |
178 | 271 | ||
@@ -220,6 +313,22 @@ LJ_DATA const CCallInfo lj_ir_callinfo[IRCALL__MAX+1]; | |||
220 | #define fp64_f2l __aeabi_f2lz | 313 | #define fp64_f2l __aeabi_f2lz |
221 | #define fp64_f2ul __aeabi_f2ulz | 314 | #define fp64_f2ul __aeabi_f2ulz |
222 | #endif | 315 | #endif |
316 | #elif LJ_TARGET_MIPS || LJ_TARGET_PPC | ||
317 | #define softfp_add __adddf3 | ||
318 | #define softfp_sub __subdf3 | ||
319 | #define softfp_mul __muldf3 | ||
320 | #define softfp_div __divdf3 | ||
321 | #define softfp_cmp __ledf2 | ||
322 | #define softfp_i2d __floatsidf | ||
323 | #define softfp_d2i __fixdfsi | ||
324 | #define softfp_ui2d __floatunsidf | ||
325 | #define softfp_f2d __extendsfdf2 | ||
326 | #define softfp_d2ui __fixunsdfsi | ||
327 | #define softfp_d2f __truncdfsf2 | ||
328 | #define softfp_i2f __floatsisf | ||
329 | #define softfp_ui2f __floatunsisf | ||
330 | #define softfp_f2i __fixsfsi | ||
331 | #define softfp_f2ui __fixunssfsi | ||
223 | #else | 332 | #else |
224 | #error "Missing soft-float definitions for target architecture" | 333 | #error "Missing soft-float definitions for target architecture" |
225 | #endif | 334 | #endif |
@@ -240,10 +349,14 @@ extern float softfp_ui2f(uint32_t a); | |||
240 | extern int32_t softfp_f2i(float a); | 349 | extern int32_t softfp_f2i(float a); |
241 | extern uint32_t softfp_f2ui(float a); | 350 | extern uint32_t softfp_f2ui(float a); |
242 | #endif | 351 | #endif |
352 | #if LJ_TARGET_MIPS | ||
353 | extern double lj_vm_sfmin(double a, double b); | ||
354 | extern double lj_vm_sfmax(double a, double b); | ||
355 | #endif | ||
243 | #endif | 356 | #endif |
244 | 357 | ||
245 | #if LJ_HASFFI && LJ_NEED_FP64 && !(LJ_TARGET_ARM && LJ_SOFTFP) | 358 | #if LJ_HASFFI && LJ_NEED_FP64 && !(LJ_TARGET_ARM && LJ_SOFTFP) |
246 | #ifdef __GNUC__ | 359 | #if defined(__GNUC__) || defined(__clang__) |
247 | #define fp64_l2d __floatdidf | 360 | #define fp64_l2d __floatdidf |
248 | #define fp64_ul2d __floatundidf | 361 | #define fp64_ul2d __floatundidf |
249 | #define fp64_l2f __floatdisf | 362 | #define fp64_l2f __floatdisf |