X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fscm-valprint.c;h=737bafab01f6f537f1df609763f2270ce2a60dbf;hb=6e25beafa93e963c126c05acf8c819699c378922;hp=71acc69d35153017d7d26b39ae48efabed74ef9e;hpb=c906108c21474dfb4ed285bcc0ac6fe02cd400cc;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/scm-valprint.c b/gdb/scm-valprint.c index 71acc69d35..737bafab01 100644 --- a/gdb/scm-valprint.c +++ b/gdb/scm-valprint.c @@ -1,21 +1,23 @@ /* Scheme/Guile language support routines for GDB, the GNU debugger. - Copyright 1995 Free Software Foundation, Inc. + Copyright 1995, 1996, 1998, 1999, 2000, 2001 + Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "symtab.h" @@ -29,28 +31,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "gdbcore.h" /* FIXME: Should be in a header file that we import. */ -extern int -c_val_print PARAMS ((struct type *, char *, int, CORE_ADDR, GDB_FILE *, int, int, - int, enum val_prettyprint)); +extern int c_val_print (struct type *, char *, int, CORE_ADDR, + struct ui_file *, int, int, int, + enum val_prettyprint); -static void scm_ipruk PARAMS ((char *, LONGEST, GDB_FILE *)); -static void scm_scmlist_print PARAMS ((LONGEST, GDB_FILE *, int, int, - int, enum val_prettyprint)); -static int scm_inferior_print PARAMS ((LONGEST, GDB_FILE *, int, int, - int, enum val_prettyprint)); +static void scm_ipruk (char *, LONGEST, struct ui_file *); +static void scm_scmlist_print (LONGEST, struct ui_file *, int, int, + int, enum val_prettyprint); +static int scm_inferior_print (LONGEST, struct ui_file *, int, int, + int, enum val_prettyprint); /* Prints the SCM value VALUE by invoking the inferior, if appropraite. Returns >= 0 on succes; retunr -1 if the inferior cannot/should not print VALUE. */ static int -scm_inferior_print (value, stream, format, deref_ref, recurse, pretty) - LONGEST value; - GDB_FILE *stream; - int format; - int deref_ref; - int recurse; - enum val_prettyprint pretty; +scm_inferior_print (LONGEST value, struct ui_file *stream, int format, + int deref_ref, int recurse, enum val_prettyprint pretty) { return -1; } @@ -95,13 +92,8 @@ static char *scm_isymnames[] = }; static void -scm_scmlist_print (svalue, stream, format, deref_ref, recurse, pretty) - LONGEST svalue; - GDB_FILE *stream; - int format; - int deref_ref; - int recurse; - enum val_prettyprint pretty; +scm_scmlist_print (LONGEST svalue, struct ui_file *stream, int format, + int deref_ref, int recurse, enum val_prettyprint pretty) { unsigned int more = print_max; if (recurse > 6) @@ -134,29 +126,21 @@ scm_scmlist_print (svalue, stream, format, deref_ref, recurse, pretty) } static void -scm_ipruk (hdr, ptr, stream) - char *hdr; - LONGEST ptr; - GDB_FILE *stream; +scm_ipruk (char *hdr, LONGEST ptr, struct ui_file *stream) { fprintf_filtered (stream, "#", ptr); + fprintf_filtered (stream, " 0x%s>", paddr_nz (ptr)); } void -scm_scmval_print (svalue, stream, format, deref_ref, recurse, pretty) - LONGEST svalue; - GDB_FILE *stream; - int format; - int deref_ref; - int recurse; - enum val_prettyprint pretty; +scm_scmval_print (LONGEST svalue, struct ui_file *stream, int format, + int deref_ref, int recurse, enum val_prettyprint pretty) { - taloop: +taloop: switch (7 & (int) svalue) { case 2: @@ -210,13 +194,13 @@ scm_scmval_print (svalue, stream, format, deref_ref, recurse, pretty) #if 1 fputs_filtered ("???", stream); #else - name = ((SCM n*)(STRUCT_TYPE( exp)))[struct_i_name]; + name = ((SCM n *) (STRUCT_TYPE (exp)))[struct_i_name]; scm_lfwrite (CHARS (name), (sizet) sizeof (char), - (sizet) LENGTH (name), + (sizet) LENGTH (name), port); #endif - fprintf_filtered (stream, " #X%lX>", svalue); + fprintf_filtered (stream, " #X%s>", paddr_nz (svalue)); break; } case scm_tcs_cons_imcar: @@ -248,7 +232,7 @@ scm_scmval_print (svalue, stream, format, deref_ref, recurse, pretty) { buf_size = min (len - done, 64); read_memory (addr + done, buffer, buf_size); - + for (i = 0; i < buf_size; ++i) switch (buffer[i]) { @@ -267,7 +251,7 @@ scm_scmval_print (svalue, stream, format, deref_ref, recurse, pretty) { int len = SCM_LENGTH (svalue); - char * str = (char*) alloca (len); + char *str = (char *) alloca (len); read_memory (SCM_CDR (svalue), str, len + 1); /* Should handle weird characters FIXME */ str[len] = '\0'; @@ -278,7 +262,7 @@ scm_scmval_print (svalue, stream, format, deref_ref, recurse, pretty) { int len = SCM_LENGTH (svalue); int i; - LONGEST elements = SCM_CDR(svalue); + LONGEST elements = SCM_CDR (svalue); fputs_filtered ("#(", stream); for (i = 0; i < len; ++i) { @@ -299,15 +283,15 @@ scm_scmval_print (svalue, stream, format, deref_ref, recurse, pretty) if (hook == BOOL_F) { scm_puts ("#", port); } else { result = scm_apply (hook, - scm_listify (exp, port, (writing ? BOOL_T : BOOL_F), - SCM_UNDEFINED), + scm_listify (exp, port, (writing ? BOOL_T : BOOL_F), + SCM_UNDEFINED), EOL); if (result == BOOL_F) goto punk; @@ -331,7 +315,7 @@ scm_scmval_print (svalue, stream, format, deref_ref, recurse, pretty) char str[20]; sprintf (str, "#%d", index); #else - char *str = index ? SCM_CHARS (scm_heap_org+index) : ""; + char *str = index ? SCM_CHARS (scm_heap_org + index) : ""; #define SCM_CHARS(x) ((char *)(SCM_CDR(x))) char *str = CHARS (SNAME (exp)); #endif @@ -375,17 +359,9 @@ scm_scmval_print (svalue, stream, format, deref_ref, recurse, pretty) } int -scm_val_print (type, valaddr, embedded_offset, address, - stream, format, deref_ref, recurse, pretty) - struct type *type; - char *valaddr; - int embedded_offset; - CORE_ADDR address; - GDB_FILE *stream; - int format; - int deref_ref; - int recurse; - enum val_prettyprint pretty; +scm_val_print (struct type *type, char *valaddr, int embedded_offset, + CORE_ADDR address, struct ui_file *stream, int format, + int deref_ref, int recurse, enum val_prettyprint pretty) { if (is_scmvalue_type (type)) { @@ -397,7 +373,7 @@ scm_val_print (type, valaddr, embedded_offset, address, else { scm_scmval_print (svalue, stream, format, - deref_ref, recurse, pretty); + deref_ref, recurse, pretty); } gdb_flush (stream); @@ -411,11 +387,8 @@ scm_val_print (type, valaddr, embedded_offset, address, } int -scm_value_print (val, stream, format, pretty) - value_ptr val; - GDB_FILE *stream; - int format; - enum val_prettyprint pretty; +scm_value_print (struct value *val, struct ui_file *stream, int format, + enum val_prettyprint pretty) { return (val_print (VALUE_TYPE (val), VALUE_CONTENTS (val), 0, VALUE_ADDRESS (val), stream, format, 1, 0, pretty));