print_insn_sh cleanup:

[deliverable/binutils-gdb.git] / gdb / ui-out.c

diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 06db646de3dbd9186f22c4a76ff68b6980f4ec8f..c07d6952e6c1879575f30e47d9be3d3c181f11a2 100644 (file)
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -1,5 +1,7 @@
 /* Output generating routines for GDB.
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
 
@@ -27,11 +29,6 @@
 #include "ui-out.h"
 #include "gdb_assert.h"
 
-/* Convenience macro for allocting typesafe memory. */
-
-#undef XMALLOC
-#define XMALLOC(TYPE) (TYPE*) xmalloc (sizeof (TYPE))
-
 /* table header structures */
 
 struct ui_out_hdr
@@ -495,9 +492,14 @@ ui_out_field_core_addr (struct ui_out *uiout,
 {
   char addstr[20];
 
-  /* FIXME-32x64: need a print_address_numeric with field width */
+  /* FIXME: cagney/2002-05-03: Need local_address_string() function
+     that returns the language localized string formatted to a width
+     based on TARGET_ADDR_BIT.  */
   /* print_address_numeric (address, 1, local_stream); */
-  strcpy (addstr, local_hex_string_custom ((unsigned long) address, "08l"));
+  if (TARGET_ADDR_BIT <= 32)
+    strcpy (addstr, local_hex_string_custom ((unsigned long) address, "08l"));
+  else
+    strcpy (addstr, local_hex_string_custom ((unsigned long) address, "016l"));
 
   ui_out_field_string (uiout, fldname, addstr);
 }