slight gc changes

This commit is contained in:
hyunghwan.chung 2020-10-23 14:25:10 +00:00
parent 7a569fb192
commit 2ce8c35e0f
2 changed files with 7 additions and 7 deletions

View File

@ -846,20 +846,19 @@ static MOO_INLINE void gc_mark_root (moo_t* moo)
moo_oow_t i, gcfin_count; moo_oow_t i, gcfin_count;
moo_evtcb_t* cb; moo_evtcb_t* cb;
if (moo->active_context) if (moo->processor && moo->processor->active)
{ {
MOO_ASSERT (moo, (moo_oop_t)moo->processor != moo->_nil); MOO_ASSERT (moo, (moo_oop_t)moo->processor != moo->_nil);
MOO_ASSERT (moo, (moo_oop_t)moo->processor->active != moo->_nil); MOO_ASSERT (moo, (moo_oop_t)moo->processor->active != moo->_nil);
/* commit the stack pointer to the active process because /* commit the stack pointer to the active process because
* gc utilizes the stack pointer of a process object when marking */ * gc needs the correct stack pointer for a process object */
moo->processor->active->sp = MOO_SMOOI_TO_OOP(moo->sp); moo->processor->active->sp = MOO_SMOOI_TO_OOP(moo->sp);
}
#if 0 #if 0
moo->active_context->ip = MOO_SMOOI_TO_OOP(moo->ip); /* not needed but do it */ if (moo->active_context) moo->active_context->ip = MOO_SMOOI_TO_OOP(moo->ip); /* no need to commit the instruction pointer */
#endif #endif
}
gc_mark (moo, moo->_nil); gc_mark (moo, moo->_nil);
gc_mark (moo, moo->_true); gc_mark (moo, moo->_true);

View File

@ -34,7 +34,8 @@ void* moo_allocbytes (moo_t* moo, moo_oow_t size)
#endif #endif
#if defined(MOO_BUILD_DEBUG) #if defined(MOO_BUILD_DEBUG)
if ((moo->option.trait & MOO_TRAIT_DEBUG_GC) && !(moo->option.trait & MOO_TRAIT_NOGC)) moo_gc (moo); /* DEBUG_GC is set but NOGC is not set */
if ((moo->option.trait & (MOO_TRAIT_DEBUG_GC | MOO_TRAIT_NOGC)) == MOO_TRAIT_DEBUG_GC) moo_gc (moo);
#endif #endif
#if defined(MOO_ENABLE_GC_MARK_SWEEP) #if defined(MOO_ENABLE_GC_MARK_SWEEP)