gh-mirror/mikepaul-LuaJIT
1
0
Fork 1
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-12 09:24:07 +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 2018-05-20 12:45:01 +02:00
commit b708297aba
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lj_emit_x86.h
View File

@ -274,10 +274,12 @@ static void emit_movmroi(ASMState *as, Reg base, int32_t ofs, int32_t i)
/* mov r, i / xor r, r */ /* mov r, i / xor r, r */
static void emit_loadi(ASMState *as, Reg r, int32_t i) static void emit_loadi(ASMState *as, Reg r, int32_t i)
{ {
/* XOR r,r is shorter, but modifies the flags. This is bad for HIOP. */ /* XOR r,r is shorter, but modifies the flags. This is bad for HIOP/jcc. */
if (i == 0 && !(LJ_32 && (IR(as->curins)->o == IR_HIOP || if (i == 0 && !(LJ_32 && (IR(as->curins)->o == IR_HIOP ||
(as->curins+1 < as->T->nins && (as->curins+1 < as->T->nins &&
IR(as->curins+1)->o == IR_HIOP)))) { IR(as->curins+1)->o == IR_HIOP))) &&
!((*as->mcp == 0x0f && (as->mcp[1] & 0xf0) == XI_JCCn) ||
(*as->mcp & 0xf0) == XI_JCCs)) {
emit_rr(as, XO_ARITH(XOg_XOR), r, r); emit_rr(as, XO_ARITH(XOg_XOR), r, r);
} else { } else {
MCode *p = as->mcp; MCode *p = as->mcp;