Eliminate some uses of __STDC__.

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

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 8210b559675570ad57e5a3bfb7ff372bd4d0232d..92e06efc804cff015c84f6309e642325e506d32f 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,17 +718,19 @@ 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 ptr_bit = TARGET_PTR_BIT;
-  if (ptr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
-    addr &= ((CORE_ADDR) 1 << ptr_bit) - 1;
+
+  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
@@ -1438,8 +1440,8 @@ display_command (char *exp, int from_tty)
 static void
 free_display (struct display *d)
 {
-  free ((PTR) d->exp);
-  free ((PTR) d);
+  xfree (d->exp);
+  xfree (d);
 }
 
 /* Clear out the display_chain.
@@ -1453,9 +1455,9 @@ clear_displays (void)
 
   while ((d = display_chain) != NULL)
     {
-      free ((PTR) d->exp);
+      xfree (d->exp);
       display_chain = d->next;
-      free ((PTR) d);
+      xfree (d);
     }
 }
 
@@ -2075,11 +2077,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';