aboutsummaryrefslogtreecommitdiff
path: root/lvm.c
diff options
context:
space:
mode:
Diffstat (limited to 'lvm.c')
-rw-r--r--lvm.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/lvm.c b/lvm.c
index a8f8d983..49950df6 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lvm.c,v 1.225 2002/04/10 12:11:07 roberto Exp roberto $ 2** $Id: lvm.c,v 1.226 2002/04/22 14:40:23 roberto Exp roberto $
3** Lua virtual machine 3** Lua virtual machine
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -287,7 +287,7 @@ static void powOp (lua_State *L, StkId ra, StkId rb, StkId rc) {
287#define RKC(i) ((GETARG_C(i) < MAXSTACK) ? \ 287#define RKC(i) ((GETARG_C(i) < MAXSTACK) ? \
288 base+GETARG_C(i) : \ 288 base+GETARG_C(i) : \
289 k+GETARG_C(i)-MAXSTACK) 289 k+GETARG_C(i)-MAXSTACK)
290#define KBc(i) (k+GETARG_Bc(i)) 290#define KBx(i) (k+GETARG_Bx(i))
291 291
292#define Arith(op, optm) { \ 292#define Arith(op, optm) { \
293 const TObject *b = RB(i); const TObject *c = RKC(i); \ 293 const TObject *b = RB(i); const TObject *c = RKC(i); \
@@ -332,7 +332,7 @@ StkId luaV_execute (lua_State *L) {
332 break; 332 break;
333 } 333 }
334 case OP_LOADK: { 334 case OP_LOADK: {
335 setobj(ra, KBc(i)); 335 setobj(ra, KBx(i));
336 break; 336 break;
337 } 337 }
338 case OP_LOADBOOL: { 338 case OP_LOADBOOL: {
@@ -353,8 +353,8 @@ StkId luaV_execute (lua_State *L) {
353 break; 353 break;
354 } 354 }
355 case OP_GETGLOBAL: { 355 case OP_GETGLOBAL: {
356 lua_assert(ttype(KBc(i)) == LUA_TSTRING); 356 lua_assert(ttype(KBx(i)) == LUA_TSTRING);
357 luaV_gettable(L, gt(L), KBc(i), ra); 357 luaV_gettable(L, gt(L), KBx(i), ra);
358 break; 358 break;
359 } 359 }
360 case OP_GETTABLE: { 360 case OP_GETTABLE: {
@@ -362,8 +362,8 @@ StkId luaV_execute (lua_State *L) {
362 break; 362 break;
363 } 363 }
364 case OP_SETGLOBAL: { 364 case OP_SETGLOBAL: {
365 lua_assert(ttype(KBc(i)) == LUA_TSTRING); 365 lua_assert(ttype(KBx(i)) == LUA_TSTRING);
366 luaV_settable(L, gt(L), KBc(i), ra); 366 luaV_settable(L, gt(L), KBx(i), ra);
367 break; 367 break;
368 } 368 }
369 case OP_SETUPVAL: { 369 case OP_SETUPVAL: {
@@ -434,7 +434,7 @@ StkId luaV_execute (lua_State *L) {
434 break; 434 break;
435 } 435 }
436 case OP_JMP: { 436 case OP_JMP: {
437 dojump(pc, GETARG_sBc(i)); 437 dojump(pc, GETARG_sBx(i));
438 break; 438 break;
439 } 439 }
440 case OP_TESTEQ: { /* skip next instruction if test fails */ 440 case OP_TESTEQ: { /* skip next instruction if test fails */
@@ -531,7 +531,7 @@ StkId luaV_execute (lua_State *L) {
531 } 531 }
532 case OP_FORLOOP: { 532 case OP_FORLOOP: {
533 lua_Number step, index, limit; 533 lua_Number step, index, limit;
534 int j = GETARG_sBc(i); 534 int j = GETARG_sBx(i);
535 const TObject *plimit = ra+1; 535 const TObject *plimit = ra+1;
536 const TObject *pstep = ra+2; 536 const TObject *pstep = ra+2;
537 if (ttype(ra) != LUA_TNUMBER) 537 if (ttype(ra) != LUA_TNUMBER)
@@ -574,7 +574,7 @@ StkId luaV_execute (lua_State *L) {
574 Table *h; 574 Table *h;
575 runtime_check(L, ttype(ra) == LUA_TTABLE); 575 runtime_check(L, ttype(ra) == LUA_TTABLE);
576 h = hvalue(ra); 576 h = hvalue(ra);
577 bc = GETARG_Bc(i); 577 bc = GETARG_Bx(i);
578 if (GET_OPCODE(i) == OP_SETLIST) 578 if (GET_OPCODE(i) == OP_SETLIST)
579 n = (bc&(LFIELDS_PER_FLUSH-1)) + 1; 579 n = (bc&(LFIELDS_PER_FLUSH-1)) + 1;
580 else { 580 else {
@@ -594,7 +594,7 @@ StkId luaV_execute (lua_State *L) {
594 Proto *p; 594 Proto *p;
595 Closure *ncl; 595 Closure *ncl;
596 int nup, j; 596 int nup, j;
597 p = cl->p->p[GETARG_Bc(i)]; 597 p = cl->p->p[GETARG_Bx(i)];
598 nup = p->nupvalues; 598 nup = p->nupvalues;
599 ncl = luaF_newLclosure(L, nup); 599 ncl = luaF_newLclosure(L, nup);
600 ncl->l.p = p; 600 ncl->l.p = p;