From b276f1bbc9cf6f8d44204350cb03e4d021edf783 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 24 May 2003 03:21:42 +0000 Subject: 2003-05-23 Andrew Cagney * p-valprint.c (pascal_val_print): Replace extract_address with the inline equivalent extract_unsigned_integer. * jv-valprint.c (java_value_print): Ditto. * ada-valprint.c (ada_val_print_1): Ditto. * ada-lang.h (EXTRACT_ADDRESS): Ditto. --- gdb/p-valprint.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'gdb/p-valprint.c') diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c index 84189dd..ddd508a 100644 --- a/gdb/p-valprint.c +++ b/gdb/p-valprint.c @@ -141,7 +141,8 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset, /* Print the unmangled name if desired. */ /* Print vtable entry - we only get here if we ARE using -fvtable_thunks. (Otherwise, look under TYPE_CODE_STRUCT.) */ - print_address_demangle (extract_address (valaddr + embedded_offset, TYPE_LENGTH (type)), + /* Extract the address, assume that it is unsigned. */ + print_address_demangle (extract_unsigned_integer (valaddr + embedded_offset, TYPE_LENGTH (type)), stream, demangle); break; } @@ -272,9 +273,11 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset, if (addressprint) { fprintf_filtered (stream, "@"); + /* Extract the address, assume that it is unsigned. */ print_address_numeric - (extract_address (valaddr + embedded_offset, - TARGET_PTR_BIT / HOST_CHAR_BIT), 1, stream); + (extract_unsigned_integer (valaddr + embedded_offset, + TARGET_PTR_BIT / HOST_CHAR_BIT), + 1, stream); if (deref_ref) fputs_filtered (": ", stream); } @@ -312,10 +315,11 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset, /* Print the unmangled name if desired. */ /* Print vtable entry - we only get here if NOT using -fvtable_thunks. (Otherwise, look under TYPE_CODE_PTR.) */ - print_address_demangle (extract_address ( - valaddr + embedded_offset + TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8, - TYPE_LENGTH (TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET))), - stream, demangle); + /* Extract the address, assume that it is unsigned. */ + print_address_demangle + (extract_unsigned_integer (valaddr + embedded_offset + TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8, + TYPE_LENGTH (TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET))), + stream, demangle); } else { -- cgit v1.1