Author: heimdall
Date: Mon Aug 8 13:04:12 2005
New Revision: 8873
Modified:
branches/gmc/include/parrot/headers.h
branches/gmc/include/parrot/resources.h
branches/gmc/src/gc_gmc.c
branches/gmc/src/headers.c
branches/gmc/src/smallobject.c
Log:
We don't want a pmc_body_pool after all, so this is only a revert of previous
patches to remove it...
Modified: branches/gmc/include/parrot/headers.h
==============================================================================
--- branches/gmc/include/parrot/headers.h (original)
+++ branches/gmc/include/parrot/headers.h Mon Aug 8 13:04:12 2005
@@ -47,7 +47,6 @@ int is_buffer_ptr(Interp *, void *);
int is_pmc_ptr(Interp *, void *);
void gc_pmc_ext_pool_init(Interp *, struct Small_Object_Pool *pool);
-void gc_pmc_body_pool_init(Interp *, struct Small_Object_Pool *pool);
/* pool iteration */
typedef enum {
Modified: branches/gmc/include/parrot/resources.h
==============================================================================
--- branches/gmc/include/parrot/resources.h (original)
+++ branches/gmc/include/parrot/resources.h Mon Aug 8 13:04:12 2005
@@ -57,9 +57,6 @@ struct Arenas {
struct Small_Object_Pool *string_header_pool;
struct Small_Object_Pool *pmc_pool;
struct Small_Object_Pool *pmc_ext_pool;
-#if PARROT_GC_GMC
- struct Small_Object_Pool *pmc_body_pool;
-#endif
struct Small_Object_Pool *constant_pmc_pool;
struct Small_Object_Pool *buffer_header_pool;
struct Small_Object_Pool *constant_string_header_pool;
Modified: branches/gmc/src/gc_gmc.c
==============================================================================
--- branches/gmc/src/gc_gmc.c (original)
+++ branches/gmc/src/gc_gmc.c Mon Aug 8 13:04:12 2005
@@ -59,7 +59,6 @@ gc_gmc_real_get_free_object(Interp *inte
struct Small_Object_Pool *pool)
{
void *ptr;
- struct Small_Object_Pool *body_pool = interpreter->arena_base->pmc_body_pool;
Gc_gmc *gc = pool->gc;
/* Is this the real test we want ? */
Modified: branches/gmc/src/headers.c
==============================================================================
--- branches/gmc/src/headers.c (original)
+++ branches/gmc/src/headers.c Mon Aug 8 13:04:12 2005
@@ -238,9 +238,9 @@ Get a header.
*/
-#if PARROT_GC_GMC
+/*#if PARROT_GC_GMC
static pmc_body * new_pmc_body(Parrot_Interp);
-#endif
+#endif*/
static PMC_EXT * new_pmc_ext(Parrot_Interp);
@@ -279,9 +279,9 @@ new_pmc_header(Interp *interpreter, UINT
#if ! PMC_DATA_IN_EXT
PMC_data(pmc) = NULL;
#endif
-#if PARROT_GC_GMC
+/*#if PARROT_GC_GMC
pmc->body = new_pmc_body(interpreter);
-#endif
+#endif*/
return pmc;
}
@@ -299,7 +299,6 @@ Basically same as new_pmc_ext.
=cut
-*/
static pmc_body *
new_pmc_body(Interp *interpreter)
@@ -310,7 +309,7 @@ new_pmc_body(Interp *interpreter)
ptr = pool->get_free_object (interpreter, pool);
memset(ptr, 0, sizeof(pmc_body));
return ptr;
-}
+}*/
#endif /* PARROT_GC_GMC */
@@ -629,12 +628,12 @@ Parrot_initialize_header_pools(Interp *i
gc_pmc_ext_pool_init(interpreter, arena_base->pmc_ext_pool);
arena_base->pmc_ext_pool->name = "pmc_ext";
-#if PARROT_GC_GMC
+/*#if PARROT_GC_GMC
arena_base->pmc_body_pool =
new_small_object_pool(interpreter, sizeof(pmc_body), 1024);
gc_pmc_body_pool_init(interpreter, arena_base->pmc_body_pool);
arena_base->pmc_body_pool->name = "pmc_body";
-#endif
+#endif*/
/* constant PMCs */
arena_base->constant_pmc_pool = new_pmc_pool(interpreter);
Modified: branches/gmc/src/smallobject.c
==============================================================================
--- branches/gmc/src/smallobject.c (original)
+++ branches/gmc/src/smallobject.c Mon Aug 8 13:04:12 2005
@@ -486,15 +486,6 @@ gc_ms_pool_init(Interp *interpreter, str
void* gc_gmc_get_free_object(Interp*, struct Small_Object_Pool*);
-void
-gc_pmc_body_pool_init(Interp *interpreter, struct Small_Object_Pool *pool)
-{
- pool->add_free_object = gc_ms_add_free_object;
- pool->get_free_object = gc_gmc_get_free_object;
- pool->alloc_objects = gc_ms_alloc_objects;
- pool->more_objects = gc_ms_alloc_objects;
-}
-
/* Workaround before the corresponding gmc functions are implemented.
* TODO: get our real functions ! */
