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

ARM64: Fix pc-relative loads of consts. Cleanup branch codegen.

Browse Source 
Thanks to Zhongwei Yao.
This commit is contained in:
Mike Pall 2016-12-07 09:42:43 +01:00
parent 3ad2bbf586
commit 22511fbe2b
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lj_emit_arm64.h
View File

@ -234,7 +234,7 @@ static void emit_loadk(ASMState *as, Reg rd, uint64_t u64, int is64)
#define glofs(as, k) \ #define glofs(as, k) \
((intptr_t)((uintptr_t)(k) - (uintptr_t)&J2GG(as->J)->g)) ((intptr_t)((uintptr_t)(k) - (uintptr_t)&J2GG(as->J)->g))
#define mcpofs(as, k) \ #define mcpofs(as, k) \
((intptr_t)((uintptr_t)(k) - (uintptr_t)as->mcp)) ((intptr_t)((uintptr_t)(k) - (uintptr_t)(as->mcp - 1)))
#define checkmcpofs(as, k) \ #define checkmcpofs(as, k) \
((((mcpofs(as, k)>>2) + 0x00040000) >> 19) == 0) ((((mcpofs(as, k)>>2) + 0x00040000) >> 19) == 0)
@ -305,39 +305,35 @@ typedef MCode *MCLabel;
static void emit_cond_branch(ASMState *as, A64CC cond, MCode *target) static void emit_cond_branch(ASMState *as, A64CC cond, MCode *target)
{ {
MCode *p = as->mcp; MCode *p = --as->mcp;
ptrdiff_t delta = target - (p - 1); ptrdiff_t delta = target - p;
lua_assert(((delta + 0x40000) >> 19) == 0); lua_assert(((delta + 0x40000) >> 19) == 0);
*--p = A64I_BCC | A64F_S19((uint32_t)delta & 0x7ffff) | cond; *p = A64I_BCC | A64F_S19((uint32_t)delta & 0x7ffff) | cond;
as->mcp = p;
} }
static void emit_branch(ASMState *as, A64Ins ai, MCode *target) static void emit_branch(ASMState *as, A64Ins ai, MCode *target)
{ {
MCode *p = as->mcp; MCode *p = --as->mcp;
ptrdiff_t delta = target - (p - 1); ptrdiff_t delta = target - p;
lua_assert(((delta + 0x02000000) >> 26) == 0); lua_assert(((delta + 0x02000000) >> 26) == 0);
*--p = ai | ((uint32_t)delta & 0x03ffffffu); *p = ai | ((uint32_t)delta & 0x03ffffffu);
as->mcp = p;
} }
static void emit_tnb(ASMState *as, A64Ins ai, Reg r, uint32_t bit, MCode *target) static void emit_tnb(ASMState *as, A64Ins ai, Reg r, uint32_t bit, MCode *target)
{ {
MCode *p = as->mcp; MCode *p = --as->mcp;
ptrdiff_t delta = target - (p - 1); ptrdiff_t delta = target - p;
lua_assert(bit < 63 && ((delta + 0x2000) >> 14) == 0); lua_assert(bit < 63 && ((delta + 0x2000) >> 14) == 0);
if (bit > 31) ai |= A64I_X; if (bit > 31) ai |= A64I_X;
*--p = ai | A64F_BIT(bit & 31) | A64F_S14((uint32_t)delta & 0x3fffu) | r; *p = ai | A64F_BIT(bit & 31) | A64F_S14((uint32_t)delta & 0x3fffu) | r;
as->mcp = p;
} }
static void emit_cnb(ASMState *as, A64Ins ai, Reg r, MCode *target) static void emit_cnb(ASMState *as, A64Ins ai, Reg r, MCode *target)
{ {
MCode *p = as->mcp; MCode *p = --as->mcp;
ptrdiff_t delta = target - (p - 1); ptrdiff_t delta = target - p;
lua_assert(((delta + 0x40000) >> 19) == 0); lua_assert(((delta + 0x40000) >> 19) == 0);
*--p = ai | A64F_S19((uint32_t)delta & 0x7ffff) | r; *p = ai | A64F_S19((uint32_t)delta & 0x7ffff) | r;
as->mcp = p;
} }
#define emit_jmp(as, target) emit_branch(as, A64I_B, (target)) #define emit_jmp(as, target) emit_branch(as, A64I_B, (target))