OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* cp-valprint.c (cp_print_value_fields): Use 

print_function_pointer_address for vtable slot.
gdb/testsuite
	* gdb.cp/virtfunc2.exp: Update expected output.
	* gdb.cp/pr9631.exp: Update expected output.
	* gdb.cp/member-ptr.exp: Update expected output.
	* gdb.cp/inherit.exp (test_print_mvi_classes): Update expected
	output.
	* gdb.cp/casts.exp: Update expected output.
This commit is contained in:
Tom Tromey 2012-03-15 15:49:42 +00:00
parent c4aeac856a
commit 410528f093
9 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2012-03-15 Tom Tromey <tromey@redhat.com>
* cp-valprint.c (cp_print_value_fields): Use
print_function_pointer_address for vtable slot.
2012-03-15 Tom Tromey <tromey@redhat.com>
* gnu-v3-abi.c (struct value_and_voffset): New.

11
gdb/cp-valprint.c
View File

@ -358,6 +358,17 @@ cp_print_value_fields (struct type *type, struct type *real_type,
v, stream, recurse + 1,
options);
}
else if (i == TYPE_VPTR_FIELDNO (type))
{
CORE_ADDR addr
= extract_typed_address (valaddr + offset
+ TYPE_FIELD_BITSIZE (type, i) / 8,
TYPE_FIELD_TYPE (type, i));
print_function_pointer_address (get_type_arch (type),
addr, stream,
options->addressprint);
}
else
{
struct value_print_options opts = *options;

9
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
2012-03-15 Tom Tromey <tromey@redhat.com>
* gdb.cp/virtfunc2.exp: Update expected output.
* gdb.cp/pr9631.exp: Update expected output.
* gdb.cp/member-ptr.exp: Update expected output.
* gdb.cp/inherit.exp (test_print_mvi_classes): Update expected
output.
* gdb.cp/casts.exp: Update expected output.
2012-03-15 Tom Tromey <tromey@redhat.com>
* gdb.cp/virtfunc.exp (make_one_vtable_result): New proc.

2
gdb/testsuite/gdb.cp/casts.exp
View File

@ -137,7 +137,7 @@ gdb_test "print dynamic_cast<Alpha *> (&doublyderived)" \
"dynamic_cast upcast to unique base"
gdb_test "print dynamic_cast<Alpha &> (derived)" \
" = \\(Alpha \\&\\) @$nonzero_hex: {.* = $nonzero_hex}" \
" = \\(Alpha \\&\\) @$nonzero_hex: {.* = ${nonzero_hex}( <vtable for Derived.*>)?}" \
"dynamic_cast simple upcast to reference"
gdb_test "print dynamic_cast<Derived *> (ad)" \

4
gdb/testsuite/gdb.cp/inherit.exp
View File

@ -670,7 +670,7 @@ proc test_print_mvi_classes { } {
# gcc 2.95.3 -gstabs+
pass $name
}
-re "$vhn = \{<vB> = \{<vA> = \{va = 19, vx = 20\}, $re_vbptr_3_vB = $hex, vb = 21, vx = 22\}, <vC> = \{$re_vbptr_3_vC = $hex, vc = 23, vx = 24\}, $re_vbptr_3_vD = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
-re "$vhn = \{<vB> = \{<vA> = \{va = 19, vx = 20\}, $re_vbptr_3_vB = ${hex}( <vtable for vD.*>)?, vb = 21, vx = 22\}, <vC> = \{$re_vbptr_3_vC = ${hex}( <vtable for vC.*>)?, vc = 23, vx = 24\}, $re_vbptr_3_vD = ${hex}( <vtable for vD.*>)?, vd = 25, vx = 26\}$nl$gdb_prompt $" {
# gcc 3.3.2 -gdwarf-2
# gcc HEAD 2004-01-21 -gdwarf-2
# gcc HEAD 2004-01-21 -gstabs+
@ -691,7 +691,7 @@ proc test_print_mvi_classes { } {
# gcc 2.95.3 -gstabs+
pass $name
}
-re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_3_vB = $hex, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_3_vC = $hex, vc = 0, vx = 0\}, $re_vbptr_3_vD = $hex, vd = 0, vx = 0\}, $re_vbptr_3_vE = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
-re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_3_vB = ${hex}( <vtable for vE.*>)?, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_3_vC = ${hex}( <vtable for vE.*>)?, vc = 0, vx = 0\}, $re_vbptr_3_vD = ${hex}( <vtable for vE.*>)?, vd = 0, vx = 0\}, $re_vbptr_3_vE = ${hex}( <vtable for vE.*>)?, ve = 27, vx = 28\}$nl$gdb_prompt $" {
# gcc 3.3.4 -gdwarf-2
# gcc 3.3.4 -gstabs+
# gcc 3.4.1 -gdwarf-2

