ARM: Rearrange global_State to satisfy imm12 encoding constraints.

diff --git a/src/lj_obj.h b/src/lj_obj.h
index 33237119c2a46d19bd83de8971679123eeca52da..3110442951d53f7824de437dea21db749c32a18f 100644 (file)
--- a/src/lj_obj.h
+++ b/src/lj_obj.h
@@ -517,8 +517,8 @@ typedef struct global_State {
   lua_Alloc allocf;    /* Memory allocator. */
   void *allocd;                /* Memory allocator data. */
   GCState gc;          /* Garbage collector. */
+  volatile int32_t vmstate;  /* VM state or current JIT code trace number. */
   SBuf tmpbuf;         /* Temporary string buffer. */
-  Node nilnode;                /* Fallback 1-element hash part (nil key and value). */
   GCstr strempty;      /* Empty string. */
   uint8_t stremptyz;   /* Zero terminator of empty string. */
   uint8_t hookmask;    /* Hook mask. */
@@ -527,13 +527,13 @@ typedef struct global_State {
   GCRef mainthref;     /* Link to main thread. */
   TValue registrytv;   /* Anchor for registry. */
   TValue tmptv, tmptv2;        /* Temporary TValues. */
+  Node nilnode;                /* Fallback 1-element hash part (nil key and value). */
   GCupval uvhead;      /* Head of double-linked list of all open upvalues. */
   int32_t hookcount;   /* Instruction hook countdown. */
   int32_t hookcstart;  /* Start count for instruction hook counter. */
   lua_Hook hookf;      /* Hook function. */
   lua_CFunction wrapf; /* Wrapper for C function calls. */
   lua_CFunction panic; /* Called as a last resort for errors. */
-  volatile int32_t vmstate;  /* VM state or current JIT code trace number. */
   BCIns bc_cfunc_int;  /* Bytecode for internal C function calls. */
   BCIns bc_cfunc_ext;  /* Bytecode for external C function calls. */
   GCRef jit_L;         /* Current JIT code lua_State or NULL. */