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

ARM: Add support for ARM relocations to buildvm.

Browse Source
This commit is contained in:
Mike Pall 2011-03-26 18:40:11 +01:00
parent 156bf15783
commit b6ed984843
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dynasm/dasm_arm.lua
View File

@ -723,7 +723,7 @@ map_op[".template__"] = function(params, template, nparams)
op = op + parse_gpr(p) op = op + parse_gpr(p)
else else
if op < 0xe0000000 then werror("unconditional instruction") end if op < 0xe0000000 then werror("unconditional instruction") end
local mode, n, s = parse_label(params[n], false) local mode, n, s = parse_label(p, false)
waction("REL_"..mode, n, s, 1) waction("REL_"..mode, n, s, 1)
op = 0xfa000000 op = 0xfa000000
end end

14
src/buildvm_asm.c
View File

@ -96,7 +96,17 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
emit_asm_words(ctx, p, n-4); emit_asm_words(ctx, p, n-4);
ins = *(uint32_t *)(p+n-4); ins = *(uint32_t *)(p+n-4);
#if LJ_TARGET_ARM #if LJ_TARGET_ARM
UNUSED(sym); /* NYI */ if ((ins & 0xff000000u) == 0xfa000000u) {
fprintf(ctx->fp, "\tblx %s\n", sym);
} else if ((ins & 0x0e000000u) == 0x0a000000u) {
fprintf(ctx->fp, "\t%s%.2s %s\n", (ins & 0x01000000u) ? "bl" : "b",
"eqnecsccmiplvsvchilsgeltgtle" + 2*(ins >> 28), sym);
} else {
fprintf(stderr,
"Error: unsupported opcode %08x for %s symbol relocation.\n",
ins, sym);
exit(1);
}
#elif LJ_TARGET_PPC #elif LJ_TARGET_PPC
if ((ins >> 26) == 16) { if ((ins >> 26) == 16) {
fprintf(ctx->fp, "\t%s %d, %d, %s\n", fprintf(ctx->fp, "\t%s %d, %d, %s\n",
@ -185,7 +195,7 @@ void emit_asm(BuildCtx *ctx)
int32_t ofs = ctx->sym[i].ofs; int32_t ofs = ctx->sym[i].ofs;
int32_t next = ctx->sym[i+1].ofs; int32_t next = ctx->sym[i+1].ofs;
emit_asm_label(ctx, ctx->sym[i].name, next - ofs, 1); emit_asm_label(ctx, ctx->sym[i].name, next - ofs, 1);
while (rel < ctx->nreloc && ctx->reloc[rel].ofs < next) { while (rel < ctx->nreloc && ctx->reloc[rel].ofs <= next) {
BuildReloc *r = &ctx->reloc[rel]; BuildReloc *r = &ctx->reloc[rel];
int n = r->ofs - ofs; int n = r->ofs - ofs;
#if LJ_TARGET_X86ORX64 #if LJ_TARGET_X86ORX64