4
gdb/testsuite/gdb.cp/member-ptr.exp
View File

@ -257,7 +257,7 @@ gdb_test_multiple "print a" $name {
-re "$vhn = \{c = 120 'x', j = 33, jj = 1331, (static|static int) s = 10, Virtual table at $hex\}\r\n$gdb_prompt $" {
pass $name
}
-re "$vhn = \{(_vptr.A|_vptr\\$) = $hex, c = 120 'x', j = 33, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {
-re "$vhn = \{(_vptr.A|_vptr\\$) = ${hex}( <vtable for A.*>)?, c = 120 'x', j = 33, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {
pass $name
}
-re "$vhn = \{(_vptr.A|_vptr\\$) = $hex, c = 120 'x', j = 121, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {
@ -305,7 +305,7 @@ gdb_test_multiple "print a" $name {
-re "$vhn = \{c = 120 'x', j = 44, jj = 1331, (static|static int) s = 10, Virtual table at $hex\}\r\n$gdb_prompt $" {
pass $name
}
-re "$vhn = \{(_vptr.A|_vptr\\$) = $hex, c = 120 'x', j = 44, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {
-re "$vhn = \{(_vptr.A|_vptr\\$) = ${hex}( <vtable for A.*>), c = 120 'x', j = 44, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {
pass $name
}
-re "$vhn = \{(_vptr.A|_vptr\\$) = $hex, c = 120 'x', j = 121, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {

2
gdb/testsuite/gdb.cp/pr9631.exp
View File

@ -45,4 +45,4 @@ gdb_continue_to_breakpoint "after bar tender is initialized"
gdb_test \
"print tender" \
"\\\$1 = {<foo::vbase> = {_vptr.vbase = $hex}, <empty_base> = {<No data fields>}, <No data fields>}"
"\\\$1 = {<foo::vbase> = {_vptr.vbase = ${hex}( <vtable for bar.*>)?}, <empty_base> = {<No data fields>}, <No data fields>}"

2
gdb/testsuite/gdb.cp/virtbase.exp
View File

@ -78,5 +78,5 @@ gdb_test "print $" \
" = \\(Virtual \\*\\) $hex" \
"print same pointer from history value"
gdb_test "print *$$" \
" = \\(Virtual\\) {<VirtualMiddleA> = {<VirtualBase> = {_vptr.VirtualBase = $hex, x = 0}, _vptr.VirtualMiddleA = $hex, y = \\{0 <repeats 300 times>\\}}, <VirtualMiddleB> = {_vptr.VirtualMiddleB = $hex, y = 0}, _vptr.Virtual = $hex, z = 0}" \
" = \\(Virtual\\) {<VirtualMiddleA> = {<VirtualBase> = {_vptr.VirtualBase = ${hex}( <vtable for Virtual.*>)?, x = 0}, _vptr.VirtualMiddleA = ${hex}( <vtable for Virtual.*>)?, y = \\{0 <repeats 300 times>\\}}, <VirtualMiddleB> = {_vptr.VirtualMiddleB = ${hex}( <vtable for Virtual.*>)?, y = 0}, _vptr.Virtual = ${hex}( <vtable for Virtual.*>)?, z = 0}" \
"print whole pointed-to object, starting from the virtual base pointer"

1
gdb/testsuite/gdb.cp/virtfunc2.exp
View File

@ -53,6 +53,7 @@ gdb_test "print o2.do_print()" "\\$\[0-9\]+ = 123456"
gdb_test "print o2.do_print2()" "\\$\[0-9\]+ = 654321"
gdb_test "print o2.do_print3()" "\\$\[0-9\]+ = 111111"
gdb_test "print o" " = {<interface> = {.*_vptr.interface = $hex <vtable for Obj.*>}, <No data fields>}"
gdb_exit
return 0