diff options
Diffstat (limited to 'src/lj_ir.h')
-rw-r--r-- | src/lj_ir.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lj_ir.h b/src/lj_ir.h index 7814df34..6495a780 100644 --- a/src/lj_ir.h +++ b/src/lj_ir.h | |||
@@ -107,9 +107,11 @@ | |||
107 | _(XSTORE, S , ref, ref) \ | 107 | _(XSTORE, S , ref, ref) \ |
108 | \ | 108 | \ |
109 | /* Allocations. */ \ | 109 | /* Allocations. */ \ |
110 | _(SNEW, N , ref, ref) /* CSE is ok, so not marked as A. */ \ | 110 | _(SNEW, N , ref, ref) /* CSE is ok, not marked as A. */ \ |
111 | _(TNEW, AW, lit, lit) \ | 111 | _(TNEW, AW, lit, lit) \ |
112 | _(TDUP, AW, ref, ___) \ | 112 | _(TDUP, AW, ref, ___) \ |
113 | _(CNEW, AW, ref, ref) \ | ||
114 | _(CNEWI, NW, ref, ref) /* CSE is ok, not marked as A. */ \ | ||
113 | \ | 115 | \ |
114 | /* Write barriers. */ \ | 116 | /* Write barriers. */ \ |
115 | _(TBAR, S , ref, ___) \ | 117 | _(TBAR, S , ref, ___) \ |
@@ -186,7 +188,9 @@ IRFPMDEF(FPMENUM) | |||
186 | _(UDATA_UDTYPE, offsetof(GCudata, udtype)) \ | 188 | _(UDATA_UDTYPE, offsetof(GCudata, udtype)) \ |
187 | _(UDATA_FILE, sizeof(GCudata)) \ | 189 | _(UDATA_FILE, sizeof(GCudata)) \ |
188 | _(CDATA_TYPEID, offsetof(GCcdata, typeid)) \ | 190 | _(CDATA_TYPEID, offsetof(GCcdata, typeid)) \ |
189 | _(CDATA_DATA, sizeof(GCcdata)) | 191 | _(CDATA_INIT1, sizeof(GCcdata)) \ |
192 | _(CDATA_INIT2_4, sizeof(GCcdata)+4) \ | ||
193 | _(CDATA_INIT2_8, sizeof(GCcdata)+8) | ||
190 | 194 | ||
191 | typedef enum { | 195 | typedef enum { |
192 | #define FLENUM(name, ofs) IRFL_##name, | 196 | #define FLENUM(name, ofs) IRFL_##name, |
@@ -256,6 +260,7 @@ typedef struct CCallInfo { | |||
256 | _(lj_tab_len, 1, FL, INT, 0) \ | 260 | _(lj_tab_len, 1, FL, INT, 0) \ |
257 | _(lj_gc_step_jit, 2, FS, NIL, CCI_L) \ | 261 | _(lj_gc_step_jit, 2, FS, NIL, CCI_L) \ |
258 | _(lj_gc_barrieruv, 2, FS, NIL, 0) \ | 262 | _(lj_gc_barrieruv, 2, FS, NIL, 0) \ |
263 | _(lj_mem_newgco, 2, FS, P32, CCI_L) \ | ||
259 | _(lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_NOFPRCLOBBER) \ | 264 | _(lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_NOFPRCLOBBER) \ |
260 | _(sinh, 1, N, NUM, 0) \ | 265 | _(sinh, 1, N, NUM, 0) \ |
261 | _(cosh, 1, N, NUM, 0) \ | 266 | _(cosh, 1, N, NUM, 0) \ |
@@ -297,6 +302,7 @@ typedef enum { | |||
297 | 302 | ||
298 | #define IRM_W 0x80 | 303 | #define IRM_W 0x80 |
299 | 304 | ||
305 | #define IRM_NW (IRM_N|IRM_W) | ||
300 | #define IRM_AW (IRM_A|IRM_W) | 306 | #define IRM_AW (IRM_A|IRM_W) |
301 | #define IRM_LW (IRM_L|IRM_W) | 307 | #define IRM_LW (IRM_L|IRM_W) |
302 | 308 | ||