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

Fix decoding of REL_EXT.

Browse Source 
REL_EXT has an argument which wasn't being properly jumped,
resulting in an early STOP (because the argument is 0).
This commit is contained in:
Michael Munday 2016-12-14 16:27:38 -05:00
parent 49182c4d2e
commit ef3ff100f2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dynasm/dasm_s390x.h
View File

@ -214,12 +214,17 @@ void dasm_put(Dst_DECL, int start, ...)
ofs += 2; ofs += 2;
break; break;
case DASM_REL_EXT: case DASM_REL_EXT:
p++;
ofs += 4;
break; break;
case DASM_ALIGN: case DASM_ALIGN:
ofs += *p++; ofs += *p++;
b[pos++] = ofs; b[pos++] = ofs;
break; break;
case DASM_REL_LG: case DASM_REL_LG:
if (p[-2] >> 12 == 0xc) { /* RIL instruction needs 32-bit immediate. */
ofs += 2;
}
n = *p++ - 10; n = *p++ - 10;
pl = D->lglabels + n; pl = D->lglabels + n;
/* Bkwd rel or global. */ /* Bkwd rel or global. */
@ -234,6 +239,9 @@ void dasm_put(Dst_DECL, int start, ...)
n = 0; /* Start new chain for fwd rel if label exists. */ n = 0; /* Start new chain for fwd rel if label exists. */
goto linkrel; goto linkrel;
case DASM_REL_PC: case DASM_REL_PC:
if (p[-2] >> 12 == 0xc) { /* RIL instruction needs 32-bit immediate. */
ofs += 2;
}
pl = D->pclabels + n; pl = D->pclabels + n;
CKPL(pc, PC); CKPL(pc, PC);
putrel: putrel:
@ -246,9 +254,6 @@ void dasm_put(Dst_DECL, int start, ...)
*pl = pos; *pl = pos;
} }
ofs += 2; ofs += 2;
if (p[-3] >> 12 == 0xc) { /* RIL instruction needs 32-bit immediate. */
ofs += 2;
}
pos++; pos++;
break; break;
case DASM_LABEL_LG: case DASM_LABEL_LG:
@ -359,6 +364,7 @@ int dasm_link(Dst_DECL, size_t * szp)
p++; p++;
break; break;
case DASM_REL_EXT: case DASM_REL_EXT:
p++;
break; break;
case DASM_ALIGN: case DASM_ALIGN:
ofs -= (b[pos++] + ofs) & *p++; ofs -= (b[pos++] + ofs) & *p++;
@ -430,7 +436,7 @@ int dasm_encode(Dst_DECL, void *buffer)
*cp++ = *p++; *cp++ = *p++;
break; break;
case DASM_REL_EXT: case DASM_REL_EXT:
n = DASM_EXTERN(Dst, (unsigned char *)cp, (ins & 2047), 1) - 4; n = DASM_EXTERN(Dst, (unsigned char *)cp, *p++, 1) - 4;
goto patchrel; goto patchrel;
case DASM_ALIGN: case DASM_ALIGN:
ins = *p++; ins = *p++;
@ -443,6 +449,7 @@ int dasm_encode(Dst_DECL, void *buffer)
case DASM_REL_PC: case DASM_REL_PC:
CK(n >= 0, UNDEF_PC); CK(n >= 0, UNDEF_PC);
n = *DASM_POS2PTR(D, n) - (int)((char *)cp - base); n = *DASM_POS2PTR(D, n) - (int)((char *)cp - base);
p++; /* skip argument */
patchrel: patchrel:
/* Offsets are halfword aligned (so need to be halved). */ /* Offsets are halfword aligned (so need to be halved). */
n += 2; /* Offset is relative to start of instruction. */ n += 2; /* Offset is relative to start of instruction. */
@ -452,7 +459,6 @@ int dasm_encode(Dst_DECL, void *buffer)
CK(-(1 << 16) <= n && n < (1 << 16) && (n & 1) == 0, RANGE_LG); CK(-(1 << 16) <= n && n < (1 << 16) && (n & 1) == 0, RANGE_LG);
} }
*cp++ = n >> 1; *cp++ = n >> 1;
p++; /* skip argument */
break; break;
case DASM_LABEL_LG: case DASM_LABEL_LG:
ins = *p++; ins = *p++;

3
dynasm/dasm_s390x.lua
View File

@ -79,7 +79,8 @@ local function havearg(a)
return a == "ESC" or return a == "ESC" or
a == "SECTION" or a == "SECTION" or
a == "REL_LG" or a == "REL_LG" or
a == "LABEL_LG" a == "LABEL_LG" or
a == "REL_EXT"
end end
-- Write action list buffer as a huge static C array. -- Write action list buffer as a huge static C array.