[svn:parrot] r43677 - in branches/pmc_freeze_with_pmcs: include/parrot src src/pmc

darbelo at svn.parrot.org darbelo at svn.parrot.org
Mon Feb 1 05:07:33 UTC 2010


Author: darbelo
Date: Mon Feb  1 05:07:31 2010
New Revision: 43677
URL: https://trac.parrot.org/parrot/changeset/43677

Log:
Do a lot of visit_info* -> PMC* substitutions.

Modified:
   branches/pmc_freeze_with_pmcs/include/parrot/list.h
   branches/pmc_freeze_with_pmcs/src/hash.c
   branches/pmc_freeze_with_pmcs/src/list.c
   branches/pmc_freeze_with_pmcs/src/pmc/array.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/class.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/default.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/eval.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/fixedbooleanarray.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/fixedintegerarray.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/fixedpmcarray.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/fixedstringarray.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/float.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/hash.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/imageio.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/integer.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/key.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/lexinfo.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/object.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/orderedhash.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/parrotinterpreter.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/resizablebooleanarray.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/resizableintegerarray.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/scheduler.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/schedulermessage.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/string.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/sub.pmc
   branches/pmc_freeze_with_pmcs/src/pmc/task.pmc
   branches/pmc_freeze_with_pmcs/src/vtable.tbl

Modified: branches/pmc_freeze_with_pmcs/include/parrot/list.h
==============================================================================
--- branches/pmc_freeze_with_pmcs/include/parrot/list.h	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/include/parrot/list.h	Mon Feb  1 05:07:31 2010	(r43677)
@@ -220,7 +220,7 @@
 PARROT_EXPORT
 void Parrot_pmc_array_visit(PARROT_INTERP,
     ARGIN(List *list),
-    ARGMOD(visit_info *info))
+    ARGMOD(PMC *info))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)

Modified: branches/pmc_freeze_with_pmcs/src/hash.c
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/hash.c	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/hash.c	Mon Feb  1 05:07:31 2010	(r43677)
@@ -55,7 +55,7 @@
 
 static void hash_freeze(PARROT_INTERP,
     ARGIN(const Hash * const hash),
-    ARGMOD(visit_info *info))
+    ARGMOD(PMC *info))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -63,7 +63,7 @@
 
 static void hash_thaw(PARROT_INTERP,
     ARGMOD(Hash *hash),
-    ARGMOD(visit_info *info))
+    ARGMOD(PMC *info))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -541,7 +541,7 @@
 
 /*
 
-=item C<static void hash_thaw(PARROT_INTERP, Hash *hash, visit_info *info)>
+=item C<static void hash_thaw(PARROT_INTERP, Hash *hash, PMC *info)>
 
 Visits the contents of a hash during freeze/thaw.
 
@@ -552,7 +552,7 @@
 */
 
 static void
