* symfile.c (compare_psymbols, compare_symbols): Declare using

[deliverable/binutils-gdb.git] / gdb / printcmd.c

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index c57bf8218abe0cb09c090d166dcd2f3748cc4499..66dc512df67c2762f9cde41e7a092d644ce101cc 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1,7 +1,7 @@
 /* Print values for GNU debugger GDB.
 
-   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994, 1995,
-   1998, 2000 Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+   1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -249,7 +249,7 @@ decode_format (char **string_ptr, int oformat, int osize)
          val.size = osize ? 'h' : osize;
        else
          /* Bad value for TARGET_PTR_BIT */
-         abort ();
+         internal_error (__FILE__, __LINE__, "failed internal consistency check");
        break;
       case 'f':
        /* Floating point has to be word or giantword.  */
@@ -456,7 +456,7 @@ print_scalar_formatted (char *valaddr, struct type *type, int format, int size,
       break;
 
     case 0:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
     case 't':
       /* Binary; 't' stands for "two".  */
@@ -718,15 +718,17 @@ build_address_symbolic (CORE_ADDR addr,  /* IN */
 void
 print_address_numeric (CORE_ADDR addr, int use_local, struct ui_file *stream)
 {
-  /* Truncate address to the size of a target pointer, avoiding shifts
+  /* Truncate address to the size of a target address, avoiding shifts
      larger or equal than the width of a CORE_ADDR.  The local
-     variable PTR_BIT stops the compiler reporting a shift overflow
-     when it won't occure. */
+     variable ADDR_BIT stops the compiler reporting a shift overflow
+     when it won't occur. */
   /* NOTE: This assumes that the significant address information is
      kept in the least significant bits of ADDR - the upper bits were
      either zero or sign extended.  Should ADDRESS_TO_POINTER() or
      some ADDRESS_TO_PRINTABLE() be used to do the conversion?  */
+
   int addr_bit = TARGET_ADDR_BIT;
+
   if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
     addr &= ((CORE_ADDR) 1 << addr_bit) - 1;
   print_longest (stream, 'x', use_local, (ULONGEST) addr);
@@ -1334,8 +1336,8 @@ x_command (char *exp, int from_tty)
        val = value_ind (val);
       /* In rvalue contexts, such as this, functions are coerced into
          pointers to functions.  This makes "x/i main" work.  */
-      if (                     /* last_format == 'i'
-                                  && */ TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_FUNC
+      if (/* last_format == 'i'  && */ 
+         TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_FUNC
           && VALUE_LVAL (val) == lval_memory)
        next_address = VALUE_ADDRESS (val);
       else
@@ -1788,7 +1790,7 @@ print_frame_args (struct symbol *func, struct frame_info *fi, int num,
   /* Number of ints of arguments that we have printed so far.  */
   int args_printed = 0;
 #ifdef UI_OUT
-  struct cleanup *old_chain;
+  struct cleanup *old_chain, *list_chain;
   struct ui_stream *stb;
 
   stb = ui_out_stream_new (uiout);
@@ -1906,7 +1908,7 @@ print_frame_args (struct symbol *func, struct frame_info *fi, int num,
 
       annotate_arg_begin ();
 
-      ui_out_list_begin (uiout, NULL);
+      list_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
       fprintf_symbol_filtered (stb->stream, SYMBOL_SOURCE_NAME (sym),
                            SYMBOL_LANGUAGE (sym), DMGL_PARAMS | DMGL_ANSI);
       ui_out_field_stream (uiout, "name", stb);
@@ -1949,7 +1951,8 @@ print_frame_args (struct symbol *func, struct frame_info *fi, int num,
       else
        ui_out_text (uiout, "???");
 
-      ui_out_list_end (uiout);
+      /* Invoke ui_out_tuple_end.  */
+      do_cleanups (list_chain);
 #else
          val_print (VALUE_TYPE (val), VALUE_CONTENTS (val), 0,
                     VALUE_ADDRESS (val),
@@ -2075,11 +2078,7 @@ printf_command (char *arg, int from_tty)
              *f++ = '\\';
              break;
            case 'a':
-#ifdef __STDC__
              *f++ = '\a';
-#else
-             *f++ = '\007';    /* Bell */
-#endif
              break;
            case 'b':
              *f++ = '\b';