From 1d51a733d5f20fe7ad6e89103f50742da2991586 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 18 May 2012 15:28:24 +0000 Subject: [PATCH] * printcmd.c (print_address_demangle): Remove special case for 0. testsuite * gdb.mi/mi2-var-display.exp: Update. * gdb.mi/mi-var-display.exp: Update. * gdb.mi/mi-var-child.exp: Update. * gdb.cp/expand-psymtabs-cxx.exp: Update. * gdb.cp/cp-relocate.exp (get_func_address): Update. --- gdb/ChangeLog | 4 ++++ gdb/printcmd.c | 6 +----- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.cp/cp-relocate.exp | 4 ++-- gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp | 9 ++++++--- gdb/testsuite/gdb.mi/mi-var-child.exp | 4 ++-- gdb/testsuite/gdb.mi/mi-var-display.exp | 2 +- gdb/testsuite/gdb.mi/mi2-var-display.exp | 2 +- 8 files changed, 25 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1eba1065722..73e06c26224 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2012-05-18 Tom Tromey + + * printcmd.c (print_address_demangle): Remove special case for 0. + 2012-05-18 Tom Tromey * printcmd.c (print_address_demangle): Add 'opts' argument. diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 3bb43bdedde..523fad29411 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -771,11 +771,7 @@ print_address_demangle (const struct value_print_options *opts, struct gdbarch *gdbarch, CORE_ADDR addr, struct ui_file *stream, int do_demangle) { - if (addr == 0) - { - fprintf_filtered (stream, "0"); - } - else if (opts->addressprint) + if (opts->addressprint) { fputs_filtered (paddress (gdbarch, addr), stream); print_address_symbolic (gdbarch, addr, stream, do_demangle, " "); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 9eae7929af1..0aeb2f7175a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-05-18 Tom Tromey + + * gdb.mi/mi2-var-display.exp: Update. + * gdb.mi/mi-var-display.exp: Update. + * gdb.mi/mi-var-child.exp: Update. + * gdb.cp/expand-psymtabs-cxx.exp: Update. + * gdb.cp/cp-relocate.exp (get_func_address): Update. + 2012-05-17 Doug Evans * info-macros.exp: Pass "debug" to prepare_for_testing. diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp index 172f24e11db..2981228ac83 100644 --- a/gdb/testsuite/gdb.cp/cp-relocate.exp +++ b/gdb/testsuite/gdb.cp/cp-relocate.exp @@ -31,11 +31,11 @@ proc get_func_address { func } { set rfunc [string_to_regexp $func] gdb_test_multiple "print ${func}" "get address of ${func}" { - -re "\\\$\[0-9\]+ = \\{.*\\} (0|($hex) <${rfunc}>)\[\r\n\]+${gdb_prompt} $" { + -re "\\\$\[0-9\]+ = \\{.*\\} (($hex) <${rfunc}.*>)\[\r\n\]+${gdb_prompt} $" { # $1 = {int ()} 0x24 # But if the function is at zero, the name may be omitted. pass "get address of ${func}" - if { $expect_out(1,string) == "0" } { + if { $expect_out(1,string) == "0x0" } { return "0x0" } else { return $expect_out(2,string) diff --git a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp index 226d0b802ed..2614fb76209 100644 --- a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp +++ b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp @@ -32,6 +32,9 @@ gdb_test_no_output "set language c++" # FAIL was: # $1 = {} 0 -gdb_test "p 'method(long)'" { = {void \(long\)} 0} "before expand" -gdb_test "p method" { = {void \(long\)} 0} "force expand" -gdb_test "p 'method(long)'" { = {void \(long\)} 0} "after expand" +gdb_test "p 'method(long)'" { = {void \(long\)} 0x0 } \ + "before expand" +gdb_test "p method" { = {void \(long\)} 0x0 } \ + "force expand" +gdb_test "p 'method(long)'" { = {void \(long\)} 0x0 } \ + "after expand" diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp index 7e58ad7023c..fb98c1dd7e5 100644 --- a/gdb/testsuite/gdb.mi/mi-var-child.exp +++ b/gdb/testsuite/gdb.mi/mi-var-child.exp @@ -808,9 +808,9 @@ mi_list_varobj_children {struct_declarations --simple-values} \ {struct_declarations.long_array long_array 12 "long int \\[12\\]"} \ [list struct_declarations.func_ptr func_ptr 0 "void \\(\\*\\)\\((void)?\\)" "(@$hex: |)$hex "] \ {struct_declarations.func_ptr_struct func_ptr_struct 0 \ - "struct _struct_decl \\(\\*\\)(\\(int, char \\*, long int\\))?" 0} \ + "struct _struct_decl \\(\\*\\)(\\(int, char \\*, long int\\))?" 0x0} \ {struct_declarations.func_ptr_ptr func_ptr_ptr 0 \ - "struct _struct_decl \\*\\(\\*\\)\\((int, char \\*, long int)?\\)" 0} \ + "struct _struct_decl \\*\\(\\*\\)\\((int, char \\*, long int)?\\)" 0x0} \ {struct_declarations.u1 u1 4 "union \\{\\.\\.\\.\\}"} \ {struct_declarations.s2 s2 4 "struct \\{\\.\\.\\.\\}"} \ ] "listing of children, simple types: names, type and values, complex types: names and types" diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp index b3ae2c504b4..bc770d97322 100644 --- a/gdb/testsuite/gdb.mi/mi-var-display.exp +++ b/gdb/testsuite/gdb.mi/mi-var-display.exp @@ -286,7 +286,7 @@ mi_gdb_test "-var-set-format weird.func_ptr_struct hexadecimal" \ "set format variable weird.func_ptr_struct" mi_gdb_test "-var-set-format weird.func_ptr_ptr natural" \ - "\\^done,format=\"natural\",value=\"0\"" \ + "\\^done,format=\"natural\",value=\"0x0\"" \ "set format variable weird.func_ptr_ptr" mi_gdb_test "-var-set-format weird.u1 natural" \ diff --git a/gdb/testsuite/gdb.mi/mi2-var-display.exp b/gdb/testsuite/gdb.mi/mi2-var-display.exp index f5c69abe18a..d1429c80b9e 100644 --- a/gdb/testsuite/gdb.mi/mi2-var-display.exp +++ b/gdb/testsuite/gdb.mi/mi2-var-display.exp @@ -285,7 +285,7 @@ mi_gdb_test "-var-set-format weird.func_ptr_struct hexadecimal" \ "set format variable weird.func_ptr_struct" mi_gdb_test "-var-set-format weird.func_ptr_ptr natural" \ - "\\^done,format=\"natural\",value=\"0\"" \ + "\\^done,format=\"natural\",value=\"0x0\"" \ "set format variable weird.func_ptr_ptr" mi_gdb_test "-var-set-format weird.u1 natural" \ -- 2.30.2