-hash_thaw(PARROT_INTERP, ARGMOD(Hash *hash), ARGMOD(visit_info *info))
+hash_thaw(PARROT_INTERP, ARGMOD(Hash *hash), ARGMOD(PMC *info))
 {
     ASSERT_ARGS(hash_thaw)
 
@@ -609,7 +609,7 @@
 /*
 
 =item C<static void hash_freeze(PARROT_INTERP, const Hash * const hash,
-visit_info *info)>
+PMC *info)>
 
 Freezes hash into a string.
 
@@ -623,7 +623,7 @@
 */
 
 static void
-hash_freeze(PARROT_INTERP, ARGIN(const Hash * const hash), ARGMOD(visit_info *info))
+hash_freeze(PARROT_INTERP, ARGIN(const Hash * const hash), ARGMOD(PMC *info))
 {
     ASSERT_ARGS(hash_freeze)
     size_t           i;
@@ -677,7 +677,7 @@
 parrot_hash_visit(PARROT_INTERP, ARGMOD(Hash *hash), ARGMOD(void *pinfo))
 {
     ASSERT_ARGS(parrot_hash_visit)
-    visit_info* const info = (visit_info*) pinfo;
+    PMC* const info = (PMC*) pinfo;
 
     switch (VTABLE_get_integer(interp, info)) {
       case VISIT_THAW_NORMAL:

Modified: branches/pmc_freeze_with_pmcs/src/list.c
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/list.c	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/list.c	Mon Feb  1 05:07:31 2010	(r43677)
@@ -1648,7 +1648,7 @@
 
 PARROT_EXPORT
 void
-Parrot_pmc_array_visit(PARROT_INTERP, ARGIN(List *list), ARGMOD(visit_info *info))
+Parrot_pmc_array_visit(PARROT_INTERP, ARGIN(List *list), ARGMOD(PMC *info))
 {
     ASSERT_ARGS(Parrot_pmc_array_visit)
     List_chunk        *chunk;

Modified: branches/pmc_freeze_with_pmcs/src/pmc/array.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/array.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/array.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -1158,7 +1158,7 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the array.
 
@@ -1168,14 +1168,14 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         Parrot_pmc_array_visit(INTERP, (List *)PMC_data(SELF), info);
         SUPER(info);
     }
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the array.
 
@@ -1183,14 +1183,14 @@
 
 */
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         SUPER(info);
         VTABLE_push_integer(INTERP, info, VTABLE_elements(INTERP, SELF));
     }
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the array.
 
@@ -1198,7 +1198,7 @@
 
 */
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         SUPER(info);
         SELF.set_integer_native(VTABLE_shift_integer(INTERP, info));
     }

Modified: branches/pmc_freeze_with_pmcs/src/pmc/class.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/class.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/class.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -1421,7 +1421,7 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the class.
 
@@ -1431,7 +1431,7 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         /* 1) visit the attribute description hash */
         VISIT_PMC_ATTR(INTERP, info, SELF, Class, attrib_metadata);
 
@@ -1453,7 +1453,7 @@
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the class.
 
@@ -1461,7 +1461,7 @@
 
 */
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         Parrot_Class_attributes * const class_data = PARROT_CLASS(SELF);
         STRING       *serial_namespace = CONST_STRING(interp, "");
 
@@ -1483,7 +1483,7 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the class.
 
@@ -1491,7 +1491,7 @@
 
 */
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         /* The class might already exist in the interpreter, so create it as an
          * anonymous class and later decide whether to link it into the
          * namespace.  */
@@ -1549,7 +1549,7 @@
 
 /*
 
-=item C<void thawfinish(visit_info *info)>
+=item C<void thawfinish(PMC *info)>
 
 Called after the class has been thawed.
 
@@ -1557,7 +1557,7 @@
 
 */
 
-    VTABLE void thawfinish(visit_info *info) {
+    VTABLE void thawfinish(PMC *info) {
         Parrot_Class_attributes * const _class = PARROT_CLASS(SELF);
         UNUSED(info)
 

Modified: branches/pmc_freeze_with_pmcs/src/pmc/default.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/default.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/default.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -1043,7 +1043,7 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 Used by GC to mark the PMC.
 
@@ -1051,7 +1051,7 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
     }
 
 /*
@@ -1070,7 +1070,7 @@
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Does nothing.
 
@@ -1078,14 +1078,14 @@
 
 */
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         UNUSED(info)
         /* default - no action */
     }
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Initializes the PMC during unarchiving.
 
@@ -1093,14 +1093,14 @@
 
 */
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         /* default - initialize the PMC */
         SELF.init();
     }
 
 /*
 
-=item C<void thawfinish(visit_info *info)>
+=item C<void thawfinish(PMC *info)>
 
 Does nothing.
 
@@ -1108,7 +1108,7 @@
 
 */
 
-    VTABLE void thawfinish(visit_info *info) {
+    VTABLE void thawfinish(PMC *info) {
         UNUSED(info)
         /* default - no action */
     }

Modified: branches/pmc_freeze_with_pmcs/src/pmc/eval.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/eval.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/eval.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -320,11 +320,11 @@
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Archives the evaled code
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Unarchives the code.
 
@@ -332,14 +332,14 @@
 
 */
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         STRING   *packed = SELF.get_string();
         VTABLE_push_string(INTERP, info, packed);
 
         SUPER(info);
     }
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         STRING           *packed = VTABLE_shift_string(INTERP, info);
         PackFile         *pf;
         PackFile_Segment *seg;

Modified: branches/pmc_freeze_with_pmcs/src/pmc/fixedbooleanarray.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/fixedbooleanarray.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/fixedbooleanarray.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -506,14 +506,14 @@
 
 =over 4
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the string.
 
 =cut
 
 */
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         UINTVAL          size, resize_threshold;
         unsigned char  * bit_array;
         STRING   *       s;
@@ -530,14 +530,14 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the string.
 
 =cut
 
 */
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         SUPER(info);
 
         {

Modified: branches/pmc_freeze_with_pmcs/src/pmc/fixedintegerarray.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/fixedintegerarray.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/fixedintegerarray.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -537,17 +537,17 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the array.
 
 C<*info> is the visit info, (see F<include/parrot/pmc_freeze.h>).
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the array.
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the array.
 
@@ -555,11 +555,11 @@
 
 */
 
-    /*VTABLE void visit(visit_info *info) {
+    /*VTABLE void visit(PMC *info) {
         SUPER(info);
     }*/
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         INTVAL   *int_array;
         INTVAL    i, n;
 
@@ -573,7 +573,7 @@
             VTABLE_push_integer(INTERP, info, int_array[i]);
     }
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         INTVAL n;
 
         SUPER(info);

Modified: branches/pmc_freeze_with_pmcs/src/pmc/fixedpmcarray.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/fixedpmcarray.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/fixedpmcarray.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -690,17 +690,17 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the array.
 
 C<*info> is the visit info, (see F<include/parrot/pmc_freeze.h>).
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the array.
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the array.
 
@@ -708,7 +708,7 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         INTVAL  i;
         const INTVAL n = VTABLE_elements(INTERP, SELF);
         PMC   **pos    = PMC_array(SELF);
@@ -721,12 +721,12 @@
         SUPER(info);
     }
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         SUPER(info);
         VTABLE_push_integer(INTERP, info, VTABLE_elements(INTERP, SELF));
     }
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         SUPER(info);
         SELF.set_integer_native(VTABLE_shift_integer(INTERP, info));
     }

