[svn:parrot] r40537 - in branches/pluggable_runcore: include/parrot src/runcore

[chromatic at svn.parrot.org]

Author: chromatic
Date: Fri Aug 14 00:15:27 2009
New Revision: 40537
URL: https://trac.parrot.org/parrot/changeset/40537

Log:
[pluggable_runcore] Fixed up profiling core first-time initialization,
including a call to the actual "Run profiling ops!" step.

Modified:
   branches/pluggable_runcore/include/parrot/runcore_api.h
   branches/pluggable_runcore/src/runcore/cores.c

Modified: branches/pluggable_runcore/include/parrot/runcore_api.h
==============================================================================
--- branches/pluggable_runcore/include/parrot/runcore_api.h	Fri Aug 14 00:10:29 2009	(r40536)
+++ branches/pluggable_runcore/include/parrot/runcore_api.h	Fri Aug 14 00:15:27 2009	(r40537)
@@ -189,11 +189,6 @@
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-PARROT_CAN_RETURN_NULL
-void * init_profiling_core(PARROT_INTERP, ARGIN(Parrot_runcore_t *runcore))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
-
 void load_prederef(PARROT_INTERP, ARGIN(Parrot_runcore_t *runcore))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
@@ -246,9 +241,6 @@
 #define ASSERT_ARGS_init_prederef __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(runcore)
-#define ASSERT_ARGS_init_profiling_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp) \
-    || PARROT_ASSERT_ARG(runcore)
 #define ASSERT_ARGS_load_prederef __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(runcore)

Modified: branches/pluggable_runcore/src/runcore/cores.c
==============================================================================
--- branches/pluggable_runcore/src/runcore/cores.c	Fri Aug 14 00:10:29 2009	(r40536)
+++ branches/pluggable_runcore/src/runcore/cores.c	Fri Aug 14 00:15:27 2009	(r40537)
@@ -272,6 +272,14 @@
 /* HEADERIZER BEGIN: static */
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 
+PARROT_CAN_RETURN_NULL
+static void * init_profiling_core(PARROT_INTERP,
+    ARGIN(Parrot_runcore_t *runcore),
+    ARGIN(opcode_t *pc))
+        __attribute__nonnull__(1)
+        __attribute__nonnull__(2)
+        __attribute__nonnull__(3);
+
 PARROT_WARN_UNUSED_RESULT
 PARROT_CAN_RETURN_NULL
 static opcode_t * runops_cgoto_core(PARROT_INTERP,
@@ -371,6 +379,10 @@
         __attribute__nonnull__(2)
         __attribute__nonnull__(3);
 
+#define ASSERT_ARGS_init_profiling_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(interp) \
+    || PARROT_ASSERT_ARG(runcore) \
+    || PARROT_ASSERT_ARG(pc)
 #define ASSERT_ARGS_runops_cgoto_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(runcore) \
@@ -1008,7 +1020,8 @@
 
 /*
 
-=item C<void * init_profiling_core(PARROT_INTERP, Parrot_runcore_t *runcore)>
+=item C<static void * init_profiling_core(PARROT_INTERP, Parrot_runcore_t
+*runcore, opcode_t *pc)>
 
 Perform initialization for the profiling runcore.
 
@@ -1017,14 +1030,14 @@
 */
 
 PARROT_CAN_RETURN_NULL
-void *
-init_profiling_core(PARROT_INTERP, ARGIN(Parrot_runcore_t *runcore))
+static void *
+init_profiling_core(PARROT_INTERP, ARGIN(Parrot_runcore_t *runcore), ARGIN(opcode_t *pc))
 {
     ASSERT_ARGS(init_profiling_core)
 
     runcore->runops           = runops_profiling_core;
 
-    return NULL;
+    return runops_profiling_core(interp, runcore, pc);
 }
 
 /*