[svn:parrot] r44369 - in trunk: include/parrot src/call src/runcore

[bacek at svn.parrot.org]

Author: bacek
Date: Tue Feb 23 07:05:03 2010
New Revision: 44369
URL: https://trac.parrot.org/parrot/changeset/44369

Log:
Replace more mem_sys_free with mem_gc_free

Modified:
   trunk/include/parrot/call.h
   trunk/src/call/ops.c
   trunk/src/runcore/profiling.c

Modified: trunk/include/parrot/call.h
==============================================================================
--- trunk/include/parrot/call.h	Tue Feb 23 05:19:04 2010	(r44368)
+++ trunk/include/parrot/call.h	Tue Feb 23 07:05:03 2010	(r44369)
@@ -139,8 +139,9 @@
 void destroy_runloop_jump_points(PARROT_INTERP)
         __attribute__nonnull__(1);
 
-void really_destroy_runloop_jump_points(
-    ARGIN_NULLOK(Parrot_runloop *jump_point));
+void really_destroy_runloop_jump_points(PARROT_INTERP,
+    ARGFREE(Parrot_runloop *jump_point))
+        __attribute__nonnull__(1);
 
 void runops(PARROT_INTERP, size_t offs)
         __attribute__nonnull__(1);
@@ -152,7 +153,8 @@
 #define ASSERT_ARGS_destroy_runloop_jump_points __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_really_destroy_runloop_jump_points \
-     __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_runops __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */

Modified: trunk/src/call/ops.c
==============================================================================
--- trunk/src/call/ops.c	Tue Feb 23 05:19:04 2010	(r44368)
+++ trunk/src/call/ops.c	Tue Feb 23 07:05:03 2010	(r44369)
@@ -184,13 +184,14 @@
 destroy_runloop_jump_points(PARROT_INTERP)
 {
     ASSERT_ARGS(destroy_runloop_jump_points)
-    really_destroy_runloop_jump_points(interp->current_runloop);
-    really_destroy_runloop_jump_points(interp->runloop_jmp_free_list);
+    really_destroy_runloop_jump_points(interp, interp->current_runloop);
+    really_destroy_runloop_jump_points(interp, interp->runloop_jmp_free_list);
 }
 
 /*
 
-=item C<void really_destroy_runloop_jump_points(Parrot_runloop *jump_point)>
+=item C<void really_destroy_runloop_jump_points(PARROT_INTERP, Parrot_runloop
+*jump_point)>
 
 Takes a pointer to a runloop jump point (which had better be the last one in
 the list). Walks back through the list, freeing the memory of each one, until
@@ -201,12 +202,13 @@
 */
 
 void
-really_destroy_runloop_jump_points(ARGIN_NULLOK(Parrot_runloop *jump_point))
+really_destroy_runloop_jump_points(PARROT_INTERP,
+        ARGFREE(Parrot_runloop *jump_point))
 {
     ASSERT_ARGS(really_destroy_runloop_jump_points)
     while (jump_point) {
         Parrot_runloop * const prev = jump_point->prev;
-        mem_sys_free(jump_point);
+        mem_gc_free(interp, jump_point);
         jump_point = prev;
     }
 }

Modified: trunk/src/runcore/profiling.c
==============================================================================
--- trunk/src/runcore/profiling.c	Tue Feb 23 05:19:04 2010	(r44368)
+++ trunk/src/runcore/profiling.c	Tue Feb 23 07:05:03 2010	(r44369)
@@ -613,7 +613,7 @@
 
     if (runcore->output_fn != record_values_none)
         fclose(runcore->profile_fd);
-    mem_sys_free(runcore->time);
+    mem_gc_free(interp, runcore->time);
 
     return NULL;
 }