@@ -206,14 +206,9 @@ typedef void(*func)(VM*, VAL*);
206#define CTAG(x) (((x)->info.c.tag_arity) >> 8)
206#define CTAG(x) (((x)->info.c.tag_arity) >> 8)
207#define CARITY(x) ((x)->info.c.tag_arity & 0x000000ff)
207#define CARITY(x) ((x)->info.c.tag_arity & 0x000000ff)
209−// Use top 16 bits for saying which heap value is in
210−// Bottom 16 bits for closure type
212−#define GETTY(x) ((x)->ty & 0x0000ffff)
213−#define SETTY(x,t) (x)->ty = (((x)->ty & 0xffff0000) | (t))
215−#define GETHEAP(x) ((x)->ty >> 16)
210+#define GETTY(x) ((x)->ty)
216−#define SETHEAP(x,y) (x)->ty = (((x)->ty & 0x0000ffff) | ((y) << 16))
211+#define SETTY(x,t) ((x)->ty = t)
218// Integers, floats and operators
213// Integers, floats and operators