* 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.
This commit is contained in:
parent
edf0c1b7ca
commit
1d51a733d5
8 changed files with 25 additions and 14 deletions
|
@ -1,3 +1,7 @@
|
|||
2012-05-18 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* printcmd.c (print_address_demangle): Remove special case for 0.
|
||||
|
||||
2012-05-18 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* printcmd.c (print_address_demangle): Add 'opts' argument.
|
||||
|
|
|
@ -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, " ");
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
2012-05-18 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* 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 <dje@google.com>
|
||||
|
||||
* info-macros.exp: Pass "debug" to prepare_for_testing.
|
||||
|
|
|
@ -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 <function_bar>
|
||||
# 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)
|
||||
|
|
|
@ -32,6 +32,9 @@ gdb_test_no_output "set language c++"
|
|||
|
||||
# FAIL was:
|
||||
# $1 = {<text variable, no debug info>} 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 <method.long.>} \
|
||||
"before expand"
|
||||
gdb_test "p method" { = {void \(long\)} 0x0 <method.long.>} \
|
||||
"force expand"
|
||||
gdb_test "p 'method(long)'" { = {void \(long\)} 0x0 <method.long.>} \
|
||||
"after expand"
|
||||
|
|
|
@ -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 <nothing>"] \
|
||||
{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"
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue