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

Support forward local branches.

Browse Source
This commit is contained in:
Michael Munday 2016-12-06 11:56:37 -05:00
parent b24d490a42
commit e3ab67aed4
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dynasm/Examples/test_z_inst.c
View File

@ -76,6 +76,23 @@ static void lab(dasm_State *state)
| br r14
}
static void labg(dasm_State *state)
{
dasm_State **Dst = &state;
// r1 = 0; do { r2 += r2; r1 += 1; } while(r1 < r3);
| la r1, 0(r0)
|1:
| agr r2, r2
| la r1, 1(r1)
| cgr r1, r3
| jgl <1
| jgnl >1
| stg r0, 0(r0)
|1:
| br r14
}
static void add_imm16(dasm_State *state)
{
dasm_State **Dst = &state;
@ -108,6 +125,7 @@ test_table test[] = {
{ 5, 7, rx, 12298, "rx"},
{ 5, 7, rxy, 10, "rxy"},
{ 2, 4, lab, 32, "lab"},
{ 2, 4, labg, 32, "labg"},
{ 2, 0, add_imm16, 17, "imm16"},
{ 2, 0, add_imm32, 16, "imm32"}
};

18
dynasm/dasm_s390x.h
View File

@ -210,7 +210,7 @@ void dasm_put(Dst_DECL, int start, ...)
goto stop;
case DASM_ESC:
p++;
ofs += 4;
ofs += 2;
break;
case DASM_REL_EXT:
break;
@ -244,6 +244,10 @@ void dasm_put(Dst_DECL, int start, ...)
b[pos] = n; /* Else link to rel chain, anchored at label. */
*pl = pos;
}
ofs += 2;
if (p[-3] >> 12 == 0xc) { /* RIL instruction needs 32-bit immediate. */
ofs += 2;
}
pos++;
break;
case DASM_LABEL_LG:
@ -262,7 +266,6 @@ void dasm_put(Dst_DECL, int start, ...)
}
*pl = -pos; /* Label exists now. */
b[pos++] = ofs; /* Store pass1 offset estimate. */
ofs += 2;
break;
case DASM_IMM16:
CK(((short)n) == n, RANGE_I); /* TODO: unsigned immediates? */
@ -424,8 +427,15 @@ int dasm_encode(Dst_DECL, void *buffer)
CK(n >= 0, UNDEF_PC);
n = *DASM_POS2PTR(D, n) - (int)((char *)cp - base);
patchrel:
*cp++ = n/2; /* TODO: only 16-bit relative jump currently works. */
p++; /* skip argument */
/* Offsets are halfword aligned (so need to be halved). */
n += 2; /* Offset is relative to start of instruction. */
if (cp[-1] >> 12 == 0xc) {
*cp++ = n >> 17;
} else {
CK(-(1 << 16) <= n && n < (1 << 16) && n & 1 == 0, RANGE_LG);
}
*cp++ = n >> 1;
p++; /* skip argument */
break;
case DASM_LABEL_LG:
ins = *p++;

9
dynasm/dasm_s390x.lua
View File

@ -75,6 +75,13 @@ local function dumpactions(out)
out:write("\n")
end
local function havearg(a)
return a == "ESC" or
a == "SECTION" or
a == "REL_LG" or
a == "LABEL_LG"
end
-- Write action list buffer as a huge static C array.
local function writeactions(out, name)
local nn = #actlist
@ -87,7 +94,7 @@ local function writeactions(out, name)
local name = action_names[actlist[i]+1]
if not esc and name then
assert(out:write(" /* ", name, " */"))
esc = name == "ESC" or name == "SECTION"
esc = havearg(name)
else
esc = false
end