cvsuser 05/01/29 06:14:21
Modified: dynclasses pydict.pmc
include/parrot smallobject.h
src resources.c
Log:
GMS generational MS 4 - make pydict compile
Revision Changes Path
1.20 +7 -2 parrot/dynclasses/pydict.pmc
Index: pydict.pmc
===================================================================
RCS file: /cvs/public/parrot/dynclasses/pydict.pmc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pydict.pmc 12 Jan 2005 15:01:20 -0000 1.19
+++ pydict.pmc 29 Jan 2005 14:14:20 -0000 1.20
@@ -1,6 +1,6 @@
/*
Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-$Id: pydict.pmc,v 1.19 2005/01/12 15:01:20 rubys Exp $
+$Id: pydict.pmc,v 1.20 2005/01/29 14:14:20 leo Exp $
=head1 NAME
@@ -40,6 +40,11 @@
return VTABLE_hash(interpreter, (PMC*)value) ^ hash->seed;
}
+static void
+pobject_lives_fn(Interp *interp, PObj *o)
+{
+ pobject_lives(interp, o);
+}
/*
=item C<static int
@@ -96,7 +101,7 @@
Hash_key_type_none,
object_compare, /* object compare */
key_hash_object, /* object hash */
- pobject_lives); /* object mark */
+ pobject_lives_fn); /* object mark */
}
/*
1.20 +1 -1 parrot/include/parrot/smallobject.h
Index: smallobject.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/smallobject.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- smallobject.h 26 Jan 2005 17:13:51 -0000 1.19
+++ smallobject.h 29 Jan 2005 14:14:20 -0000 1.20
@@ -146,7 +146,7 @@
#if PARROT_GC_GMS
# define GC_HEADER_SIZE (sizeof(Gc_gms_hdr))
# define PObj_to_ARENA(o) PObj_to_GMSH(o)
-# define ARENA_to_PObj(p) GMSH_to_PObj(p)
+# define ARENA_to_PObj(p) GMSH_to_PObj((Gc_gms_hdr*)(p))
#else
# define GC_HEADER_SIZE 0
# define PObj_to_ARENA(o) (o)
1.133 +2 -2 parrot/src/resources.c
Index: resources.c
===================================================================
RCS file: /cvs/public/parrot/src/resources.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- resources.c 26 Jan 2005 17:13:52 -0000 1.132
+++ resources.c 29 Jan 2005 14:14:21 -0000 1.133
@@ -1,6 +1,6 @@
/*
Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-$Id: resources.c,v 1.132 2005/01/26 17:13:52 leo Exp $
+$Id: resources.c,v 1.133 2005/01/29 14:14:21 leo Exp $
=head1 NAME
@@ -140,7 +140,7 @@
* so that collection can be skipped if needed
*/
Parrot_do_dod_run(interpreter, DOD_trace_stack_FLAG);
-#if PARROT_GC_MS
+#if !PARROT_GC_IMS
/* Compact the pool if allowed and worthwhile */
if (pool->compact) {
/* don't bother reclaiming if it's just chicken feed */