Modified: branches/pmc_freeze_with_pmcs/src/pmc/fixedstringarray.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/fixedstringarray.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/fixedstringarray.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -559,14 +559,14 @@
 
 =over 4
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the string.
 
 =cut
 
 */
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         STRING           **str_array;
         UINTVAL            size, i;
 
@@ -580,14 +580,14 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the string.
 
 =cut
 
 */
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         UINTVAL  i, size;
         STRING **str_array;
 

Modified: branches/pmc_freeze_with_pmcs/src/pmc/float.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/float.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/float.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -344,28 +344,28 @@
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the number.
 
 =cut
 
 */
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         SUPER(info);
         VTABLE_push_float(INTERP, info, SELF.get_number());
     }
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the number.
 
 =cut
 
 */
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         SUPER(info);
         SET_ATTR_fv(INTERP, SELF, VTABLE_shift_float(INTERP, info));
     }

Modified: branches/pmc_freeze_with_pmcs/src/pmc/hash.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/hash.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/hash.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -1078,7 +1078,7 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 Used during archiving to visit the elements in the hash.
 
@@ -1086,14 +1086,14 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         parrot_hash_visit(INTERP, (Hash *)SELF.get_pointer(), info);
         SUPER(info);
     }
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the hash.
 
@@ -1101,7 +1101,7 @@
 
 */
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         Hash     * const hash = (Hash *)SELF.get_pointer();;
 
         SUPER(info);
@@ -1112,7 +1112,7 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the hash.
 
@@ -1120,7 +1120,7 @@
 
 */
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         SUPER(info);
 
         {

Modified: branches/pmc_freeze_with_pmcs/src/pmc/imageio.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/imageio.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/imageio.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -509,9 +509,9 @@
 
 /*
 
-=item C<static PMC *shift_opcode_pmc(PARROT_INTERP, visit_info *io)>
+=item C<static PMC *shift_pmc()>
 
-Removes and returns a reference to a pmc from the start of the C<*io> "stream".
+Removes and returns a reference to a pmc from the start of the image.
 
 =cut
 

Modified: branches/pmc_freeze_with_pmcs/src/pmc/integer.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/integer.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/integer.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -1304,14 +1304,14 @@
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the integer.
 
 =cut
 
 */
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         SUPER(info);
         VTABLE_push_integer(INTERP, info, SELF.get_integer());
     }
@@ -1319,14 +1319,14 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the integer.
 
 =cut
 
 */
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         SUPER(info);
         SELF.set_integer_native(VTABLE_shift_integer(INTERP, info));
     }

Modified: branches/pmc_freeze_with_pmcs/src/pmc/key.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/key.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/key.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -283,19 +283,19 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the Key.
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Archives the Key.
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Unarchives the Key.
 
