ARM: Rearrange global_State to satisfy imm12 encoding constraints.

This commit is contained in:
Mike Pall 2013-03-13 17:12:23 +01:00
parent b2edd5cf28
commit 7950894d70

View File

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