Author: petdance
Date: Thu Jun 14 20:16:38 2007
New Revision: 19017
Modified:
trunk/config/gen/makefiles/root.in
trunk/include/parrot/debug.h
trunk/include/parrot/dod.h
trunk/src/cpu_dep.c
trunk/src/debug.c
Log:
Headerized core_pmcs.c (by not headerizing them), cpu_dep.c, datatypes.c and
debug.c
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Thu Jun 14 20:16:38 2007
@@ -1831,7 +1831,11 @@
src/builtin.o \
src/byteorder.o \
src/charset.o \
+ src/core_pmcs.o \
+ src/cpu_dep.o \
src/datatypes.o \
+ src/datatypes.o \
+ src/debug.o \
src/encoding.o \
src/exceptions.o \
src/exit.o \
@@ -1862,7 +1866,7 @@
src/utils.o \
src/vtables.o \
-headerizer : $(SRC_DIR)/fingerprint.c
+headerizer : $(SRC_DIR)/fingerprint.c $(SRC_DIR)/core_pmcs.c
$(PERL) $(BUILD_TOOLS_DIR)/headerize.pl $(HEADERIZER_O_FILES)
###############################################################################
Modified: trunk/include/parrot/debug.h
==============================================================================
--- trunk/include/parrot/debug.h (original)
+++ trunk/include/parrot/debug.h Thu Jun 14 20:16:38 2007
@@ -164,125 +164,62 @@
Interp *debugee;
} PDB_t;
-void PDB_run_command(Interp *interp, const char *command);
-void PDB_get_command(Interp *interp);
+/* HEADERIZER BEGIN: src/debug.c */
-void PDB_print(Interp *interp, const char *command);
+long PDB_add_label( PDB_file_t *file, opcode_t *cur_opcode, opcode_t offset );
+void PDB_backtrace( Interp *interp );
+char PDB_break( Interp *interp );
+char PDB_check_condition( Interp *interp, PDB_condition_t *condition );
+opcode_t * PDB_compile( Interp *interp, const char *command );
+PDB_condition_t * PDB_cond( Interp *interp, const char *command );
+void PDB_continue( Interp *interp, const char *command );
+void PDB_delete_breakpoint( Interp *interp, const char *command );
+void PDB_delete_condition( Interp *interp, PDB_breakpoint_t *breakpoint );
+void PDB_disable_breakpoint( Interp *interp, const char *command );
+void PDB_disassemble( Interp *interp, const char *command );
+size_t PDB_disassemble_op( Interp *interp,
+ char *dest,
+ int space,
+ op_info_t *info,
+ opcode_t *op,
+ PDB_file_t *file,
+ opcode_t *code_start,
+ int full_name );
+
+void PDB_enable_breakpoint( Interp *interp, const char *command );
+char * PDB_escape( const char *string, INTVAL length );
+void PDB_eval( Interp *interp, const char *command );
+int PDB_extend_const_table( Interp *interp );
+PDB_breakpoint_t * PDB_find_breakpoint( Interp *interp, const char *command );
+void PDB_free_file( Interp *interp );
+void PDB_get_command( Interp *interp /*NN*/ )
+ __attribute__nonnull__(1);
+
+char PDB_hasinstruction( char *c );
+void PDB_help( Interp *interp, const char *command );
+void PDB_info( Interp *interp );
+void PDB_init( Interp *interp, const char *command );
+void PDB_list( Interp *interp, const char *command );
+void PDB_load_source( Interp *interp, const char *command );
+void PDB_next( Interp *interp, const char *command );
+void PDB_print( Interp *interp /*NN*/, const char *command /*NN*/ )
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+void PDB_print_user_stack( Interp *interp, const char *command );
+char PDB_program_end( Interp *interp );
+void PDB_run_command( Interp *interp /*NN*/, const char *command /*NN*/ )
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+void PDB_set_break( Interp *interp, const char *command );
+void PDB_skip_breakpoint( Interp *interp, long i );
+void PDB_trace( Interp *interp, const char *command );
+int PDB_unescape( char *string );
+void PDB_watchpoint( Interp *interp, const char *command );
+/* HEADERIZER END: src/debug.c */
-#if 0
-/* XXX TODO reimplement this cruft */
-void PDB_print_int(Interp *interp, struct IReg *int_reg, int regnum);
-void PDB_print_int_frame(Interp *interp,
- struct IRegFrame *int_reg, int regnum);
-
-void PDB_print_num(Interp *interp, struct NReg *num_reg, int regnum);
-void PDB_print_num_frame(Interp *interp,
- struct NRegFrame *num_reg, int regnum);
-
-void PDB_print_string(Interp *interp,
- struct SReg *string_reg, int regnum);
-void PDB_print_string_frame(Interp *interp,
- struct SRegFrame *string_reg, int regnum);
-
-void PDB_print_pmc(Interp *interp,
- struct PReg *pmc_reg, int regnum, PMC* key);
-void PDB_print_pmc_frame(Interp *interp,
- struct PRegFrame *pmc_reg, int regnum, PMC* key);
-#endif
-
-void PDB_debug(Interp *interp);
-
-void PDB_next(Interp *interp, const char *command);
-
-void PDB_trace(Interp *interp, const char *command);
-
-void PDB_eval(Interp *interp, const char *command);
-opcode_t * PDB_compile(Interp *, const char *);
-
-int PDB_extend_const_table(Interp *interp);
-
-void PDB_init(Interp *interp, const char *command);
-
-void PDB_continue(Interp *interp, const char *command);
-
-char PDB_break(Interp *interp);
-
-PDB_breakpoint_t* PDB_find_breakpoint(Interp *interp,
- const char *command);
-
-void PDB_disable_breakpoint(Interp *interp,
- const char *command);
-
-void PDB_enable_breakpoint(Interp *interp,
- const char *command);
-
-void PDB_delete_breakpoint(Interp *interp,
- const char *command);
-
-void PDB_delete_condition(Interp *interp,
- PDB_breakpoint_t *breakpoint);
-
-void PDB_skip_breakpoint(Interp *interp, long i);
-
-char *PDB_escape(const char *string, INTVAL length);
-
-int PDB_unescape(char *string);
-
-size_t PDB_disassemble_op(Interp *interp,
- char* dest, int space,
- op_info_t* info, opcode_t* op,
- PDB_file_t *file, opcode_t* code_start,
- int full_name);
-
-void PDB_disassemble(Interp *interp, const char *command);
-
-long PDB_add_label(PDB_file_t *file, opcode_t *cur_opcode, opcode_t offset);
-
-void PDB_load_source(Interp *interp, const char *command);
-
-void PDB_free_file(Interp *interp);
-
-void PDB_list(Interp *interp, const char *command);
-
-void PDB_set_break(Interp *interp, const char *command);
-
-PDB_condition_t *PDB_cond(Interp *interp,
- const char *command);
-
-char PDB_check_condition(Interp *interp,
- PDB_condition_t *condition);
-
-void PDB_watchpoint(Interp *interp,
- const char *command);
-
-char PDB_program_end(Interp *interp);
-
-char PDB_hasinstruction(char *);
-
-void PDB_print_stack(Interp *interp,
- const char *command);
-
-void PDB_print_user_stack(Interp *interp,
- const char *command);
-
-void PDB_print_stack_int(Interp *interp,
- const char *command);
-
-void PDB_print_stack_num(Interp *interp,
- const char *command);
-
-void PDB_print_stack_string(Interp *interp,
- const char *command);
-
-void PDB_print_stack_pmc(Interp *interp,
- const char *command);
-
-void PDB_info(Interp *interp);
-
-void PDB_help(Interp *interp, const char *command);
-
-void PDB_backtrace(Interp *interp);
/*
* These constants correspond to the debugger commands and are
Modified: trunk/include/parrot/dod.h
==============================================================================
--- trunk/include/parrot/dod.h (original)
+++ trunk/include/parrot/dod.h Thu Jun 14 20:16:38 2007
@@ -99,8 +99,14 @@
/* HEADERIZER END: src/gc/dod.c */
-/* XXX Needs to go into another header */
-void trace_system_areas(Interp *interp /*NN*/);
+
+/* HEADERIZER BEGIN: src/cpu_dep.c */
+
+void trace_system_areas( Interp *interp /*NN*/ )
+ __attribute__nonnull__(1);
+
+/* HEADERIZER END: src/cpu_dep.c */
+
#if ! DISABLE_GC_DEBUG
/* Set when walking the system stack */
Modified: trunk/src/cpu_dep.c
==============================================================================
--- trunk/src/cpu_dep.c (original)
+++ trunk/src/cpu_dep.c Thu Jun 14 20:16:38 2007
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2003, The Perl Foundation.
+Copyright (C) 2001-2007, The Perl Foundation.
$Id$
=head1 NAME
@@ -20,14 +20,12 @@
=head2 Functions
-=over 4
-
-=cut
-
*/
#include "parrot/parrot.h"
+/* HEADER: include/parrot/dod.h */
+
#ifdef __ia64__
# include <ucontext.h>
@@ -98,13 +96,10 @@
/*
-=item C<static void
-trace_system_stack(Interp *interp)>
+FUNCDOC: trace_system_stack
Traces the memory block starting at C<< interp->lo_var_ptr >>.
-=cut
-
*/
static void
@@ -118,14 +113,10 @@
/*
-=back
-
=head1 SEE ALSO
F<src/dod.c>, F<include/parrot/dod.h> and F<docs/infant.dev>.
-=cut
-
*/
Modified: trunk/src/debug.c
==============================================================================
--- trunk/src/debug.c (original)
+++ trunk/src/debug.c Thu Jun 14 20:16:38 2007
@@ -29,22 +29,22 @@
#include "parrot/debug.h"
#include "parrot/oplib/ops.h"
+/* HEADER: include/parrot/debug.h */
+
static const char* GDB_P(Interp *interp, const char *s);
/*
-=item C<static char* nextarg(char *command)>
+FUNCDOC: nextarg
Returns the position just past the current argument in the PASM instruction
C<command>. This is not the same as C<skip_command()>, which is intended for
debugger commands. This function is used for C<eval>.
-=cut
-
*/
static char const *
-nextarg(char const *command)
+nextarg(char const *command /*NN*/)
{
/* as long as the character pointed to by command is not NULL,
* and it is either alphanumeric, a comma or a closing bracket,
@@ -63,16 +63,14 @@
/*
-=item C<static const char* skip_ws(const char *str)>
+FUNCDOC: skip_ws
Returns the pointer past any whitespace.
-=cut
-
*/
static const char *
-skip_ws(const char *str)
+skip_ws(const char *str /*NN*/)
{
/* as long as str is not NULL and it contains space, skip it */
while (*str && isspace((int) *str))
@@ -83,17 +81,15 @@
/*
-=item C<static const char* skip_command(const char *str)>
+FUNCDOC: skip_command
Returns the pointer past the current debugger command. (This is an
alternative to the C<skip_command()> macro above.)
-=cut
-
*/
static const char *
-skip_command(const char *str)
+skip_command(const char *str /*NN*/)
{
/* while str is not null and it contains a command (no spaces),
* skip the character
@@ -262,7 +258,7 @@
/*
-=item C<void PDB_get_command(Interp *interp)>
+FUNCDOC: PDB_get_command
Get a command from the user input to execute.
@@ -275,17 +271,15 @@
The input is saved in C<< pdb->cur_command >>.
-=cut
-
*/
void
-PDB_get_command(Interp *interp)
+PDB_get_command(Interp *interp /*NN*/)
{
unsigned int i;
int ch;
char *c;
- PDB_t *pdb = interp->pdb;
+ PDB_t * const pdb = interp->pdb;
PDB_line_t *line;
/* flush the buffered data */
@@ -343,23 +337,20 @@
/*
-=item C<void
-PDB_run_command(Interp *interp, const char *command)>
+FUNCDOC: PDB_run_command
Run a command.
Hash the command to make a simple switch calling the correct handler.
-=cut
-
*/
void
-PDB_run_command(Interp *interp, const char *command)
+PDB_run_command(Interp *interp /*NN*/, const char *command /*NN*/)
{
unsigned long c;
const char *temp;
- PDB_t *pdb = interp->pdb;
+ PDB_t * const pdb = interp->pdb;
/* keep a pointer to the command, in case we need to report an error */
temp = command;
@@ -2204,19 +2195,16 @@
/*
-=item C<void
-PDB_print(Interp *interp, const char *command)>
+FUNCDOC: PDB_print
Print interp registers.
-=cut
-
*/
void
-PDB_print(Interp *interp, const char *command)
+PDB_print(Interp *interp /*NN*/, const char *command /*NN*/)
{
- const char *s = GDB_P(interp->pdb->debugee, command);
+ const char * const s = GDB_P(interp->pdb->debugee, command);
PIO_eprintf(interp, "%s\n", s);
}
@@ -2486,7 +2474,7 @@
*/
static const char*
-GDB_P(Interp *interp, const char *s) {
+GDB_P(Interp *interp, const char *s /*NN*/) {
int t, n;
switch (*s) {
case 'I': t = REGNO_INT; break;
