[svn:parrot] r46011 - in trunk: include/parrot src

[NotFound at svn.parrot.org]

Author: NotFound
Date: Sun Apr 25 12:57:35 2010
New Revision: 46011
URL: https://trac.parrot.org/parrot/changeset/46011

Log:
NULLOK pc in Parrot_debuuger_start, avoid an assertion failure. Required to handle reentering at runloop ends

Modified:
   trunk/include/parrot/debugger.h
   trunk/src/debug.c

Modified: trunk/include/parrot/debugger.h
==============================================================================
--- trunk/include/parrot/debugger.h	Sun Apr 25 12:17:42 2010	(r46010)
+++ trunk/include/parrot/debugger.h	Sun Apr 25 12:57:35 2010	(r46011)
@@ -200,9 +200,9 @@
         __attribute__nonnull__(1);
 
 PARROT_EXPORT
-void Parrot_debugger_start(PARROT_INTERP, ARGIN(opcode_t * cur_opcode))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
+void Parrot_debugger_start(PARROT_INTERP,
+    ARGIN_NULLOK(opcode_t * cur_opcode))
+        __attribute__nonnull__(1);
 
 PARROT_EXPORT
 void PDB_load_source(PARROT_INTERP, ARGIN(const char *command))
@@ -371,8 +371,7 @@
 #define ASSERT_ARGS_Parrot_debugger_load __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_debugger_start __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(cur_opcode))
+       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_PDB_load_source __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(command))

Modified: trunk/src/debug.c
==============================================================================
--- trunk/src/debug.c	Sun Apr 25 12:17:42 2010	(r46010)
+++ trunk/src/debug.c	Sun Apr 25 12:57:35 2010	(r46011)
@@ -863,7 +863,7 @@
 
 PARROT_EXPORT
 void
-Parrot_debugger_start(PARROT_INTERP, ARGIN(opcode_t * cur_opcode))
+Parrot_debugger_start(PARROT_INTERP, ARGIN_NULLOK(opcode_t * cur_opcode))
 {
     ASSERT_ARGS(Parrot_debugger_start)
     TRACEDEB_MSG("Parrot_debugger_start");