gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: Ensure relative GG_State element alignment differently.

Browse Source 
Thanks to jojo59516 and dwing4g.
This commit is contained in:
Mike Pall 2020-08-05 15:21:00 +02:00
parent c4b1e0feae
commit 2211f6f960
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lj_dispatch.h
View File

@ -70,12 +70,20 @@ typedef uint16_t HotCount;
typedef struct GG_State { typedef struct GG_State {
lua_State L; /* Main thread. */ lua_State L; /* Main thread. */
global_State g; /* Global state. */ 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 #if LJ_TARGET_MIPS
ASMFunction got[LJ_GOT__MAX]; /* Global offset table. */ ASMFunction got[LJ_GOT__MAX]; /* Global offset table. */
#endif #endif
#if LJ_HASJIT #if LJ_HASJIT
jit_State J; /* JIT state. */ jit_State J; /* JIT state. */
HotCount hotcount[HOTCOUNT_SIZE]; /* Hot counters. */ 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 #endif
ASMFunction dispatch[GG_LEN_DISP]; /* Instruction dispatch tables. */ ASMFunction dispatch[GG_LEN_DISP]; /* Instruction dispatch tables. */
BCIns bcff[GG_NUM_ASMFF]; /* Bytecode for ASM fast functions. */ BCIns bcff[GG_NUM_ASMFF]; /* Bytecode for ASM fast functions. */

6
src/lj_jit.h
View File

@ -406,11 +406,7 @@ typedef struct jit_State {
size_t szallmcarea; /* Total size of all allocated mcode areas. */ size_t szallmcarea; /* Total size of all allocated mcode areas. */
TValue errinfo; /* Additional info element for trace errors. */ TValue errinfo; /* Additional info element for trace errors. */
} } jit_State;
#if LJ_TARGET_ARM
LJ_ALIGN(16) /* For DISPATCH-relative addresses in assembler part. */
#endif
jit_State;
/* Trivial PRNG e.g. used for penalty randomization. */ /* Trivial PRNG e.g. used for penalty randomization. */
static LJ_AINLINE uint32_t LJ_PRNG_BITS(jit_State *J, int bits) static LJ_AINLINE uint32_t LJ_PRNG_BITS(jit_State *J, int bits)