Merge branch 'master' into v2.1

2 files changed, 9 insertions, 5 deletions

diff --git a/src/lj_dispatch.h b/src/lj_dispatch.h
index 4ea6e85d..58ddff51 100644
--- a/src/lj_dispatch.h
+++ b/src/lj_dispatch.h
@@ -89,12 +89,20 @@ typedef uint16_t HotCount;
 typedef struct GG_State {
   lua_State L;                          /* Main thread. */
   global_State g;                       /* Global state. */
+#if LJ_TARGET_ARM
+  /* Make g reachable via K12 encoded DISPATCH-relative addressing. */
+  uint8_t align1[(16-sizeof(global_State))&15];
+#endif
 #if LJ_TARGET_MIPS
   ASMFunction got[LJ_GOT__MAX];         /* Global offset table. */
 #endif
 #if LJ_HASJIT
   jit_State J;                          /* JIT state. */
   HotCount hotcount[HOTCOUNT_SIZE];     /* Hot counters. */
+#if LJ_TARGET_ARM
+  /* Ditto for J. */
+  uint8_t align2[(16-sizeof(jit_State)-sizeof(HotCount)*HOTCOUNT_SIZE)&15];
+#endif
 #endif
   ASMFunction dispatch[GG_LEN_DISP];    /* Instruction dispatch tables. */
   BCIns bcff[GG_NUM_ASMFF];             /* Bytecode for ASM fast functions. */
diff --git a/src/lj_jit.h b/src/lj_jit.h
index b0d90fcd..655b84c3 100644
--- a/src/lj_jit.h
+++ b/src/lj_jit.h
@@ -503,11 +503,7 @@ typedef struct jit_State {
   BCLine prev_line;     /* Previous line. */
   int prof_mode;        /* Profiling mode: 0, 'f', 'l'. */
 #endif
-}
-#if LJ_TARGET_ARM
-LJ_ALIGN(16)            /* For DISPATCH-relative addresses in assembler part. */
-#endif
-jit_State;
+} jit_State;
 
 #ifdef LUA_USE_ASSERT
 #define lj_assertJ(c, ...)      lj_assertG_(J2G(J), (c), __VA_ARGS__)