diff options
| author | Mike Pall <mike> | 2012-07-03 13:19:32 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2012-07-03 13:19:32 +0200 |
| commit | 17d3fc47f30f8d8e62231252ce41f4feba71aa2f (patch) | |
| tree | 6134124f9357a0f4ca821556de644337491e4e0b /src/lj_asm_x86.h | |
| parent | c740a302238cf650dd7fef6ebed8aeb878cf0c1d (diff) | |
| download | luajit-17d3fc47f30f8d8e62231252ce41f4feba71aa2f.tar.gz luajit-17d3fc47f30f8d8e62231252ce41f4feba71aa2f.tar.bz2 luajit-17d3fc47f30f8d8e62231252ce41f4feba71aa2f.zip | |
Avoid pesky compiler warnings about C++ keywords (eh?).
Diffstat (limited to 'src/lj_asm_x86.h')
| -rw-r--r-- | src/lj_asm_x86.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h index ae14b3b6..59c808c4 100644 --- a/src/lj_asm_x86.h +++ b/src/lj_asm_x86.h | |||
| @@ -1476,9 +1476,9 @@ static void asm_sload(ASMState *as, IRIns *ir) | |||
| 1476 | static void asm_cnew(ASMState *as, IRIns *ir) | 1476 | static void asm_cnew(ASMState *as, IRIns *ir) |
| 1477 | { | 1477 | { |
| 1478 | CTState *cts = ctype_ctsG(J2G(as->J)); | 1478 | CTState *cts = ctype_ctsG(J2G(as->J)); |
| 1479 | CTypeID typeid = (CTypeID)IR(ir->op1)->i; | 1479 | CTypeID ctypeid = (CTypeID)IR(ir->op1)->i; |
| 1480 | CTSize sz = (ir->o == IR_CNEWI || ir->op2 == REF_NIL) ? | 1480 | CTSize sz = (ir->o == IR_CNEWI || ir->op2 == REF_NIL) ? |
| 1481 | lj_ctype_size(cts, typeid) : (CTSize)IR(ir->op2)->i; | 1481 | lj_ctype_size(cts, ctypeid) : (CTSize)IR(ir->op2)->i; |
| 1482 | const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_mem_newgco]; | 1482 | const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_mem_newgco]; |
| 1483 | IRRef args[2]; | 1483 | IRRef args[2]; |
| 1484 | lua_assert(sz != CTSIZE_INVALID); | 1484 | lua_assert(sz != CTSIZE_INVALID); |
| @@ -1529,10 +1529,10 @@ static void asm_cnew(ASMState *as, IRIns *ir) | |||
| 1529 | lua_assert(sz == 4 || sz == 8); | 1529 | lua_assert(sz == 4 || sz == 8); |
| 1530 | } | 1530 | } |
| 1531 | 1531 | ||
| 1532 | /* Combine initialization of marked, gct and typeid. */ | 1532 | /* Combine initialization of marked, gct and ctypeid. */ |
| 1533 | emit_movtomro(as, RID_ECX, RID_RET, offsetof(GCcdata, marked)); | 1533 | emit_movtomro(as, RID_ECX, RID_RET, offsetof(GCcdata, marked)); |
| 1534 | emit_gri(as, XG_ARITHi(XOg_OR), RID_ECX, | 1534 | emit_gri(as, XG_ARITHi(XOg_OR), RID_ECX, |
| 1535 | (int32_t)((~LJ_TCDATA<<8)+(typeid<<16))); | 1535 | (int32_t)((~LJ_TCDATA<<8)+(ctypeid<<16))); |
| 1536 | emit_gri(as, XG_ARITHi(XOg_AND), RID_ECX, LJ_GC_WHITES); | 1536 | emit_gri(as, XG_ARITHi(XOg_AND), RID_ECX, LJ_GC_WHITES); |
| 1537 | emit_opgl(as, XO_MOVZXb, RID_ECX, gc.currentwhite); | 1537 | emit_opgl(as, XO_MOVZXb, RID_ECX, gc.currentwhite); |
| 1538 | 1538 | ||