gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 07:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move a GC macro.

Browse Source
This commit is contained in:
Mike Pall 2012-10-02 09:57:49 +02:00
parent fcddd5a3a0
commit b66ab96a62
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lj_cdata.c
View File

@ -56,7 +56,7 @@ void LJ_FASTCALL lj_cdata_free(global_State *g, GCcdata *cd)
if (LJ_UNLIKELY(cd->marked & LJ_GC_CDATA_FIN)) { if (LJ_UNLIKELY(cd->marked & LJ_GC_CDATA_FIN)) {
GCobj *root; GCobj *root;
makewhite(g, obj2gco(cd)); makewhite(g, obj2gco(cd));
obj2gco(cd)->gch.marked |= LJ_GC_FINALIZED; markfinalized(obj2gco(cd));
if ((root = gcref(g->gc.mmudata)) != NULL) { if ((root = gcref(g->gc.mmudata)) != NULL) {
setgcrefr(cd->nextgc, root->gch.nextgc); setgcrefr(cd->nextgc, root->gch.nextgc);
setgcref(root->gch.nextgc, obj2gco(cd)); setgcref(root->gch.nextgc, obj2gco(cd));

7
src/lj_gc.c
View File

@ -35,7 +35,6 @@
#define white2gray(x) ((x)->gch.marked &= (uint8_t)~LJ_GC_WHITES) #define white2gray(x) ((x)->gch.marked &= (uint8_t)~LJ_GC_WHITES)
#define gray2black(x) ((x)->gch.marked |= LJ_GC_BLACK) #define gray2black(x) ((x)->gch.marked |= LJ_GC_BLACK)
#define isfinalized(u) ((u)->marked & LJ_GC_FINALIZED) #define isfinalized(u) ((u)->marked & LJ_GC_FINALIZED)
#define markfinalized(u) ((u)->marked |= LJ_GC_FINALIZED)
/* -- Mark phase ---------------------------------------------------------- */ /* -- Mark phase ---------------------------------------------------------- */
@ -122,7 +121,7 @@ static void gc_mark_mmudata(global_State *g)
} }
} }
/* Separate userdata which which needs finalization to mmudata list. */ /* Separate userdata objects to be finalized to mmudata list. */
size_t lj_gc_separateudata(global_State *g, int all) size_t lj_gc_separateudata(global_State *g, int all)
{ {
size_t m = 0; size_t m = 0;
@ -132,11 +131,11 @@ size_t lj_gc_separateudata(global_State *g, int all)
if (!(iswhite(o) || all) || isfinalized(gco2ud(o))) { if (!(iswhite(o) || all) || isfinalized(gco2ud(o))) {
p = &o->gch.nextgc; /* Nothing to do. */ p = &o->gch.nextgc; /* Nothing to do. */
} else if (!lj_meta_fastg(g, tabref(gco2ud(o)->metatable), MM_gc)) { } else if (!lj_meta_fastg(g, tabref(gco2ud(o)->metatable), MM_gc)) {
markfinalized(gco2ud(o)); /* Done, as there's no __gc metamethod. */ markfinalized(o); /* Done, as there's no __gc metamethod. */
p = &o->gch.nextgc; p = &o->gch.nextgc;
} else { /* Otherwise move userdata to be finalized to mmudata list. */ } else { /* Otherwise move userdata to be finalized to mmudata list. */
m += sizeudata(gco2ud(o)); m += sizeudata(gco2ud(o));
markfinalized(gco2ud(o)); markfinalized(o);
*p = o->gch.nextgc; *p = o->gch.nextgc;
if (gcref(g->gc.mmudata)) { /* Link to end of mmudata list. */ if (gcref(g->gc.mmudata)) { /* Link to end of mmudata list. */
GCobj *root = gcref(g->gc.mmudata); GCobj *root = gcref(g->gc.mmudata);

1
src/lj_gc.h
View File

@ -43,6 +43,7 @@ enum {
#define flipwhite(x) ((x)->gch.marked ^= LJ_GC_WHITES) #define flipwhite(x) ((x)->gch.marked ^= LJ_GC_WHITES)
#define black2gray(x) ((x)->gch.marked &= (uint8_t)~LJ_GC_BLACK) #define black2gray(x) ((x)->gch.marked &= (uint8_t)~LJ_GC_BLACK)
#define fixstring(s) ((s)->marked |= LJ_GC_FIXED) #define fixstring(s) ((s)->marked |= LJ_GC_FIXED)
#define markfinalized(x) ((x)->gch.marked |= LJ_GC_FINALIZED)
/* Collector. */ /* Collector. */
LJ_FUNC size_t lj_gc_separateudata(global_State *g, int all); LJ_FUNC size_t lj_gc_separateudata(global_State *g, int all);