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

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Sat Oct 23 23:33:46 2010
New Revision: 49639
URL: https://trac.parrot.org/parrot/changeset/49639

Log:
Reverting r49638 per cotto's comment on IRC.

Modified:
   branches/generational_gc/src/gc/gc_ms2.c
   branches/generational_gc/src/pmc.c
   branches/generational_gc/src/pmc/default.pmc
   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 16:54:01 2010	(r49638)
+++ branches/generational_gc/src/gc/gc_ms2.c	Sat Oct 23 23:33:46 2010	(r49639)
@@ -874,7 +874,7 @@
                               ? old_object_tails[i]
                               : self->objects[i]->first;
 
-        /* FIXME. Something wrong with updating tails. */
+        // FIXME. Something wrong with updating tails.
         tmp = self->objects[i]->first;
 
         /* We are "marking" this generation */
@@ -901,7 +901,7 @@
     gc_ms2_check_sanity(interp);
 
 #if 0
-    /* DEBUG ONLY. Simple recursive check */
+    // 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;
 

Modified: branches/generational_gc/src/pmc.c
==============================================================================
--- branches/generational_gc/src/pmc.c	Sat Oct 23 16:54:01 2010	(r49638)
+++ branches/generational_gc/src/pmc.c	Sat Oct 23 23:33:46 2010	(r49639)
@@ -262,15 +262,14 @@
         Parrot_pmc_destroy(interp, pmc);
 
         /* We can reuse PMC from older generation. Preserve it */
-        /* FIXME It's abstraction leak. And it's really strange idea
-        of reusing PMCs...
-        */
+        // FIXME It's abstraction leak. And it's really strange idea
+        // of reusing PMCs...
         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_wb_triggered_FLAG
             | pmc->flags & b_PObj_live_FLAG);
-        /* HACK!!! */
+        // HACK!!!
         if (pmc->flags & PObj_GC_wb_triggered_FLAG)
             PObj_live_SET(pmc);
 

Modified: branches/generational_gc/src/pmc/default.pmc
==============================================================================
--- branches/generational_gc/src/pmc/default.pmc	Sat Oct 23 16:54:01 2010	(r49638)
+++ branches/generational_gc/src/pmc/default.pmc	Sat Oct 23 23:33:46 2010	(r49639)
@@ -196,7 +196,7 @@
 {
     ASSERT_ARGS(check_set_std_props)
 
-    /* FIXME FIXME FIXME */
+    // FIXME FIXME FIXME
     /* We have to figure out all variants of vtables transitions */
     /* between normal, ro and wb variants */
     return 0;

Modified: branches/generational_gc/src/string/api.c
==============================================================================
--- branches/generational_gc/src/string/api.c	Sat Oct 23 16:54:01 2010	(r49638)
+++ branches/generational_gc/src/string/api.c	Sat Oct 23 23:33:46 2010	(r49639)
@@ -377,11 +377,9 @@
      * to do */
     STRUCT_COPY(d, s);
 
-    /*
-    HACK. FIXME. It's abstraction leak here from GC.
-    Basically if we are copying string from older generation
-    we have to clear flags about it.
-    */
+    // HACK. FIXME. It's abstraction leak here from GC.
+    // 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;