aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-06-04 10:05:29 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-06-04 10:05:29 -0300
commit3819c30e5553b98ceb7d8d2da20c9da25cbdc62a (patch)
treed08d1fe8202663cf7f6ae3e85f0f9dd7dfa20e01
parente94fac8956436c246d564ef518b02afa484ac999 (diff)
downloadlua-3819c30e5553b98ceb7d8d2da20c9da25cbdc62a.tar.gz
lua-3819c30e5553b98ceb7d8d2da20c9da25cbdc62a.tar.bz2
lua-3819c30e5553b98ceb7d8d2da20c9da25cbdc62a.zip
better names for barrier macros
-rw-r--r--lapi.c8
-rw-r--r--ltable.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/lapi.c b/lapi.c
index 95be89d5..c811be99 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lapi.c,v 2.129 2010/05/14 13:15:26 roberto Exp roberto $ 2** $Id: lapi.c,v 2.130 2010/05/31 16:08:55 roberto Exp roberto $
3** Lua API 3** Lua API
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -689,7 +689,7 @@ LUA_API void lua_rawset (lua_State *L, int idx) {
689 t = index2addr(L, idx); 689 t = index2addr(L, idx);
690 api_check(L, ttistable(t), "table expected"); 690 api_check(L, ttistable(t), "table expected");
691 setobj2t(L, luaH_set(L, hvalue(t), L->top-2), L->top-1); 691 setobj2t(L, luaH_set(L, hvalue(t), L->top-2), L->top-1);
692 luaC_barriert(L, hvalue(t), L->top-1); 692 luaC_barrierback(L, gcvalue(t), L->top-1);
693 L->top -= 2; 693 L->top -= 2;
694 lua_unlock(L); 694 lua_unlock(L);
695} 695}
@@ -702,7 +702,7 @@ LUA_API void lua_rawseti (lua_State *L, int idx, int n) {
702 o = index2addr(L, idx); 702 o = index2addr(L, idx);
703 api_check(L, ttistable(o), "table expected"); 703 api_check(L, ttistable(o), "table expected");
704 setobj2t(L, luaH_setint(L, hvalue(o), n), L->top-1); 704 setobj2t(L, luaH_setint(L, hvalue(o), n), L->top-1);
705 luaC_barriert(L, hvalue(o), L->top-1); 705 luaC_barrierback(L, gcvalue(o), L->top-1);
706 L->top--; 706 L->top--;
707 lua_unlock(L); 707 lua_unlock(L);
708} 708}
@@ -725,7 +725,7 @@ LUA_API int lua_setmetatable (lua_State *L, int objindex) {
725 case LUA_TTABLE: { 725 case LUA_TTABLE: {
726 hvalue(obj)->metatable = mt; 726 hvalue(obj)->metatable = mt;
727 if (mt) 727 if (mt)
728 luaC_objbarriert(L, hvalue(obj), mt); 728 luaC_objbarrierback(L, gcvalue(obj), mt);
729 break; 729 break;
730 } 730 }
731 case LUA_TUSERDATA: { 731 case LUA_TUSERDATA: {
diff --git a/ltable.c b/ltable.c
index 3e8b2060..7a909b27 100644
--- a/ltable.c
+++ b/ltable.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: ltable.c,v 2.49 2010/04/13 20:48:12 roberto Exp roberto $ 2** $Id: ltable.c,v 2.50 2010/04/18 13:22:48 roberto Exp roberto $
3** Lua tables (hash) 3** Lua tables (hash)
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -423,7 +423,7 @@ static TValue *newkey (lua_State *L, Table *t, const TValue *key) {
423 } 423 }
424 } 424 }
425 setobj2t(L, gkey(mp), key); 425 setobj2t(L, gkey(mp), key);
426 luaC_barriert(L, t, key); 426 luaC_barrierback(L, obj2gco(t), key);
427 lua_assert(ttisnil(gval(mp))); 427 lua_assert(ttisnil(gval(mp)));
428 return gval(mp); 428 return gval(mp);
429} 429}