[svn:parrot] r49636 - in branches/generational_gc/src: . gc string

[bacek at svn.parrot.org]

Author: bacek
Date: Sat Oct 23 05:07:09 2010
New Revision: 49636
URL: https://trac.parrot.org/parrot/changeset/49636

Log:
Remove reference to PObj_generation_2_FLAG. It's not used anymore

Modified:
   branches/generational_gc/src/gc/gc_ms2.c
   branches/generational_gc/src/pmc.c
   branches/generational_gc/src/string/api.c

Modified: branches/generational_gc/src/gc/gc_ms2.c
==============================================================================
--- branches/generational_gc/src/gc/gc_ms2.c	Sat Oct 23 05:06:34 2010	(r49635)
+++ branches/generational_gc/src/gc/gc_ms2.c	Sat Oct 23 05:07:09 2010	(r49636)
@@ -862,11 +862,6 @@
         while (tmp) {
             PMC *pmc = LLH2Obj_typed(tmp, PMC);
 
-            /* Flag this object as already processed */
-            /* Otherwise we will pull it again if it's referenced */
-            /* by some other project further in list */
-            pmc->flags |= PObj_GC_generation_2_FLAG;
-
             /* mark can append more objects to this list */
             if (PObj_custom_mark_TEST(pmc))
                 VTABLE_mark(interp, pmc);
@@ -884,6 +879,7 @@
 
     gc_ms2_check_sanity(interp);
 
+#if 0
     // DEBUG ONLY. Simple recursive check
     interp->gc_sys->mark_pmc_header = gc_ms2_pmc_validate;
     interp->gc_sys->mark_str_header = gc_ms2_string_validate;
@@ -898,6 +894,8 @@
             tmp = tmp->next;
         }
 
+        tmp = self->objects[i]->first;
+
         /* We are "marking" this generation */
         self->current_generation = i;
 
@@ -918,7 +916,7 @@
 
     interp->gc_sys->mark_str_header = gc_ms2_mark_string_header;
     interp->gc_sys->mark_pmc_header = gc_ms2_mark_pmc_header;
-
+#endif
 }
 
 /*
@@ -1606,9 +1604,7 @@
         if (PObj_live_TEST(obj)) {
             /* Paint live objects white */
             PObj_live_CLEAR(obj);
-
-            obj->flags &= ~PObj_GC_generation_2_FLAG
-                          | ~PObj_GC_wb_triggered_FLAG;
+            obj->flags &= ~PObj_GC_wb_triggered_FLAG;
         }
         else if (!PObj_constant_TEST(obj)) {
             callback(interp, obj);
@@ -2060,8 +2056,7 @@
 {
     ASSERT_ARGS(gc_ms2_set_gen_flags)
     obj->flags &= ~(PObj_GC_generation_0_FLAG
-        | PObj_GC_generation_1_FLAG
-        | PObj_GC_generation_2_FLAG);
+        | PObj_GC_generation_1_FLAG);
     obj->flags |= gen2flags(gen);
 }
 

Modified: branches/generational_gc/src/pmc.c
==============================================================================
--- branches/generational_gc/src/pmc.c	Sat Oct 23 05:06:34 2010	(r49635)
+++ branches/generational_gc/src/pmc.c	Sat Oct 23 05:07:09 2010	(r49636)
@@ -267,7 +267,6 @@
         PObj_flags_SETTO(pmc, PObj_is_PMC_FLAG
             | pmc->flags & PObj_GC_generation_0_FLAG
             | pmc->flags & PObj_GC_generation_1_FLAG
-            | pmc->flags & PObj_GC_generation_2_FLAG
             | pmc->flags & PObj_GC_wb_triggered_FLAG
             | pmc->flags & b_PObj_live_FLAG);
         // HACK!!!

Modified: branches/generational_gc/src/string/api.c
==============================================================================
--- branches/generational_gc/src/string/api.c	Sat Oct 23 05:06:34 2010	(r49635)
+++ branches/generational_gc/src/string/api.c	Sat Oct 23 05:07:09 2010	(r49636)
@@ -381,8 +381,7 @@
     // Basically if we are copying string from older generation
     // we have to clear flags about it.
     d->flags &= ~PObj_GC_generation_0_FLAG
-                & ~PObj_GC_generation_1_FLAG
-                & ~PObj_GC_generation_2_FLAG;
+                & ~PObj_GC_generation_1_FLAG;
 
     /* Clear live flag. It might be set on constant strings */
     PObj_live_CLEAR(d);