2007-06-13 Markus Deuling <deuling@de.ibm.com>

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

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 210a1c0fe5fd6d7efc60db8fa22230917047e208..6da10aa19629432b7fc2d09117604fd1fcc1cbc9 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1,7 +1,7 @@
 /* Print values for GNU debugger GDB.
 
-   Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
-   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -212,14 +212,14 @@ decode_format (char **string_ptr, int oformat, int osize)
       case 'a':
       case 's':
        /* Pick the appropriate size for an address.  */
-       if (TARGET_PTR_BIT == 64)
+       if (gdbarch_ptr_bit (current_gdbarch) == 64)
          val.size = osize ? 'g' : osize;
-       else if (TARGET_PTR_BIT == 32)
+       else if (gdbarch_ptr_bit (current_gdbarch) == 32)
          val.size = osize ? 'w' : osize;
-       else if (TARGET_PTR_BIT == 16)
+       else if (gdbarch_ptr_bit (current_gdbarch) == 16)
          val.size = osize ? 'h' : osize;
        else
-         /* Bad value for TARGET_PTR_BIT.  */
+         /* Bad value for gdbarch_ptr_bit.  */
          internal_error (__FILE__, __LINE__,
                          _("failed internal consistency check"));
        break;
@@ -786,8 +786,8 @@ do_examine (struct format_data fmt, CORE_ADDR addr)
            value_free (last_examine_value);
 
          /* The value to be displayed is not fetched greedily.
-            Instead, to avoid the posibility of a fetched value not
-            being used, its retreval is delayed until the print code
+            Instead, to avoid the possibility of a fetched value not
+            being used, its retrieval is delayed until the print code
             uses it.  When examining an instruction stream, the
             disassembler will perform its own memory fetch using just
             the address stored in LAST_EXAMINE_VALUE.  FIXME: Should
@@ -1113,7 +1113,8 @@ address_info (char *exp, int from_tty)
       break;
 
     case LOC_REGISTER:
-      printf_filtered (_("a variable in register %s"), REGISTER_NAME (val));
+      printf_filtered (_("a variable in register %s"),
+                        gdbarch_register_name (current_gdbarch, val));
       break;
 
     case LOC_STATIC:
@@ -1144,12 +1145,13 @@ address_info (char *exp, int from_tty)
       break;
 
     case LOC_REGPARM:
-      printf_filtered (_("an argument in register %s"), REGISTER_NAME (val));
+      printf_filtered (_("an argument in register %s"),
+                        gdbarch_register_name (current_gdbarch, val));
       break;
 
     case LOC_REGPARM_ADDR:
       printf_filtered (_("address of an argument in register %s"),
-                      REGISTER_NAME (val));
+                      gdbarch_register_name (current_gdbarch, val));
       break;
 
     case LOC_ARG:
@@ -1170,12 +1172,12 @@ address_info (char *exp, int from_tty)
 
     case LOC_BASEREG:
       printf_filtered (_("a variable at offset %ld from register %s"),
-                      val, REGISTER_NAME (basereg));
+                      val, gdbarch_register_name (current_gdbarch, basereg));
       break;
 
     case LOC_BASEREG_ARG:
       printf_filtered (_("an argument at offset %ld from register %s"),
-                      val, REGISTER_NAME (basereg));
+                      val, gdbarch_register_name (current_gdbarch, basereg));
       break;
 
     case LOC_TYPEDEF:
@@ -1222,7 +1224,7 @@ address_info (char *exp, int from_tty)
     case LOC_HP_THREAD_LOCAL_STATIC:
       printf_filtered (_("\
 a thread-local variable at offset %ld from the thread base register %s"),
-                      val, REGISTER_NAME (basereg));
+                      val, gdbarch_register_name (current_gdbarch, basereg));
       break;
 
     case LOC_OPTIMIZED_OUT:
@@ -1517,7 +1519,7 @@ do_one_display (struct display *d)
       val = evaluate_expression (d->exp);
       addr = value_as_address (val);
       if (d->format.format == 'i')
-       addr = ADDR_BITS_REMOVE (addr);
+       addr = gdbarch_addr_bits_remove (current_gdbarch, addr);
 
       annotate_display_value ();