[svn:parrot] r49234 - branches/gc_massacre/src/gc

[mikehh at svn.parrot.org]

Author: mikehh
Date: Wed Sep 22 04:41:51 2010
New Revision: 49234
URL: https://trac.parrot.org/parrot/changeset/49234

Log:
[gc_massacre] run make headerizer

Modified:
   branches/gc_massacre/src/gc/gc_ms2.c
   branches/gc_massacre/src/gc/gc_private.h

Modified: branches/gc_massacre/src/gc/gc_ms2.c
==============================================================================
--- branches/gc_massacre/src/gc/gc_ms2.c	Wed Sep 22 04:11:07 2010	(r49233)
+++ branches/gc_massacre/src/gc/gc_ms2.c	Wed Sep 22 04:41:51 2010	(r49234)
@@ -72,11 +72,6 @@
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-PARROT_MALLOC
-PARROT_CAN_RETURN_NULL
-static Buffer* gc_ms2_allocate_bufferlike_header(SHIM_INTERP,
-    SHIM(size_t size));
-
 PARROT_CAN_RETURN_NULL
 static void* gc_ms2_allocate_fixed_size_storage(PARROT_INTERP, size_t size)
         __attribute__nonnull__(1);
@@ -137,10 +132,6 @@
     SHIM(size_t size))
         __attribute__nonnull__(1);
 
-static void gc_ms2_free_bufferlike_header(SHIM_INTERP,
-    ARGFREE(Buffer *b),
-    SHIM(size_t size));
-
 static void gc_ms2_free_fixed_size_storage(PARROT_INTERP,
     size_t size,
     ARGMOD(void *data))
@@ -262,8 +253,6 @@
      __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(str))
-#define ASSERT_ARGS_gc_ms2_allocate_bufferlike_header \
-     __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
 #define ASSERT_ARGS_gc_ms2_allocate_fixed_size_storage \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
@@ -297,7 +286,6 @@
     , PARROT_ASSERT_ARG(list))
 #define ASSERT_ARGS_gc_ms2_free_buffer_header __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_gc_ms2_free_bufferlike_header __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
 #define ASSERT_ARGS_gc_ms2_free_fixed_size_storage \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \

Modified: branches/gc_massacre/src/gc/gc_private.h
==============================================================================
--- branches/gc_massacre/src/gc/gc_private.h	Wed Sep 22 04:11:07 2010	(r49233)
+++ branches/gc_massacre/src/gc/gc_private.h	Wed Sep 22 04:41:51 2010	(r49234)
@@ -402,11 +402,12 @@
         FUNC_MODIFIES(*pool)
         FUNC_MODIFIES(*arena);
 
-void Parrot_append_arena_in_pool(SHIM_INTERP,
+void Parrot_append_arena_in_pool(PARROT_INTERP,
     ARGMOD(Memory_Pools *mem_pools),
     ARGMOD(Fixed_Size_Pool *pool),
     ARGMOD(Fixed_Size_Arena *new_arena),
     size_t size)
+        __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
         __attribute__nonnull__(4)
@@ -458,7 +459,8 @@
        PARROT_ASSERT_ARG(pool) \
     , PARROT_ASSERT_ARG(arena))
 #define ASSERT_ARGS_Parrot_append_arena_in_pool __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(mem_pools) \
+       PARROT_ASSERT_ARG(interp) \
+    , PARROT_ASSERT_ARG(mem_pools) \
     , PARROT_ASSERT_ARG(pool) \
     , PARROT_ASSERT_ARG(new_arena))
 #define ASSERT_ARGS_Parrot_gc_clear_live_bits __attribute__unused__ int _ASSERT_ARGS_CHECK = (\