* utils.c, defs.h (error_begin): New function.

[binutils.git] / gdb / core.c

diff --git a/gdb/core.c b/gdb/core.c
index f16efe8d69088dbb13b21ce70802815d56b305f9..fe44651a7045b170d4fc7ba5eb6c9b81365a903f 100644 (file)
--- a/gdb/core.c
+++ b/gdb/core.c
@@ -138,19 +138,24 @@ memory_error (status, memaddr)
      int status;
      CORE_ADDR memaddr;
 {
-  /* FIXME-32x64--casting CORE_ADDR to unsigned long */
   if (status == EIO)
     {
       /* Actually, address between memaddr and memaddr + len
         was out of bounds. */
-      error ("Cannot access memory at address %s.",
-            local_hex_string((unsigned long) memaddr));
+      error_begin ();
+      printf_unfiltered ("Cannot access memory at address ");
+      print_address_numeric (memaddr, gdb_stdout);
+      printf_unfiltered (".\n");
+      return_to_top_level (RETURN_ERROR);
     }
   else
     {
-      error ("Error accessing memory address %s: %s.",
-            local_hex_string ((unsigned long) memaddr),
-            safe_strerror (status));
+      error_begin ();
+      printf_unfiltered ("Error accessing memory address ");
+      print_address_numeric (memaddr, gdb_stdout);
+      printf_unfiltered (": %s.\n",
+                        safe_strerror (status));
+      return_to_top_level (RETURN_ERROR);
     }
 }