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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2016-04-18 13:41:41 +02:00
commit 4c6498d245
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lj_asm_x86.h
View File

@ -2685,17 +2685,17 @@ static uint32_t asm_x86_inslen(const uint8_t* p)
return result + (x & 15); return result + (x & 15);
case 7: /* VEX c4/c5. */ case 7: /* VEX c4/c5. */
if (LJ_32 && p[1] < 0xc0) { if (LJ_32 && p[1] < 0xc0) {
x = 2; x = 2;
goto mrm; goto mrm;
} }
if (x == 0x70) { if (x == 0x70) {
x = *++p & 0x1f; x = *++p & 0x1f;
result++; result++;
if (x >= 2) { if (x >= 2) {
p += 2; p += 2;
result += 2; result += 2;
goto mrm; goto mrm;
} }
} }
p++; p++;
result++; result++;
@ -2712,8 +2712,8 @@ static uint32_t asm_x86_inslen(const uint8_t* p)
case 3: return result; case 3: return result;
} }
if ((x & 7) == 4) { if ((x & 7) == 4) {
result++; result++;
if (x < 0x40 && (p[1] & 7) == 5) result += 4; if (x < 0x40 && (p[1] & 7) == 5) result += 4;
} }
return result; return result;
} }