aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/dump.lua5
-rw-r--r--src/buildvm.c2
-rw-r--r--src/lj_ir.c4
-rw-r--r--src/lj_ircall.h195
4 files changed, 106 insertions, 100 deletions
diff --git a/lib/dump.lua b/lib/dump.lua
index 7ddc9c07..bb8aa1ce 100644
--- a/lib/dump.lua
+++ b/lib/dump.lua
@@ -84,7 +84,10 @@ local function fillsymtab(nexit)
84 local t = symtab 84 local t = symtab
85 if nexitsym == 0 then 85 if nexitsym == 0 then
86 local ircall = vmdef.ircall 86 local ircall = vmdef.ircall
87 for i=0,#ircall do t[ircalladdr(i)] = ircall[i] end 87 for i=0,#ircall do
88 local addr = ircalladdr(i)
89 if addr ~= 0 then t[addr] = ircall[i] end
90 end
88 end 91 end
89 if nexit > nexitsym then 92 if nexit > nexitsym then
90 for i=nexitsym,nexit-1 do 93 for i=nexitsym,nexit-1 do
diff --git a/src/buildvm.c b/src/buildvm.c
index 122e1262..72c2dd83 100644
--- a/src/buildvm.c
+++ b/src/buildvm.c
@@ -271,7 +271,7 @@ IRFLDEF(FLNAME)
271}; 271};
272 272
273const char *const ircall_names[] = { 273const char *const ircall_names[] = {
274#define IRCALLNAME(name, nargs, kind, type, flags) #name, 274#define IRCALLNAME(cond, name, nargs, kind, type, flags) #name,
275IRCALLDEF(IRCALLNAME) 275IRCALLDEF(IRCALLNAME)
276#undef IRCALLNAME 276#undef IRCALLNAME
277 NULL 277 NULL
diff --git a/src/lj_ir.c b/src/lj_ir.c
index 8f22e085..457d9187 100644
--- a/src/lj_ir.c
+++ b/src/lj_ir.c
@@ -47,8 +47,8 @@ IRDEF(IRMODE)
47 47
48/* C call info for CALL* instructions. */ 48/* C call info for CALL* instructions. */
49LJ_DATADEF const CCallInfo lj_ir_callinfo[] = { 49LJ_DATADEF const CCallInfo lj_ir_callinfo[] = {
50#define IRCALLCI(name, nargs, kind, type, flags) \ 50#define IRCALLCI(cond, name, nargs, kind, type, flags) \
51 { (ASMFunction)name, \ 51 { (ASMFunction)IRCALLCOND_##cond(name), \
52 (nargs)|(CCI_CALL_##kind)|(IRT_##type<<CCI_OTSHIFT)|(flags) }, 52 (nargs)|(CCI_CALL_##kind)|(IRT_##type<<CCI_OTSHIFT)|(flags) },
53IRCALLDEF(IRCALLCI) 53IRCALLDEF(IRCALLCI)
54#undef IRCALLCI 54#undef IRCALLCI
diff --git a/src/lj_ircall.h b/src/lj_ircall.h
index a1f0b052..00209d4c 100644
--- a/src/lj_ircall.h
+++ b/src/lj_ircall.h
@@ -37,127 +37,130 @@ typedef struct CCallInfo {
37#define CCI_NOFPRCLOBBER 0x0400 /* Does not clobber any FPRs. */ 37#define CCI_NOFPRCLOBBER 0x0400 /* Does not clobber any FPRs. */
38#define CCI_FASTCALL 0x0800 /* Fastcall convention. */ 38#define CCI_FASTCALL 0x0800 /* Fastcall convention. */
39 39
40/* Function definitions for CALL* instructions. */ 40/* Helpers for conditional function definitions. */
41#define IRCALLCOND_ANY(x) x
42
43#if LJ_TARGET_X86ORX64
44#define IRCALLCOND_FPMATH(x) NULL
45#else
46#define IRCALLCOND_FPMATH(x) x
47#endif
48
41#if LJ_SOFTFP 49#if LJ_SOFTFP
50#define IRCALLCOND_SOFTFP(x) x
42#if LJ_HASFFI 51#if LJ_HASFFI
43#define IRCALLDEF_SOFTFP_FFI(_) \ 52#define IRCALLCOND_SOFTFP_FFI(x) x
44 _(softfp_ui2d, 1, N, NUM, 0) \
45 _(softfp_l2d, 2, N, NUM, 0) \
46 _(softfp_ul2d, 2, N, NUM, 0) \
47 _(softfp_f2d, 1, N, NUM, 0) \
48 _(softfp_d2ui, 2, N, INT, 0) \
49 _(softfp_d2l, 2, N, I64, 0) \
50 _(softfp_d2ul, 2, N, U64, 0) \
51 _(softfp_d2f, 2, N, FLOAT, 0) \
52 _(softfp_i2f, 1, N, FLOAT, 0) \
53 _(softfp_ui2f, 1, N, FLOAT, 0) \
54 _(softfp_l2f, 2, N, FLOAT, 0) \
55 _(softfp_ul2f, 2, N, FLOAT, 0) \
56 _(softfp_f2i, 1, N, INT, 0) \
57 _(softfp_f2ui, 1, N, INT, 0) \
58 _(softfp_f2l, 1, N, I64, 0) \
59 _(softfp_f2ul, 1, N, U64, 0)
60#else 53#else
61#define IRCALLDEF_SOFTFP_FFI(_) 54#define IRCALLCOND_SOFTFP_FFI(x) NULL
62#endif 55#endif
63#define IRCALLDEF_SOFTFP(_) \
64 _(lj_vm_tobit, 2, N, INT, 0) \
65 _(softfp_add, 4, N, NUM, 0) \
66 _(softfp_sub, 4, N, NUM, 0) \
67 _(softfp_mul, 4, N, NUM, 0) \
68 _(softfp_div, 4, N, NUM, 0) \
69 _(softfp_cmp, 4, N, NIL, 0) \
70 _(softfp_i2d, 1, N, NUM, 0) \
71 _(softfp_d2i, 2, N, INT, 0) \
72 IRCALLDEF_SOFTFP_FFI(_)
73#else 56#else
74#define IRCALLDEF_SOFTFP(_) 57#define IRCALLCOND_SOFTFP(x) NULL
58#define IRCALLCOND_SOFTFP_FFI(x) NULL
75#endif 59#endif
76 60
77#if LJ_TARGET_X86ORX64 61#if LJ_HASFFI
78/* Use lj_vm_* helpers and x87 ops. */ 62#define IRCALLCOND_FFI(x) x
79#define IRCALLDEF_FPMATH(_) 63#if LJ_32
64#define IRCALLCOND_FFI32(x) x
80#else 65#else
81/* Use standard math library calls. */ 66#define IRCALLCOND_FFI32(x) NULL
67#endif
68#else
69#define IRCALLCOND_FFI(x) NULL
70#define IRCALLCOND_FFI32(x) NULL
71#endif
72
82#if LJ_SOFTFP 73#if LJ_SOFTFP
83#define ARG1_FP 2 /* Treat as 2 32 bit arguments. */ 74#define ARG1_FP 2 /* Treat as 2 32 bit arguments. */
84#else 75#else
85#define ARG1_FP 1 76#define ARG1_FP 1
86#endif 77#endif
87/* ORDER FPM */
88#define IRCALLDEF_FPMATH(_) \
89 _(lj_vm_floor, ARG1_FP, N, NUM, 0) \
90 _(lj_vm_ceil, ARG1_FP, N, NUM, 0) \
91 _(lj_vm_trunc, ARG1_FP, N, NUM, 0) \
92 _(sqrt, ARG1_FP, N, NUM, 0) \
93 _(exp, ARG1_FP, N, NUM, 0) \
94 _(lj_vm_exp2, ARG1_FP, N, NUM, 0) \
95 _(log, ARG1_FP, N, NUM, 0) \
96 _(lj_vm_log2, ARG1_FP, N, NUM, 0) \
97 _(log10, ARG1_FP, N, NUM, 0) \
98 _(sin, ARG1_FP, N, NUM, 0) \
99 _(cos, ARG1_FP, N, NUM, 0) \
100 _(tan, ARG1_FP, N, NUM, 0) \
101 _(lj_vm_powi, ARG1_FP+1, N, NUM, 0) \
102 _(pow, ARG1_FP*2, N, NUM, 0) \
103 _(atan2, ARG1_FP*2, N, NUM, 0) \
104 _(ldexp, ARG1_FP+1, N, NUM, 0)
105#endif
106 78
107#if LJ_HASFFI
108#if LJ_32 79#if LJ_32
109#define ARG2_64 4 /* Treat as 4 32 bit arguments. */ 80#define ARG2_64 4 /* Treat as 4 32 bit arguments. */
110#define IRCALLDEF_FFI32(_) \
111 _(lj_carith_mul64, ARG2_64, N, I64, CCI_NOFPRCLOBBER)
112#else 81#else
113#define ARG2_64 2 82#define ARG2_64 2
114#define IRCALLDEF_FFI32(_)
115#endif
116#define IRCALLDEF_FFI(_) \
117 IRCALLDEF_FFI32(_) \
118 _(lj_carith_divi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \
119 _(lj_carith_divu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \
120 _(lj_carith_modi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \
121 _(lj_carith_modu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \
122 _(lj_carith_powi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \
123 _(lj_carith_powu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \
124 _(lj_cdata_setfin, 2, FN, P32, CCI_L) \
125 _(strlen, 1, N, INTP, 0) \
126 _(memcpy, 3, S, PTR, 0) \
127 _(memset, 3, S, PTR, 0)
128#else
129#define IRCALLDEF_FFI(_)
130#endif 83#endif
131 84
85/* Function definitions for CALL* instructions. */
132#define IRCALLDEF(_) \ 86#define IRCALLDEF(_) \
133 _(lj_str_cmp, 2, FN, INT, CCI_NOFPRCLOBBER) \ 87 _(ANY, lj_str_cmp, 2, FN, INT, CCI_NOFPRCLOBBER) \
134 _(lj_str_new, 3, S, STR, CCI_L) \ 88 _(ANY, lj_str_new, 3, S, STR, CCI_L) \
135 _(lj_str_tonum, 2, FN, INT, 0) \ 89 _(ANY, lj_str_tonum, 2, FN, INT, 0) \
136 _(lj_str_fromint, 2, FN, STR, CCI_L) \ 90 _(ANY, lj_str_fromint, 2, FN, STR, CCI_L) \
137 _(lj_str_fromnum, 2, FN, STR, CCI_L) \ 91 _(ANY, lj_str_fromnum, 2, FN, STR, CCI_L) \
138 _(lj_tab_new1, 2, FS, TAB, CCI_L) \ 92 _(ANY, lj_tab_new1, 2, FS, TAB, CCI_L) \
139 _(lj_tab_dup, 2, FS, TAB, CCI_L) \ 93 _(ANY, lj_tab_dup, 2, FS, TAB, CCI_L) \
140 _(lj_tab_newkey, 3, S, P32, CCI_L) \ 94 _(ANY, lj_tab_newkey, 3, S, P32, CCI_L) \
141 _(lj_tab_len, 1, FL, INT, 0) \ 95 _(ANY, lj_tab_len, 1, FL, INT, 0) \
142 _(lj_gc_step_jit, 2, FS, NIL, CCI_L) \ 96 _(ANY, lj_gc_step_jit, 2, FS, NIL, CCI_L) \
143 _(lj_gc_barrieruv, 2, FS, NIL, 0) \ 97 _(ANY, lj_gc_barrieruv, 2, FS, NIL, 0) \
144 _(lj_mem_newgco, 2, FS, P32, CCI_L) \ 98 _(ANY, lj_mem_newgco, 2, FS, P32, CCI_L) \
145 _(lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_NOFPRCLOBBER) \ 99 _(ANY, lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_NOFPRCLOBBER) \
146 _(lj_vm_modi, 2, FN, INT, 0) \ 100 _(ANY, lj_vm_modi, 2, FN, INT, 0) \
147 IRCALLDEF_SOFTFP(_) \ 101 _(ANY, sinh, 1, N, NUM, 0) \
148 IRCALLDEF_FPMATH(_) \ 102 _(ANY, cosh, 1, N, NUM, 0) \
149 IRCALLDEF_FFI(_) \ 103 _(ANY, tanh, 1, N, NUM, 0) \
150 _(sinh, 1, N, NUM, 0) \ 104 _(ANY, fputc, 2, S, INT, 0) \
151 _(cosh, 1, N, NUM, 0) \ 105 _(ANY, fwrite, 4, S, INT, 0) \
152 _(tanh, 1, N, NUM, 0) \ 106 _(ANY, fflush, 1, S, INT, 0) \
153 _(fputc, 2, S, INT, 0) \ 107 /* ORDER FPM */ \
154 _(fwrite, 4, S, INT, 0) \ 108 _(FPMATH, lj_vm_floor, ARG1_FP, N, NUM, 0) \
155 _(fflush, 1, S, INT, 0) \ 109 _(FPMATH, lj_vm_ceil, ARG1_FP, N, NUM, 0) \
110 _(FPMATH, lj_vm_trunc, ARG1_FP, N, NUM, 0) \
111 _(FPMATH, sqrt, ARG1_FP, N, NUM, 0) \
112 _(FPMATH, exp, ARG1_FP, N, NUM, 0) \
113 _(FPMATH, lj_vm_exp2, ARG1_FP, N, NUM, 0) \
114 _(FPMATH, log, ARG1_FP, N, NUM, 0) \
115 _(FPMATH, lj_vm_log2, ARG1_FP, N, NUM, 0) \
116 _(FPMATH, log10, ARG1_FP, N, NUM, 0) \
117 _(FPMATH, sin, ARG1_FP, N, NUM, 0) \
118 _(FPMATH, cos, ARG1_FP, N, NUM, 0) \
119 _(FPMATH, tan, ARG1_FP, N, NUM, 0) \
120 _(FPMATH, lj_vm_powi, ARG1_FP+1, N, NUM, 0) \
121 _(FPMATH, pow, ARG1_FP*2, N, NUM, 0) \
122 _(FPMATH, atan2, ARG1_FP*2, N, NUM, 0) \
123 _(FPMATH, ldexp, ARG1_FP+1, N, NUM, 0) \
124 _(SOFTFP, lj_vm_tobit, 2, N, INT, 0) \
125 _(SOFTFP, softfp_add, 4, N, NUM, 0) \
126 _(SOFTFP, softfp_sub, 4, N, NUM, 0) \
127 _(SOFTFP, softfp_mul, 4, N, NUM, 0) \
128 _(SOFTFP, softfp_div, 4, N, NUM, 0) \
129 _(SOFTFP, softfp_cmp, 4, N, NIL, 0) \
130 _(SOFTFP, softfp_i2d, 1, N, NUM, 0) \
131 _(SOFTFP, softfp_d2i, 2, N, INT, 0) \
132 _(SOFTFP_FFI, softfp_ui2d, 1, N, NUM, 0) \
133 _(SOFTFP_FFI, softfp_l2d, 2, N, NUM, 0) \
134 _(SOFTFP_FFI, softfp_ul2d, 2, N, NUM, 0) \
135 _(SOFTFP_FFI, softfp_f2d, 1, N, NUM, 0) \
136 _(SOFTFP_FFI, softfp_d2ui, 2, N, INT, 0) \
137 _(SOFTFP_FFI, softfp_d2l, 2, N, I64, 0) \
138 _(SOFTFP_FFI, softfp_d2ul, 2, N, U64, 0) \
139 _(SOFTFP_FFI, softfp_d2f, 2, N, FLOAT, 0) \
140 _(SOFTFP_FFI, softfp_i2f, 1, N, FLOAT, 0) \
141 _(SOFTFP_FFI, softfp_ui2f, 1, N, FLOAT, 0) \
142 _(SOFTFP_FFI, softfp_l2f, 2, N, FLOAT, 0) \
143 _(SOFTFP_FFI, softfp_ul2f, 2, N, FLOAT, 0) \
144 _(SOFTFP_FFI, softfp_f2i, 1, N, INT, 0) \
145 _(SOFTFP_FFI, softfp_f2ui, 1, N, INT, 0) \
146 _(SOFTFP_FFI, softfp_f2l, 1, N, I64, 0) \
147 _(SOFTFP_FFI, softfp_f2ul, 1, N, U64, 0) \
148 _(FFI, lj_carith_divi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \
149 _(FFI, lj_carith_divu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \
150 _(FFI, lj_carith_modi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \
151 _(FFI, lj_carith_modu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \
152 _(FFI, lj_carith_powi64, ARG2_64, N, I64, CCI_NOFPRCLOBBER) \
153 _(FFI, lj_carith_powu64, ARG2_64, N, U64, CCI_NOFPRCLOBBER) \
154 _(FFI, lj_cdata_setfin, 2, FN, P32, CCI_L) \
155 _(FFI, strlen, 1, N, INTP, 0) \
156 _(FFI, memcpy, 3, S, PTR, 0) \
157 _(FFI, memset, 3, S, PTR, 0) \
158 _(FFI32, lj_carith_mul64, ARG2_64, N, I64, CCI_NOFPRCLOBBER)
156 \ 159 \
157 /* End of list. */ 160 /* End of list. */
158 161
159typedef enum { 162typedef enum {
160#define IRCALLENUM(name, nargs, kind, type, flags) IRCALL_##name, 163#define IRCALLENUM(cond, name, nargs, kind, type, flags) IRCALL_##name,
161IRCALLDEF(IRCALLENUM) 164IRCALLDEF(IRCALLENUM)
162#undef IRCALLENUM 165#undef IRCALLENUM
163 IRCALL__MAX 166 IRCALL__MAX
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-12 10:20:33 +0000