2014-01-01 04:54:24 +01:00
|
|
|
# Copyright 2013-2014 Free Software Foundation, Inc.
|
2013-08-24 03:53:06 +02:00
|
|
|
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
load_lib dwarf.exp
|
|
|
|
|
|
|
|
# This test can only be run on targets which support DWARF-2 and use gas.
|
|
|
|
if {![dwarf2_support]} {
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
|
|
|
standard_testfile .c entry-values-dw.S
|
|
|
|
|
|
|
|
if {[gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \
|
|
|
|
object {nodebug}] != ""} {
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
|
|
|
|
# Start GDB and load object file, compute the function length and
|
|
|
|
# the offset of branch instruction in function. They are needed
|
|
|
|
# in the Dwarf Assembler below.
|
|
|
|
|
|
|
|
gdb_exit
|
|
|
|
gdb_start
|
|
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
|
|
gdb_load ${binfile}1.o
|
|
|
|
|
|
|
|
set foo_length ""
|
|
|
|
|
|
|
|
# Calculate the offset of the last instruction from the beginning.
|
|
|
|
set test "disassemble foo"
|
|
|
|
gdb_test_multiple $test $test {
|
|
|
|
-re ".*$hex <\\+($decimal)>:\[^\r\n\]+\r\nEnd of assembler dump\.\r\n$gdb_prompt $" {
|
|
|
|
set foo_length $expect_out(1,string)
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
-re ".*$gdb_prompt $" {
|
|
|
|
fail $test
|
|
|
|
# Bail out here, because we can't do the following tests if
|
|
|
|
# $foo_length is unknown.
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# Calculate the size of the last instruction. Single instruction
|
|
|
|
# shouldn't be longer than 10 bytes.
|
|
|
|
|
|
|
|
set test "disassemble foo+$foo_length,+10"
|
|
|
|
gdb_test_multiple $test $test {
|
2014-01-22 16:37:41 +01:00
|
|
|
-re ".*($hex) <foo\\+$foo_length>:\[^\r\n\]+\r\n\[ \]+($hex).*\.\r\n$gdb_prompt $" {
|
2013-08-24 03:53:06 +02:00
|
|
|
set start $expect_out(1,string)
|
|
|
|
set end $expect_out(2,string)
|
|
|
|
|
|
|
|
set foo_length [expr $foo_length + $end - $start]
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
-re ".*$gdb_prompt $" {
|
|
|
|
fail $test
|
|
|
|
# Bail out here, because we can't do the following tests if
|
|
|
|
# $foo_length is unknown.
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
set bar_length ""
|
|
|
|
set bar_call_foo ""
|
|
|
|
|
2013-10-02 20:09:26 +02:00
|
|
|
if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } {
|
|
|
|
set call_insn "bl"
|
2014-01-22 16:37:41 +01:00
|
|
|
} elseif { [istarget "s390*-*-*"] } {
|
|
|
|
set call_insn "brasl"
|
2014-07-02 12:59:02 +02:00
|
|
|
} elseif { [istarget "powerpc*-*-*"] } {
|
|
|
|
set call_insn "bl"
|
2013-10-02 20:09:26 +02:00
|
|
|
} else {
|
|
|
|
set call_insn "call"
|
|
|
|
}
|
|
|
|
|
2013-08-24 03:53:06 +02:00
|
|
|
# Calculate the offset of the last instruction from the beginning.
|
|
|
|
set test "disassemble bar"
|
|
|
|
gdb_test_multiple $test $test {
|
2013-10-02 20:09:26 +02:00
|
|
|
-re ".*$hex <\\+$decimal>:\[ \t\]+$call_insn\[^\r\n\]+\r\n\[ \]+$hex <\\+($decimal)>:" {
|
2013-08-24 03:53:06 +02:00
|
|
|
set bar_call_foo $expect_out(1,string)
|
|
|
|
exp_continue
|
|
|
|
}
|
|
|
|
-re ".*$hex <\\+($decimal)>:\[^\r\n\]+\r\nEnd of assembler dump\.\r\n$gdb_prompt $" {
|
|
|
|
set bar_length $expect_out(1,string)
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
-re ".*$gdb_prompt $" {
|
|
|
|
fail $test
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if { [string equal $bar_call_foo ""] || [string equal $bar_length ""] } {
|
|
|
|
fail "Find the call or branch instruction offset in bar"
|
|
|
|
# The following test makes no sense if the offset is unknown. We need
|
|
|
|
# to update the pattern above to match call or branch instruction for
|
|
|
|
# the target architecture.
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
|
|
|
|
# Calculate the size of the last instruction.
|
|
|
|
|
|
|
|
set test "disassemble bar+$bar_length,+10"
|
|
|
|
gdb_test_multiple $test $test {
|
2014-01-22 16:37:41 +01:00
|
|
|
-re ".*($hex) <bar\\+$bar_length>:\[^\r\n\]+\r\n\[ \]+($hex).*\.\r\n$gdb_prompt $" {
|
2013-08-24 03:53:06 +02:00
|
|
|
set start $expect_out(1,string)
|
|
|
|
set end $expect_out(2,string)
|
|
|
|
|
|
|
|
set bar_length [expr $bar_length + $end - $start]
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
-re ".*$gdb_prompt $" {
|
|
|
|
fail $test
|
|
|
|
# Bail out here, because we can't do the following tests if
|
|
|
|
# $bar_length is unknown.
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gdb_exit
|
|
|
|
|
|
|
|
# Make some DWARF for the test.
|
|
|
|
set asm_file [standard_output_file $srcfile2]
|
|
|
|
Dwarf::assemble $asm_file {
|
|
|
|
declare_labels int_label foo_label
|
|
|
|
global foo_length bar_length bar_call_foo
|
|
|
|
|
|
|
|
cu {} {
|
|
|
|
compile_unit {{language @DW_LANG_C}} {
|
|
|
|
int_label: base_type {
|
|
|
|
{name int}
|
|
|
|
{encoding @DW_ATE_signed}
|
|
|
|
{byte_size 4 DW_FORM_sdata}
|
|
|
|
}
|
|
|
|
|
|
|
|
foo_label: subprogram {
|
|
|
|
{name foo}
|
|
|
|
{decl_file 1}
|
2014-07-01 13:30:54 +02:00
|
|
|
{low_pc foo_start addr}
|
|
|
|
{high_pc "foo_start + $foo_length" addr}
|
2013-08-24 03:53:06 +02:00
|
|
|
} {
|
|
|
|
formal_parameter {
|
|
|
|
{type :$int_label}
|
|
|
|
{name i}
|
|
|
|
{location {DW_OP_reg0} SPECIAL_expr}
|
|
|
|
}
|
|
|
|
formal_parameter {
|
|
|
|
{type :$int_label}
|
|
|
|
{name j}
|
|
|
|
{location {DW_OP_reg1} SPECIAL_expr}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
subprogram {
|
|
|
|
{name bar}
|
|
|
|
{decl_file 1}
|
2014-07-01 13:30:54 +02:00
|
|
|
{low_pc bar_start addr}
|
|
|
|
{high_pc "bar_start + $bar_length" addr}
|
2013-08-24 03:53:06 +02:00
|
|
|
{GNU_all_call_sites 1}
|
|
|
|
} {
|
|
|
|
formal_parameter {
|
|
|
|
{type :$int_label}
|
|
|
|
{name i}
|
|
|
|
}
|
|
|
|
|
|
|
|
GNU_call_site {
|
2014-07-01 13:30:54 +02:00
|
|
|
{low_pc "bar_start + $bar_call_foo" addr}
|
2013-08-24 03:53:06 +02:00
|
|
|
{abstract_origin :$foo_label}
|
|
|
|
} {
|
|
|
|
# Faked entry values are reference to variables 'global1'
|
|
|
|
# and 'global2' and faked locations are register 0 and
|
|
|
|
# register 1.
|
|
|
|
GNU_call_site_parameter {
|
|
|
|
{location {DW_OP_reg0} SPECIAL_expr}
|
|
|
|
{GNU_call_site_value {
|
|
|
|
addr global1
|
|
|
|
deref_size 4
|
|
|
|
} SPECIAL_expr}
|
|
|
|
}
|
|
|
|
GNU_call_site_parameter {
|
|
|
|
{location {DW_OP_reg1} SPECIAL_expr}
|
|
|
|
{GNU_call_site_value {
|
|
|
|
addr global2
|
|
|
|
deref_size 4
|
|
|
|
} SPECIAL_expr}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if {[gdb_compile $asm_file ${binfile}2.o object {nodebug}] != ""} {
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
|
|
|
|
if {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \
|
|
|
|
"${binfile}" executable {}] != ""} {
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
|
|
|
|
clean_restart ${testfile}
|
|
|
|
|
|
|
|
if ![runto_main] {
|
|
|
|
fail "Can't run to main"
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
|
|
|
|
gdb_breakpoint "foo"
|
|
|
|
|
|
|
|
gdb_continue_to_breakpoint "foo"
|
|
|
|
|
|
|
|
gdb_test_no_output "set print entry-values both"
|
|
|
|
|
|
|
|
gdb_test_sequence "bt" "bt (1)" {
|
|
|
|
"\[\r\n\]#0 .* foo \\(i=[-]?[0-9]+, i@entry=2, j=[-]?[0-9]+, j@entry=3\\)"
|
|
|
|
"\[\r\n\]#1 .* bar \\(i=<optimized out>, i@entry=<optimized out>\\)"
|
|
|
|
"\[\r\n\]#2 .* main \\(\\)"
|
|
|
|
}
|
|
|
|
|
|
|
|
# Update global variables 'global1' and 'global2' and test that the
|
|
|
|
# entry values are updated too.
|
|
|
|
|
|
|
|
gdb_test_no_output "set var global1=10"
|
|
|
|
gdb_test_no_output "set var global2=11"
|
|
|
|
|
|
|
|
gdb_test_sequence "bt" "bt (2)" {
|
|
|
|
"\[\r\n\]#0 .* foo \\(i=[-]?[0-9]+, i@entry=10, j=[-]?[0-9]+, j@entry=11\\)"
|
|
|
|
"\[\r\n\]#1 .* bar \\(i=<optimized out>, i@entry=<optimized out>\\)"
|
|
|
|
"\[\r\n\]#2 .* main \\(\\)"
|
|
|
|
}
|
2013-08-24 03:54:59 +02:00
|
|
|
|
|
|
|
# Restart GDB and trace.
|
|
|
|
|
|
|
|
clean_restart $binfile
|
|
|
|
|
|
|
|
load_lib "trace-support.exp"
|
|
|
|
|
|
|
|
if ![runto_main] {
|
|
|
|
fail "Can't run to main to check for trace support"
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
|
|
|
|
if ![gdb_target_supports_trace] {
|
|
|
|
unsupported "target does not support trace"
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
|
|
|
|
gdb_test "trace foo" "Tracepoint $decimal at .*"
|
|
|
|
|
|
|
|
if [is_amd64_regs_target] {
|
|
|
|
set spreg "\$rsp"
|
|
|
|
} elseif [is_x86_like_target] {
|
|
|
|
set spreg "\$esp"
|
|
|
|
} else {
|
|
|
|
set spreg "\$sp"
|
|
|
|
}
|
|
|
|
|
|
|
|
# Collect arguments i and j. Collect 'global1' which is entry value
|
|
|
|
# of argument i. Don't collect 'global2' to test the entry value of
|
|
|
|
# argument j.
|
|
|
|
|
|
|
|
gdb_trace_setactions "set action for tracepoint 1" "" \
|
|
|
|
"collect i, j, global1, \(\*\(void \*\*\) \($spreg\)\) @ 64" "^$"
|
|
|
|
|
|
|
|
gdb_test_no_output "tstart"
|
|
|
|
|
|
|
|
gdb_breakpoint "end"
|
|
|
|
gdb_continue_to_breakpoint "end"
|
|
|
|
|
|
|
|
gdb_test_no_output "tstop"
|
|
|
|
|
|
|
|
gdb_test "tfind" "Found trace frame 0, .*" "tfind start"
|
|
|
|
|
|
|
|
# Since 'global2' is not collected, j@entry is expected to be 'unavailable'.
|
|
|
|
gdb_test "bt 1" "#0 .* foo \\(i=\[-\]?$decimal, i@entry=2, j=\[-\]?$decimal, j@entry=<unavailable>\\).*"
|
|
|
|
|
Add options to skip unavailable locals
This is the patch to add new option '--skip-unavailable' to MI
commands '-stack-list-{locals, arguments, variables}'. This patch
extends list_args_or_locals to add a new parameter 'skip_unavailable',
and don't list locals or arguments if values are unavailable and
'skip_unavailable' is true.
This is inspecting a trace frame (tfind mode), where only a few
locals have been collected.
-stack-list-locals, no switch vs new switch:
-stack-list-locals --simple-values
^done,locals=[{name="array",type="unsigned char [2]"},{name="i",type="int",value="<unavailable>"}]
-stack-list-locals --skip-unavailable --simple-values
^done,locals=[{name="array",type="unsigned char [2]"}]
-stack-list-arguments, no switch vs new switch:
-stack-list-arguments --simple-values
^done,stack-args=[frame={level="0",args=[{name="j",type="int",value="4"},{name="s",type="char *",value="<unavailable>"}]},frame={level="1",args=[]}]
-stack-list-arguments --skip-unavailable --simple-values
^done,stack-args=[frame={level="0",args=[{name="j",type="int",value="4"}]},frame={level="1",args=[]}]
-stack-list-variables, no switch vs new switch:
-stack-list-variables --simple-values
^done,variables=[{name="j",arg="1",type="int",value="4"},{name="s",arg="1",type="char *",value="<unavailable>"},{name="array",type="unsigned char [2]"},{name="i",type="int",value="<unavailable>"}]
-stack-list-variables --skip-unavailable --simple-values
^done,variables=[{name="j",arg="1",type="int",value="4"},{name="array",type="unsigned char [2]"}]
tests are added to test these new options.
gdb:
2013-08-27 Pedro Alves <pedro@codesourcery.com>
Yao Qi <yao@codesourcery.com>
* mi/mi-cmd-stack.c (list_args_or_locals): Adjust prototype.
(parse_no_frames_option): Remove.
(mi_cmd_stack_list_locals): Handle --skip-unavailable.
(mi_cmd_stack_list_args): Adjust.
(mi_cmd_stack_list_variables): Handle --skip-unavailable.
(list_arg_or_local): Add new parameter 'skip_unavailable'. Return
early if SKIP_UNAVAILABLE is true and ARG->val is unavailable.
Caller update.
(list_args_or_locals): New parameter 'skip_unavailable'.
Handle it.
* valprint.c (scalar_type_p): Rename to ...
(val_print_scalar_type_p): ... this. Make extern.
(val_print, value_check_printable): Adjust.
* valprint.h (val_print_scalar_type_p): Declare.
* value.c (value_entirely_unavailable): New function.
* value.h (value_entirely_unavailable): Declare.
* NEWS: Mention the new option "--skip-unavailable" to MI
commands '-stack-list-locals', '-stack-list-arguments' and
'-stack-list-variables'.
gdb/doc:
2013-08-27 Pedro Alves <pedro@codesourcery.com>
Yao Qi <yao@codesourcery.com>
* gdb.texinfo (GDB/MI Stack Manipulation) <-stack-list-locals>:
Document new --skip-unavailable option.
<-stack-list-variables>: Document new --skip-unavailable option.
gdb/testsuite:
2013-08-27 Yao Qi <yao@codesourcery.com>
* gdb.trace/entry-values.exp: Test unavailable entry value is
not shown when option '--skip-unavailable' is specified.
* gdb.trace/mi-trace-unavailable.exp (test_trace_unavailable):
Add tests for new option '--skip-unavailable'.
2013-08-27 07:20:57 +02:00
|
|
|
# Test that unavailable "j@entry" is not shown when command option
|
|
|
|
# --skip-unavailable is used.
|
|
|
|
gdb_test "interpreter-exec mi \"-stack-list-arguments --skip-unavailable --simple-values\"" \
|
|
|
|
"\r\n\\^done,stack-args=\\\[frame={level=\"0\",args=\\\[{name=\"i\",type=\"int\",value=\".*\"},{name=\"i@entry\",type=\"int\",value=\"2\"},{name=\"j\",type=\"int\",value=\".*\"}\\\]},frame=.*\\\].*"
|
|
|
|
|
2013-08-24 03:54:59 +02:00
|
|
|
gdb_test "tfind" "Target failed to find requested trace frame\..*"
|