Add table of IR type sizes.

diff --git a/src/host/buildvm.c b/src/host/buildvm.c
index 462fd8f7d9cbd838da3abfafcea80d48d497bdc2..72b74f1f3aced50598d91dc755846c6b1bcd7a78 100644 (file)
--- a/src/host/buildvm.c
+++ b/src/host/buildvm.c
@@ -245,7 +245,7 @@ IRDEF(IRNAME)
 };
 
 const char *const irt_names[] = {
-#define IRTNAME(name)  #name,
+#define IRTNAME(name, size)    #name,
 IRTDEF(IRTNAME)
 #undef IRTNAME
   NULL

diff --git a/src/lj_ir.c b/src/lj_ir.c
index 92be414939f35fbfacc0322918d2b392feb1fa77..abc275d1a1eeb0348e77a15f8f0536f5b51a7567 100644 (file)
--- a/src/lj_ir.c
+++ b/src/lj_ir.c
@@ -46,6 +46,14 @@ IRDEF(IRMODE)
   0
 };
 
+/* IR type sizes. */
+LJ_DATADEF const uint8_t lj_ir_type_size[IRT__MAX+1] = {
+#define IRTSIZE(name, size)    size,
+IRTDEF(IRTSIZE)
+#undef IRTSIZE
+  0
+};
+
 /* C call info for CALL* instructions. */
 LJ_DATADEF const CCallInfo lj_ir_callinfo[] = {
 #define IRCALLCI(cond, name, nargs, kind, type, flags) \

diff --git a/src/lj_ir.h b/src/lj_ir.h
index 6d016b9394c8c0cc786863f5f3a7bf59684e1944..4953425a74b0bb9338c26f313b8799cbc5413237 100644 (file)
--- a/src/lj_ir.h
+++ b/src/lj_ir.h
@@ -284,16 +284,19 @@ LJ_DATA const uint8_t lj_ir_mode[IR__MAX+1];
 ** contiguous and next to IRT_NUM (see the typerange macros below).
 */
 #define IRTDEF(_) \
-  _(NIL) _(FALSE) _(TRUE) _(LIGHTUD) _(STR) _(P32) _(THREAD) \
-  _(PROTO) _(FUNC) _(P64) _(CDATA) _(TAB) _(UDATA) \
-  _(FLOAT) _(NUM) _(I8) _(U8) _(I16) _(U16) _(INT) _(U32) _(I64) _(U64) \
-  _(SOFTFP)  /* There is room for 9 more types. */
+  _(NIL, 4) _(FALSE, 4) _(TRUE, 4) _(LIGHTUD, LJ_64 ? 8 : 4) _(STR, 4) \
+  _(P32, 4) _(THREAD, 4) _(PROTO, 4) _(FUNC, 4) _(P64, 8) _(CDATA, 4) \
+  _(TAB, 4) _(UDATA, 4) \
+  _(FLOAT, 4) _(NUM, 8) _(I8, 1) _(U8, 1) _(I16, 2) _(U16, 2) \
+  _(INT, 4) _(U32, 4) _(I64, 8) _(U64, 8) \
+  _(SOFTFP, 4)  /* There is room for 9 more types. */
 
 /* IR result type and flags (8 bit). */
 typedef enum {
-#define IRTENUM(name)  IRT_##name,
+#define IRTENUM(name, size)    IRT_##name,
 IRTDEF(IRTENUM)
 #undef IRTENUM
+  IRT__MAX,
 
   /* Native pointer type and the corresponding integer type. */
   IRT_PTR = LJ_64 ? IRT_P64 : IRT_P32,
@@ -361,6 +364,10 @@ typedef struct IRType1 { uint8_t irt; } IRType1;
 #define irt_is64(t)            ((IRT_IS64 >> irt_type(t)) & 1)
 #define irt_is64orfp(t)                (((IRT_IS64|(1u<<IRT_FLOAT))>>irt_type(t)) & 1)
 
+#define irt_size(t)            (lj_ir_type_size[irt_t((t))])
+
+LJ_DATA const uint8_t lj_ir_type_size[];
+
 static LJ_AINLINE IRType itype2irt(const TValue *tv)
 {
   if (tvisint(tv))