-=item C<void thawfinish(visit_info *info)>
+=item C<void thawfinish(PMC *info)>
 
 Called after the Key has been thawed: convert last PMC_NULL key to NULL.
 
@@ -303,7 +303,7 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         /* Sometimes visit gets an uninitialized Key.  Initialize it. */
         if (!PMC_data(SELF))
             SELF.init();
@@ -311,7 +311,7 @@
         VISIT_PMC_ATTR(INTERP, info, SELF, Key, next_key);
     }
 
-    void freeze(visit_info *info) {
+    void freeze(PMC *info) {
         /* write flags */
         const INTVAL flags  = (PObj_get_FLAGS(SELF) & KEY_type_FLAGS);
 
@@ -340,7 +340,7 @@
         }
     }
 
-    void thaw(visit_info *info) {
+    void thaw(PMC *info) {
         const INTVAL flags  = VTABLE_shift_integer(INTERP, info) & KEY_type_FLAGS;
 
         PObj_get_FLAGS(SELF) |= flags;
@@ -367,7 +367,7 @@
         }
     }
 
-    VTABLE void thawfinish(visit_info *info) {
+    VTABLE void thawfinish(PMC *info) {
         PMC *key = SELF;
         UNUSED(info)
 

Modified: branches/pmc_freeze_with_pmcs/src/pmc/lexinfo.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/lexinfo.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/lexinfo.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -125,11 +125,11 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Freeze/thaw interface used during freeze/thaw of the Sub PMC.
 The implementation of the Hash PMC is called.
@@ -139,7 +139,7 @@
 */
 
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         const INTVAL elems  = VTABLE_shift_integer(INTERP, info);
         const INTVAL k_type = VTABLE_shift_integer(INTERP, info);
         const INTVAL v_type = VTABLE_shift_integer(INTERP, info);

Modified: branches/pmc_freeze_with_pmcs/src/pmc/object.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/object.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/object.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -725,7 +725,7 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the object.
 
@@ -735,13 +735,13 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         Parrot_Object_attributes * const obj_data = PARROT_OBJECT(SELF);
         PMC **pos;
 
         /* 1) visit class */
         pos            = &obj_data->_class;
-        info->thaw_ptr = pos;
+        VTABLEpos;
         (info->visit_pmc_now)(INTERP, *pos, info);
 
         /* 2) visit the attributes */
@@ -752,7 +752,7 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the object.
 
@@ -760,13 +760,13 @@
 
 */
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         return;
     }
 
 /*
 
-=item C<void thawfinish(visit_info *info)>
+=item C<void thawfinish(PMC *info)>
 
 Called after the object has been thawed.
 
@@ -774,7 +774,7 @@
 
 */
 
-    VTABLE void thawfinish(visit_info *info) {
+    VTABLE void thawfinish(PMC *info) {
         /* Set custom GC mark and destroy on the object. */
         PObj_custom_mark_SET(SELF);
         PObj_custom_destroy_SET(SELF);

Modified: branches/pmc_freeze_with_pmcs/src/pmc/orderedhash.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/orderedhash.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/orderedhash.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -726,15 +726,15 @@
     }
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 Used during archiving to visit the elements in the hash.
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the hash.
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the hash.
 
@@ -742,12 +742,12 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         VISIT_PMC_ATTR(INTERP, info, SELF, OrderedHash, hash);
         SUPER(info);
     }
 
-    VTABLE void thawfinish(visit_info *info) {
+    VTABLE void thawfinish(PMC *info) {
         Parrot_OrderedHash_attributes *attrs = PARROT_ORDEREDHASH(SELF);
         find_bounds(INTERP, attrs->hash, &attrs->first, &attrs->last);
         SUPER(info);

Modified: branches/pmc_freeze_with_pmcs/src/pmc/parrotinterpreter.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/parrotinterpreter.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/parrotinterpreter.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -658,24 +658,24 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the interpreter.
 
 C<*info> is the visit info, (see F<include/parrot/pmc_freeze.h>).
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the interpreter. Actually not the whole interpreter is
 frozen but the state of the interpreter, which includes everything that
 has changes since creating an empty interpreter.
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the interpreter. This merges the changes into this
 interpreter instance.
 
-=item C<void thawfinish(visit_info *info)>
+=item C<void thawfinish(PMC *info)>
 
 Finish thawing.
 
@@ -683,7 +683,7 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         PMC **pos;
         /*
          * the information frozen here is part of all PBCs
@@ -719,7 +719,7 @@
         (info->visit_pmc_now)(INTERP, *pos, info);
     }
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         if (!PMC_data(SELF)) {
             Parrot_ParrotInterpreter_attributes *attrs =
                 mem_allocate_zeroed_typed(Parrot_ParrotInterpreter_attributes);
@@ -730,7 +730,7 @@
         PMC_interp(SELF) = INTERP;
     }
 
-    VTABLE void thawfinish(visit_info *info) {
+    VTABLE void thawfinish(PMC *info) {
         PMC * const new_info = PMC_args(SELF);
         const INTVAL  m      = VTABLE_elements(INTERP, new_info);
         INTVAL  i;
@@ -845,5 +845,3 @@
  * End:
  * vim: expandtab shiftwidth=4:
  */
-
-

Modified: branches/pmc_freeze_with_pmcs/src/pmc/resizablebooleanarray.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/resizablebooleanarray.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/resizablebooleanarray.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -404,14 +404,14 @@
 
 =over 4
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the string.
 
 =cut
 
 */
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         /* XXX Dino - I'm concerned about freezing the entire
             allocated block of memory, it's dependent on the
             BITS_PER_CHAR value.
@@ -438,14 +438,14 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the string.
 
 =cut
 
 */
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         unsigned char   *bit_array;
         const UINTVAL    head_pos = VTABLE_shift_integer(INTERP, info);
         const UINTVAL    tail_pos = VTABLE_shift_integer(INTERP, info);

Modified: branches/pmc_freeze_with_pmcs/src/pmc/resizableintegerarray.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/resizableintegerarray.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/resizableintegerarray.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -279,11 +279,11 @@
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the array.
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the array.
 
@@ -291,7 +291,7 @@
 
 */
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         INTVAL   *int_array;
         INTVAL    i, n, rt;
 
@@ -308,7 +308,7 @@
             VTABLE_push_integer(INTERP, info, int_array[i]);
     }
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         const INTVAL n = VTABLE_shift_integer(INTERP, info);
         const INTVAL rt = VTABLE_shift_integer(INTERP, info);
 

Modified: branches/pmc_freeze_with_pmcs/src/pmc/scheduler.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/scheduler.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/scheduler.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -277,7 +277,7 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 Visits the contents of the scheduler (used by freeze/thaw).
 
@@ -287,7 +287,7 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         /* 1) visit task list */
         VISIT_PMC_ATTR(INTERP, info, SELF, Scheduler, task_list);
 
@@ -298,7 +298,7 @@
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Archives the scheduler.
 
@@ -306,7 +306,7 @@
 
 */
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         Parrot_Scheduler_attributes * const core_struct = PARROT_SCHEDULER(SELF);
 
         /* 1) freeze scheduler id */
@@ -319,7 +319,7 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Unarchives the scheduler.
 
@@ -327,7 +327,7 @@
 
 */
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         /* 1. thaw scheduler id */
         const INTVAL id = VTABLE_shift_integer(INTERP, info);
 
@@ -347,7 +347,7 @@
 
 /*
 
-=item C<void thawfinish(visit_info *info)>
+=item C<void thawfinish(PMC *info)>
 
 Finishes thawing the scheduler.
 
@@ -355,7 +355,7 @@
 
 */
 
-    VTABLE void thawfinish(visit_info *info) {
+    VTABLE void thawfinish(PMC *info) {
         Parrot_cx_refresh_task_list(INTERP, SELF);
     }
 

Modified: branches/pmc_freeze_with_pmcs/src/pmc/schedulermessage.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/schedulermessage.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/schedulermessage.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -206,7 +206,7 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the scheduler message.
 
@@ -216,7 +216,7 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         Parrot_SchedulerMessage_attributes * const core_struct =
             PARROT_SCHEDULERMESSAGE(SELF);
         PMC **pos;
@@ -229,7 +229,7 @@
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the scheduler message.
 
@@ -237,7 +237,7 @@
 
 */
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         Parrot_SchedulerMessage_attributes * const core_struct =
             PARROT_SCHEDULERMESSAGE(SELF);
 
@@ -250,7 +250,7 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the scheduler message.
 
@@ -258,7 +258,7 @@
 
 */
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         /* 1. thaw message id */
         const INTVAL id = VTABLE_shift_integer(INTERP, info);
 

Modified: branches/pmc_freeze_with_pmcs/src/pmc/string.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/string.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/string.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -778,28 +778,28 @@
 
 =over 4
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the string.
 
 =cut
 
 */
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         SUPER(info);
         VTABLE_push_string(INTERP, info, VTABLE_get_string(INTERP, SELF));
     }
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the string.
 
 =cut
 
 */
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         SUPER(info);
         SET_ATTR_str_val(INTERP, SELF, VTABLE_shift_string(INTERP, info));
     }

Modified: branches/pmc_freeze_with_pmcs/src/pmc/sub.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/sub.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/sub.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -619,11 +619,11 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the sub.
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Archives the subroutine.
 
@@ -631,7 +631,7 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         VISIT_PMC_ATTR(INTERP, info, SELF, Sub, namespace_name);
 
         VISIT_PMC_ATTR(INTERP, info, SELF, Sub, multi_signature);
@@ -651,7 +651,7 @@
         SUPER(info);
     }
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         Parrot_Sub_attributes *sub;
         STRING                *hll_name;
         int i;
