aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2010-08-03 23:11:12 +0200
committerMike Pall <mike>2010-08-03 23:11:12 +0200
commit0a3329c581b8acc7f3c9473dd02d92a1838655c3 (patch)
treef5825c671672fcb75c2be3e0041c74fb10ab0433 /src
parent309d8f5aabeae06180f094dcb2fe5170864541c4 (diff)
downloadluajit-0a3329c581b8acc7f3c9473dd02d92a1838655c3.tar.gz
luajit-0a3329c581b8acc7f3c9473dd02d92a1838655c3.tar.bz2
luajit-0a3329c581b8acc7f3c9473dd02d92a1838655c3.zip
Fix some compiler warnings.
Diffstat (limited to 'src')
-rw-r--r--src/lj_parse.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lj_parse.c b/src/lj_parse.c
index 18c757a3..2811e6eb 100644
--- a/src/lj_parse.c
+++ b/src/lj_parse.c
@@ -620,10 +620,11 @@ static BCPos bcemit_jmp(FuncState *fs)
620{ 620{
621 BCPos jpc = fs->jpc; 621 BCPos jpc = fs->jpc;
622 BCPos j = fs->pc - 1; 622 BCPos j = fs->pc - 1;
623 BCIns *ip = &fs->bcbase[j].ins;
623 fs->jpc = NO_JMP; 624 fs->jpc = NO_JMP;
624 if ((int32_t)j >= (int32_t)fs->lasttarget && 625 if ((int32_t)j >= (int32_t)fs->lasttarget &&
625 bc_op(fs->bcbase[j].ins) == BC_UCLO) 626 bc_op(*ip) == BC_UCLO)
626 setbc_j(&fs->bcbase[j].ins, NO_JMP); 627 setbc_j(ip, NO_JMP);
627 else 628 else
628 j = bcemit_AJ(fs, BC_JMP, fs->freereg, NO_JMP); 629 j = bcemit_AJ(fs, BC_JMP, fs->freereg, NO_JMP);
629 jmp_append(fs, &j, jpc); 630 jmp_append(fs, &j, jpc);
@@ -1378,10 +1379,11 @@ static void expr_table(LexState *ls, ExpDesc *e)
1378 e->k = VNONRELOC; /* May have been changed by expr_index. */ 1379 e->k = VNONRELOC; /* May have been changed by expr_index. */
1379 } 1380 }
1380 if (!t) { /* Construct TNEW RD: hhhhhaaaaaaaaaaa. */ 1381 if (!t) { /* Construct TNEW RD: hhhhhaaaaaaaaaaa. */
1382 BCIns *ip = &fs->bcbase[pc].ins;
1381 if (!needarr) narr = 0; 1383 if (!needarr) narr = 0;
1382 else if (narr < 3) narr = 3; 1384 else if (narr < 3) narr = 3;
1383 else if (narr > 0x7ff) narr = 0x7ff; 1385 else if (narr > 0x7ff) narr = 0x7ff;
1384 setbc_d(&fs->bcbase[pc].ins, (uint32_t)narr|(hsize2hbits(nhash)<<11)); 1386 setbc_d(ip, (uint32_t)narr|(hsize2hbits(nhash)<<11));
1385 } 1387 }
1386} 1388}
1387 1389