mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2024-11-29 16:13:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

a few more operations supporting integers (minus, umin, mult)

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2013-04-16 15:43:05 -03:00
parent 44358e0206
commit d4f0c4435d
1 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.154 2012/08/16 17:34:28 roberto Exp $ ** $Id: lvm.c,v 2.157 2013/04/15 15:44:46 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -625,22 +625,52 @@ void luaV_execute (lua_State *L) {
Protect(luaV_gettable(L, rb, RKC(i), ra)); Protect(luaV_gettable(L, rb, RKC(i), ra));
) )
vmcase(OP_ADD, vmcase(OP_ADD,
TValue *rb1 = RKB(i); TValue *rb = RKB(i);
TValue *rc1 = RKC(i); TValue *rc = RKC(i);
if (ttisinteger(rb1) && ttisinteger(rc1)) { if (ttisinteger(rb) && ttisinteger(rc)) {
lua_Integer ib = ivalue(rb1); lua_Integer ic = ivalue(rc1); lua_Integer ib = ivalue(rb); lua_Integer ic = ivalue(rc);
setivalue(ra, ib + ic); setivalue(ra, ib + ic);
} }
else arith_op(luai_numadd, TM_ADD); else if (ttisnumber(rb) && ttisnumber(rc)) {
lua_Number nb = nvalue(rb); lua_Number nc = nvalue(rc);
setnvalue(ra, luai_numadd(L, nb, nc));
}
else { Protect(luaV_arith(L, ra, rb, rc, TM_ADD)); }
) )
vmcase(OP_SUB, vmcase(OP_SUB,
arith_op(luai_numsub, TM_SUB); TValue *rb = RKB(i);
TValue *rc = RKC(i);
if (ttisinteger(rb) && ttisinteger(rc)) {
lua_Integer ib = ivalue(rb); lua_Integer ic = ivalue(rc);
setivalue(ra, ib - ic);
}
else if (ttisnumber(rb) && ttisnumber(rc)) {
lua_Number nb = nvalue(rb); lua_Number nc = nvalue(rc);
setnvalue(ra, luai_numsub(L, nb, nc));
}
else { Protect(luaV_arith(L, ra, rb, rc, TM_SUB)); }
) )
vmcase(OP_MUL, vmcase(OP_MUL,
arith_op(luai_nummul, TM_MUL); TValue *rb = RKB(i);
TValue *rc = RKC(i);
if (ttisinteger(rb) && ttisinteger(rc)) {
lua_Integer ib = ivalue(rb); lua_Integer ic = ivalue(rc);
setivalue(ra, ib * ic);
}
else if (ttisnumber(rb) && ttisnumber(rc)) {
lua_Number nb = nvalue(rb); lua_Number nc = nvalue(rc);
setnvalue(ra, luai_nummul(L, nb, nc));
}
else { Protect(luaV_arith(L, ra, rb, rc, TM_MUL)); }
) )
vmcase(OP_DIV, vmcase(OP_DIV, /* float division (always with floats) */
arith_op(luai_numdiv, TM_DIV); TValue *rb = RKB(i);
TValue *rc = RKC(i);
if (ttisnumber(rb) && ttisnumber(rc)) {
lua_Number nb = nvalue(rb); lua_Number nc = nvalue(rc);
setnvalue(ra, luai_numdiv(L, nb, nc));
}
else { Protect(luaV_arith(L, ra, rb, rc, TM_DIV)); }
) )
vmcase(OP_MOD, vmcase(OP_MOD,
arith_op(luai_nummod, TM_MOD); arith_op(luai_nummod, TM_MOD);
@ -650,8 +680,12 @@ void luaV_execute (lua_State *L) {
) )
vmcase(OP_UNM, vmcase(OP_UNM,
TValue *rb = RB(i); TValue *rb = RB(i);
if (ttisnumber(rb)) { if (ttisinteger(rb)) {
lua_Number nb = nvalue(rb); lua_Integer ib = ivalue(rb);
setivalue(ra, -ib);
}
else if (ttisfloat(rb)) {
lua_Number nb = fltvalue(rb);
setnvalue(ra, luai_numunm(L, nb)); setnvalue(ra, luai_numunm(L, nb));
} }
else { else {