DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid pesky compiler warnings about C++ keywords (eh?).

Browse Source
This commit is contained in:
Mike Pall
2012-07-03 13:19:32 +02:00
parent c740a30223
commit 17d3fc47f3
18 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lj_asm_x86.h
View File

@@ -1476,9 +1476,9 @@ static void asm_sload(ASMState *as, IRIns *ir)
static void asm_cnew(ASMState *as, IRIns *ir)
{
CTState *cts = ctype_ctsG(J2G(as->J));
CTypeID typeid = (CTypeID)IR(ir->op1)->i;
CTypeID ctypeid = (CTypeID)IR(ir->op1)->i;
CTSize sz = (ir->o == IR_CNEWI || ir->op2 == REF_NIL) ?
lj_ctype_size(cts, typeid) : (CTSize)IR(ir->op2)->i;
lj_ctype_size(cts, ctypeid) : (CTSize)IR(ir->op2)->i;
const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_mem_newgco];
IRRef args[2];
lua_assert(sz != CTSIZE_INVALID);
@@ -1529,10 +1529,10 @@ static void asm_cnew(ASMState *as, IRIns *ir)
lua_assert(sz == 4 || sz == 8);
}
/* Combine initialization of marked, gct and typeid. */
/* Combine initialization of marked, gct and ctypeid. */
emit_movtomro(as, RID_ECX, RID_RET, offsetof(GCcdata, marked));
emit_gri(as, XG_ARITHi(XOg_OR), RID_ECX,
(int32_t)((~LJ_TCDATA<<8)+(typeid<<16)));
(int32_t)((~LJ_TCDATA<<8)+(ctypeid<<16)));
emit_gri(as, XG_ARITHi(XOg_AND), RID_ECX, LJ_GC_WHITES);
emit_opgl(as, XO_MOVZXb, RID_ECX, gc.currentwhite);