rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

'setobj2t' incorporated into 'luaV_fastset' + 'invalidateTMcache' 

is not needed in the fast track (as it does not create new
entries)
This commit is contained in:
Roberto Ierusalimschy 2015-09-09 10:44:07 -03:00
parent 53be1451a8
commit b91bc93fd3
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.250 2015/08/03 20:40:26 roberto Exp roberto $ ** $Id: lvm.c,v 2.251 2015/09/08 15:41:05 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -216,11 +216,8 @@ void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
return; return;
} }
t = tm; /* else repeat assignment over 'tm' */ t = tm; /* else repeat assignment over 'tm' */
if (luaV_fastset(L, t, key, oldval, luaH_get, val)) { if (luaV_fastset(L, t, key, oldval, luaH_get, val))
invalidateTMcache(hvalue(t)); return; /* done */
setobj2t(L, cast(TValue *, oldval), val);
return;
}
/* else loop */ /* else loop */
} }
luaG_runerror(L, "settable chain too long; possible loop"); luaG_runerror(L, "settable chain too long; possible loop");

30
lvm.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.h,v 2.37 2015/08/03 19:50:49 roberto Exp roberto $ ** $Id: lvm.h,v 2.38 2015/08/03 20:40:26 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -70,17 +70,27 @@
else luaV_finishget(L,t,k,v,aux); } else luaV_finishget(L,t,k,v,aux); }
#define luaV_fastset(L,t,k,aux,f,v) \ /*
** Fast track for set table. If 't' is a table and 't[k]' is not nil,
** call GC barrier, do a raw 't[k]=v', and return true; otherwise,
** return false with 'slot' equal to NULL (if 't' is not a table) or
** 'nil'. (This is needed by 'luaV_finishget'.) Note that, if the macro
** returns true, there is no need to 'invalidateTMcache', because the
** call is not creating a new entry.
*/
#define luaV_fastset(L,t,k,slot,f,v) \
(!ttistable(t) \ (!ttistable(t) \
? (aux = NULL, 0) \ ? (slot = NULL, 0) \
: (aux = f(hvalue(t), k), \ : (slot = f(hvalue(t), k), \
ttisnil(aux) ? 0 \ ttisnil(slot) ? 0 \
: (luaC_barrierback(L, hvalue(t), v), 1))) : (luaC_barrierback(L, hvalue(t), v), \
setobj2t(L, cast(TValue *,slot), v), \
1)))
#define luaV_settable(L,t,k,v) { const TValue *aux; \
if (luaV_fastset(L,t,k,aux,luaH_get,v)) \ #define luaV_settable(L,t,k,v) { const TValue *slot; \
{ invalidateTMcache(hvalue(t)); setobj2t(L, cast(TValue *,aux), v); } \ if (!luaV_fastset(L,t,k,slot,luaH_get,v)) \
else luaV_finishset(L,t,k,v,aux); } luaV_finishset(L,t,k,v,slot); }