@@ -709,7 +709,7 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Unarchives the subroutine.
 
@@ -717,7 +717,7 @@
 
 */
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         Parrot_Sub_attributes *sub;
         INTVAL flags;
         int    i;

Modified: branches/pmc_freeze_with_pmcs/src/pmc/task.pmc
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/pmc/task.pmc	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/pmc/task.pmc	Mon Feb  1 05:07:31 2010	(r43677)
@@ -385,7 +385,7 @@
 
 /*
 
-=item C<void visit(visit_info *info)>
+=item C<void visit(PMC *info)>
 
 This is used by freeze/thaw to visit the contents of the task.
 
@@ -395,14 +395,14 @@
 
 */
 
-    VTABLE void visit(visit_info *info) {
+    VTABLE void visit(PMC *info) {
         /* 1) visit code block */
         VISIT_PMC_ATTR(INTERP, info, SELF, Task, codeblock);
     }
 
 /*
 
-=item C<void freeze(visit_info *info)>
+=item C<void freeze(PMC *info)>
 
 Used to archive the task.
 
@@ -410,7 +410,7 @@
 
 */
 
-    VTABLE void freeze(visit_info *info) {
+    VTABLE void freeze(PMC *info) {
         const Parrot_Task_attributes * const core_struct = PARROT_TASK(SELF);
 
         /* 1) freeze task id */
@@ -434,7 +434,7 @@
 
 /*
 
-=item C<void thaw(visit_info *info)>
+=item C<void thaw(PMC *info)>
 
 Used to unarchive the task.
 
@@ -442,7 +442,7 @@
 
 */
 
-    VTABLE void thaw(visit_info *info) {
+    VTABLE void thaw(PMC *info) {
         /* 1. thaw task id */
         const INTVAL id = VTABLE_shift_integer(INTERP, info);
 
@@ -486,7 +486,7 @@
 
 /*
 
-=item C<void thawfinish(visit_info *info)>
+=item C<void thawfinish(PMC *info)>
 
 Called after the task has been thawed.
 
@@ -494,7 +494,7 @@
 
 */
 
-    VTABLE void thawfinish(visit_info *info) {
+    VTABLE void thawfinish(PMC *info) {
         Parrot_Task_attributes * core_struct = PARROT_TASK(SELF);
 
         UNUSED(core_struct); /* TODO: Rebuild the task index. */

Modified: branches/pmc_freeze_with_pmcs/src/vtable.tbl
==============================================================================
--- branches/pmc_freeze_with_pmcs/src/vtable.tbl	Mon Feb  1 01:40:53 2010	(r43676)
+++ branches/pmc_freeze_with_pmcs/src/vtable.tbl	Mon Feb  1 05:07:31 2010	(r43677)
@@ -348,10 +348,10 @@
 PMC* inspect()
 PMC* inspect_str(STRING* what)
 
-void freeze(visit_info* info)
-void thaw  (visit_info* info) :write
-void thawfinish (visit_info* info) :write
-void visit (visit_info* info)
+void freeze(PMC* info)
+void thaw  (PMC* info) :write
+void thawfinish (PMC* info) :write
+void visit (PMC* info)
 
 void share()
 


More information about the parrot-commits mailing list