Author: julianalbo
Date: Thu Aug 7 03:45:44 2008
New Revision: 30084
Modified:
trunk/include/parrot/debug.h
trunk/src/debug.c
Log:
clean and headerize debug.c
Modified: trunk/include/parrot/debug.h
==============================================================================
--- trunk/include/parrot/debug.h (original)
+++ trunk/include/parrot/debug.h Thu Aug 7 03:45:44 2008
@@ -175,12 +175,11 @@
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_API
-void Parrot_debugger_break(PARROT_INTERP, ARGIN(opcode_t * cur_opcode))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
+void Parrot_debugger_init(PARROT_INTERP)
+ __attribute__nonnull__(1);
PARROT_API
-void Parrot_debugger_init(PARROT_INTERP)
+void Parrot_debugger_load(PARROT_INTERP, ARGIN_NULLOK(STRING *filename))
__attribute__nonnull__(1);
PARROT_API
@@ -189,10 +188,6 @@
__attribute__nonnull__(2);
PARROT_API
-void Parrot_debugger_load(PARROT_INTERP, ARGIN_NULLOK(STRING *filename))
- __attribute__nonnull__(1);
-
-PARROT_API
void PDB_load_source(PARROT_INTERP, ARGIN(const char *command))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
Modified: trunk/src/debug.c
==============================================================================
--- trunk/src/debug.c (original)
+++ trunk/src/debug.c Thu Aug 7 03:45:44 2008
@@ -379,21 +379,6 @@
Initializes the Parrot debugger, if it's not already initialized.
-=item C<void Parrot_debugger_load>
-
-Loads a Parrot source file for the current program.
-
-=item C<void Parrot_debugger_break>
-
-Breaks execution and drops into the debugger. If we are already into the
-debugger and it is the first call, set a breakpoint.
-
-When you re run/continue the program being debugged it will pay no attention to
-the debug ops.
-
-RT #42377: clone the interpreter to allow people to play into the
-debugger and then continue the normal execution of the program.
-
=cut
*/
@@ -410,12 +395,22 @@
pdb->debugee = interp;
}
- /*PDB_disassemble(interp, NULL);*/
+ /* PDB_disassemble(interp, NULL); */
interp->pdb->cur_opcode = interp->code->base.data;
interp->pdb->state |= PDB_RUNNING;
}
+/*
+
+=item C<void Parrot_debugger_load>
+
+Loads a Parrot source file for the current program.
+
+=cut
+
+*/
+
PARROT_API
void
Parrot_debugger_load(PARROT_INTERP, ARGIN_NULLOK(STRING *filename))
@@ -430,18 +425,28 @@
string_cstring_free(file);
}
+/*
+
+=item C<void Parrot_debugger_start>
+
+Start debugger.
+
+=cut
+
+*/
+
PARROT_API
void
Parrot_debugger_start(PARROT_INTERP, ARGIN(opcode_t * cur_opcode))
{
- /*fprintf(stderr, "Parrot_debugger_start\n");*/
+ /* fprintf(stderr, "Parrot_debugger_start\n"); */
if (!interp->pdb)
Parrot_ex_throw_from_c_args(interp, NULL, 0, "No debugger");
if (interp->pdb->state & PDB_ENTER) {
if (!interp->pdb->file) {
- /*PDB_disassemble(interp, NULL);*/
+ /* PDB_disassemble(interp, NULL); */
}
interp->pdb->state &= ~PDB_ENTER;
}
@@ -459,7 +464,24 @@
}
if (interp->pdb->state & PDB_EXIT)
Parrot_exit(interp, 0);
- }
+}
+
+/*
+
+=item C<void Parrot_debugger_break>
+
+Breaks execution and drops into the debugger. If we are already into the
+debugger and it is the first call, set a breakpoint.
+
+When you re run/continue the program being debugged it will pay no attention to
+the debug ops.
+
+RT #42377: clone the interpreter to allow people to play into the
+debugger and then continue the normal execution of the program.
+
+=cut
+
+*/
PARROT_API
void
@@ -492,7 +514,7 @@
}
/* RT #42378 this is not ok */
- /*exit(EXIT_SUCCESS);*/
+ /* exit(EXIT_SUCCESS); */
}
else {
interp->pdb->cur_opcode = (opcode_t *)cur_opcode + 1;