[svn:parrot] r41308 - trunk/src/gc
darbelo at svn.parrot.org
darbelo at svn.parrot.org
Wed Sep 16 20:55:28 UTC 2009
Author: darbelo
Date: Wed Sep 16 20:55:27 2009
New Revision: 41308
URL: https://trac.parrot.org/parrot/changeset/41308
Log:
Make codetest pass on trunk after the gc-refactor merge.
Modified:
trunk/src/gc/api.c
trunk/src/gc/gc_private.h
Modified: trunk/src/gc/api.c
==============================================================================
--- trunk/src/gc/api.c Wed Sep 16 19:50:04 2009 (r41307)
+++ trunk/src/gc/api.c Wed Sep 16 20:55:27 2009 (r41308)
@@ -1060,6 +1060,7 @@
sweep_cb_pmc(PARROT_INTERP, ARGMOD(Fixed_Size_Pool *pool),
SHIM(int flag), SHIM(void *arg))
{
+ ASSERT_ARGS(sweep_cb_pmc)
Parrot_gc_sweep_pool(interp, pool);
free_pool(pool);
return 0;
@@ -1082,6 +1083,7 @@
sweep_cb_buf(PARROT_INTERP, ARGMOD(Fixed_Size_Pool *pool), SHIM(int flag),
ARGIN(void *arg))
{
+ ASSERT_ARGS(sweep_cb_buf)
#ifdef GC_IS_MALLOC
const int pass = (int)(INTVAL)arg;
Modified: trunk/src/gc/gc_private.h
==============================================================================
--- trunk/src/gc/gc_private.h Wed Sep 16 19:50:04 2009 (r41307)
+++ trunk/src/gc/gc_private.h Wed Sep 16 20:55:27 2009 (r41308)
@@ -275,85 +275,6 @@
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
/* HEADERIZER END: src/gc/system.c */
-/* HEADERIZER BEGIN: src/gc/generational_ms.c */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-
-PARROT_EXPORT
-void Parrot_gc_gms_init(PARROT_INTERP)
- __attribute__nonnull__(1);
-
-PARROT_EXPORT
-void parrot_gc_gms_Parrot_gc_mark_PObj_alive(PARROT_INTERP,
- ARGMOD(PObj *obj))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- FUNC_MODIFIES(*obj);
-
-void parrot_gc_gms_wb(PARROT_INTERP,
- ARGIN(PMC *agg),
- ARGIN(void *old),
- ARGIN(void *_new))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3)
- __attribute__nonnull__(4);
-
-void parrot_gc_gms_wb_key(PARROT_INTERP,
- ARGIN(PMC *agg),
- ARGIN(void *old),
- ARGIN(void *old_key),
- ARGIN(void *_new),
- ARGIN(void *new_key))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3)
- __attribute__nonnull__(4)
- __attribute__nonnull__(5)
- __attribute__nonnull__(6);
-
-#define ASSERT_ARGS_Parrot_gc_gms_init __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_parrot_gc_gms_Parrot_gc_mark_PObj_alive \
- __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(obj)
-#define ASSERT_ARGS_parrot_gc_gms_wb __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(agg) \
- || PARROT_ASSERT_ARG(old) \
- || PARROT_ASSERT_ARG(_new)
-#define ASSERT_ARGS_parrot_gc_gms_wb_key __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(agg) \
- || PARROT_ASSERT_ARG(old) \
- || PARROT_ASSERT_ARG(old_key) \
- || PARROT_ASSERT_ARG(_new) \
- || PARROT_ASSERT_ARG(new_key)
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-/* HEADERIZER END: src/gc/generational_ms.c */
-
-/* HEADERIZER BEGIN: src/gc/incremental_ms.c */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-
-void Parrot_gc_ims_init(PARROT_INTERP)
- __attribute__nonnull__(1);
-
-void Parrot_gc_ims_wb(PARROT_INTERP, ARGMOD(PMC *agg), ARGMOD(PMC *_new))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3)
- FUNC_MODIFIES(*agg)
- FUNC_MODIFIES(*_new);
-
-#define ASSERT_ARGS_Parrot_gc_ims_init __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_gc_ims_wb __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(agg) \
- || PARROT_ASSERT_ARG(_new)
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-/* HEADERIZER END: src/gc/incremental_ms.c */
-
/* HEADERIZER BEGIN: src/gc/mark_sweep.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
@@ -598,83 +519,6 @@
/* HEADERIZER END: src/gc/alloc_resources.c */
/* GC subsystem init functions */
-/* HEADERIZER BEGIN: src/gc/generational_ms.c */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-
-PARROT_EXPORT
-void Parrot_gc_gms_init(PARROT_INTERP)
- __attribute__nonnull__(1);
-
-PARROT_EXPORT
-void parrot_gc_gms_Parrot_gc_mark_PObj_alive(PARROT_INTERP, ARGMOD(PObj *obj))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- FUNC_MODIFIES(*obj);
-
-void parrot_gc_gms_wb(PARROT_INTERP,
- ARGIN(PMC *agg),
- ARGIN(void *old),
- ARGIN(void *_new))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3)
- __attribute__nonnull__(4);
-
-void parrot_gc_gms_wb_key(PARROT_INTERP,
- ARGIN(PMC *agg),
- ARGIN(void *old),
- ARGIN(void *old_key),
- ARGIN(void *_new),
- ARGIN(void *new_key))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3)
- __attribute__nonnull__(4)
- __attribute__nonnull__(5)
- __attribute__nonnull__(6);
-
-#define ASSERT_ARGS_Parrot_gc_gms_init __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_parrot_gc_gms_Parrot_gc_mark_PObj_alive __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(obj)
-#define ASSERT_ARGS_parrot_gc_gms_wb __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(agg) \
- || PARROT_ASSERT_ARG(old) \
- || PARROT_ASSERT_ARG(_new)
-#define ASSERT_ARGS_parrot_gc_gms_wb_key __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(agg) \
- || PARROT_ASSERT_ARG(old) \
- || PARROT_ASSERT_ARG(old_key) \
- || PARROT_ASSERT_ARG(_new) \
- || PARROT_ASSERT_ARG(new_key)
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-/* HEADERIZER END: src/gc/generational_ms.c */
-
-/* HEADERIZER BEGIN: src/gc/incremental_ms.c */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-
-void Parrot_gc_ims_init(PARROT_INTERP)
- __attribute__nonnull__(1);
-
-void Parrot_gc_ims_wb(PARROT_INTERP, ARGMOD(PMC *agg), ARGMOD(PMC *_new))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3)
- FUNC_MODIFIES(*agg)
- FUNC_MODIFIES(*_new);
-
-#define ASSERT_ARGS_Parrot_gc_ims_init __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_gc_ims_wb __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(agg) \
- || PARROT_ASSERT_ARG(_new)
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-/* HEADERIZER END: src/gc/incremental_ms.c */
-
/* HEADERIZER BEGIN: src/gc/gc_ms.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
More information about the parrot-commits
mailing list