Remove duplicated code on checking address 0x0 is accessiable
I find some gdb.python tests fail on arm-none-eabi target, because the tests assume that memory on address 0x is inaccessible. Some tests (in gdb.base) are aware of this, so do a "x 0" check first. However, the code is copy-n-paste. This patch is to move the "x 0" check to a procedure in lib/gdb.exp, and get needed tests call it. The original code matches pattern "0x0:\[ \t\]*Error accessing memory address 0x0\r\n$gdb_prompt $", but I remove it from the new proc is_address_zero_readable, because GDB doesn't emit such message any more. gdb/testsuite: 2014-08-09 Yao Qi <yao@codesourcery.com> * gdb.base/display.exp: Invoke is_address_zero_readable. * gdb.guile/scm-value.exp (test_value_in_inferior): Likewise. * gdb.python/py-value.exp (test_value_in_inferior): Likewise. * gdb.base/hbreak-unmapped.exp: Return if is_address_zero_readable returns true. * gdb.base/signest.exp: Likewise. * gdb.base/signull.exp: Likewise. * gdb.base/sigbpt.exp: Likewise. * gdb.guile/scm-disasm.exp: Do the test if is_address_zero_readable returns false. * gdb.guile/scm-pretty-print.exp (run_lang_tests): Likewise. * gdb.python/py-arch.exp: Likewise. * gdb.python/py-prettyprint.exp (run_lang_tests): Likewise. * lib/gdb.exp (is_address_zero_readable): New proc.
This commit is contained in:
Yao Qi
parent
5792e8e37b
commit
20c6f1e176
|
|
@ -1,3 +1,20 @@
|
|||
2014-08-09 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
* gdb.base/display.exp: Invoke is_address_zero_readable.
|
||||
* gdb.guile/scm-value.exp (test_value_in_inferior): Likewise.
|
||||
* gdb.python/py-value.exp (test_value_in_inferior): Likewise.
|
||||
* gdb.base/hbreak-unmapped.exp: Return if
|
||||
is_address_zero_readable returns true.
|
||||
* gdb.base/signest.exp: Likewise.
|
||||
* gdb.base/signull.exp: Likewise.
|
||||
* gdb.base/sigbpt.exp: Likewise.
|
||||
* gdb.guile/scm-disasm.exp: Do the test if
|
||||
is_address_zero_readable returns false.
|
||||
* gdb.guile/scm-pretty-print.exp (run_lang_tests): Likewise.
|
||||
* gdb.python/py-arch.exp: Likewise.
|
||||
* gdb.python/py-prettyprint.exp (run_lang_tests): Likewise.
|
||||
* lib/gdb.exp (is_address_zero_readable): New proc.
|
||||
|
||||
2014-08-09 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
PR testsuite/13443
|
||||
|
|
|
|||
|
|
@ -106,14 +106,7 @@ gdb_test "undisp" \
|
|||
# Test displaying a variable that is temporarily at a bad address.
|
||||
# But if we can examine what's at memory address 0, then we'll also be
|
||||
# able to display it without error. Don't run the test in that case.
|
||||
set can_read_0 0
|
||||
gdb_test_multiple "x 0" "memory at address 0" {
|
||||
-re "0x0:.*Cannot access memory at address 0x0.*$gdb_prompt $" { }
|
||||
-re "0x0:.*Error accessing memory address 0x0.*$gdb_prompt $" { }
|
||||
-re ".*$gdb_prompt $" {
|
||||
set can_read_0 1
|
||||
}
|
||||
}
|
||||
set can_read_0 [is_address_zero_readable]
|
||||
|
||||
if { !$can_read_0 } {
|
||||
gdb_test "disp *p_i" ".*: \\*p_i = 0"
|
||||
|
|
|
|||
|
|
@ -29,13 +29,9 @@ if ![runto_main] {
|
|||
}
|
||||
|
||||
# If we can read the memory at address 0, skip the test.
|
||||
gdb_test_multiple "x 0" "memory at address 0" {
|
||||
-re "0x0:.*Cannot access memory at address 0x0.*$gdb_prompt $" { }
|
||||
-re "0x0:.*Error accessing memory address 0x0.*$gdb_prompt $" { }
|
||||
-re ".*$gdb_prompt $" {
|
||||
untested "Memory at address 0 is readable"
|
||||
return
|
||||
}
|
||||
if { [is_address_zero_readable] } {
|
||||
untested "Memory at address 0 is readable"
|
||||
return
|
||||
}
|
||||
|
||||
delete_breakpoints
|
||||
|
|
|
|||
|
|
@ -55,13 +55,9 @@ if ![runto_main] then {
|
|||
# especially on targets without an MMU. Don't run the tests in that
|
||||
# case.
|
||||
|
||||
gdb_test_multiple "x 0" "memory at address 0" {
|
||||
-re "0x0:.*Cannot access memory at address 0x0.*$gdb_prompt $" { }
|
||||
-re "0x0:.*Error accessing memory address 0x0.*$gdb_prompt $" { }
|
||||
-re ".*$gdb_prompt $" {
|
||||
untested "Memory at address 0 is possibly executable"
|
||||
return
|
||||
}
|
||||
if { [is_address_zero_readable] } {
|
||||
untested "Memory at address 0 is possibly executable"
|
||||
return
|
||||
}
|
||||
|
||||
gdb_test "break keeper"
|
||||
|
|
|
|||
|
|
@ -38,13 +38,9 @@ if ![runto_main] then {
|
|||
# especially on targets without an MMU. Don't run the tests in that
|
||||
# case.
|
||||
|
||||
gdb_test_multiple "x 0" "memory at address 0" {
|
||||
-re "0x0:.*Cannot access memory at address 0x0.*$gdb_prompt $" { }
|
||||
-re "0x0:.*Error accessing memory address 0x0.*$gdb_prompt $" { }
|
||||
-re ".*$gdb_prompt $" {
|
||||
untested "Memory at address 0 is possibly executable"
|
||||
return -1
|
||||
}
|
||||
if { [is_address_zero_readable] } {
|
||||
untested "Memory at address 0 is possibly executable"
|
||||
return -1
|
||||
}
|
||||
|
||||
# Run until we hit the SIGSEGV (or SIGBUS on some platforms).
|
||||
|
|
|
|||
|
|
@ -56,13 +56,9 @@ if ![runto_main] then {
|
|||
# especially on targets without an MMU. Don't run the tests in that
|
||||
# case.
|
||||
|
||||
gdb_test_multiple "x 0" "memory at address 0" {
|
||||
-re "0x0:.*Cannot access memory at address 0x0.*$gdb_prompt $" { }
|
||||
-re "0x0:.*Error accessing memory address 0x0.*$gdb_prompt $" { }
|
||||
-re ".*$gdb_prompt $" {
|
||||
untested "Memory at address 0 is possibly executable"
|
||||
return
|
||||
}
|
||||
if { [is_address_zero_readable] } {
|
||||
untested "Memory at address 0 is possibly executable"
|
||||
return
|
||||
}
|
||||
|
||||
# If an attempt to call a NULL pointer leaves the inferior in main,
|
||||
|
|
|
|||
|
|
@ -83,9 +83,11 @@ gdb_test "guile (print (length insn-list4))" \
|
|||
|
||||
test_disassemble_1 "basic" "pc" ""
|
||||
|
||||
# Negative test
|
||||
gdb_test "guile (arch-disassemble arch 0 #:size 1)" \
|
||||
"ERROR: Cannot access memory at address 0x.*" "test bad memory access"
|
||||
if { ![is_address_zero_readable] } {
|
||||
# Negative test
|
||||
gdb_test "guile (arch-disassemble arch 0 #:size 1)" \
|
||||
"ERROR: Cannot access memory at address 0x.*" "test bad memory access"
|
||||
}
|
||||
|
||||
# Test disassembly through a port.
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,9 @@ proc run_lang_tests {exefile lang} {
|
|||
gdb_scm_test_silent_cmd "set print elements 200" "" 1
|
||||
}
|
||||
|
||||
gdb_test "print ns2" "<error reading variable: ERROR: Cannot access memory at address 0x0>"
|
||||
if { ![is_address_zero_readable] } {
|
||||
gdb_test "print ns2" "<error reading variable: ERROR: Cannot access memory at address 0x0>"
|
||||
}
|
||||
|
||||
gdb_test "print x" " = \"this is x\""
|
||||
gdb_test "print cstring" " = \"const string\""
|
||||
|
|
|
|||
|
|
@ -105,14 +105,7 @@ proc test_value_in_inferior {} {
|
|||
# Test displaying a variable that is temporarily at a bad address.
|
||||
# But if we can examine what's at memory address 0, then we'll also be
|
||||
# able to display it without error. Don't run the test in that case.
|
||||
set can_read_0 0
|
||||
gdb_test_multiple "x 0" "memory at address 0" {
|
||||
-re "0x0:\[ \t\]*Cannot access memory at address 0x0\r\n$gdb_prompt $" { }
|
||||
-re "0x0:\[ \t\]*Error accessing memory address 0x0\r\n$gdb_prompt $" { }
|
||||
-re "\r\n$gdb_prompt $" {
|
||||
set can_read_0 1
|
||||
}
|
||||
}
|
||||
set can_read_0 [is_address_zero_readable]
|
||||
|
||||
# Test memory error.
|
||||
set test "parse_and_eval with memory error"
|
||||
|
|
|
|||
|
|
@ -57,6 +57,8 @@ gdb_test "python print (\"addr\" in insn)" "True" "test key addr"
|
|||
gdb_test "python print (\"asm\" in insn)" "True" "test key asm"
|
||||
gdb_test "python print (\"length\" in insn)" "True" "test key length"
|
||||
|
||||
# Negative test
|
||||
gdb_test "python arch.disassemble(0, 0)" ".*gdb\.MemoryError.*" \
|
||||
"test bad memory access"
|
||||
if { ![is_address_zero_readable] } {
|
||||
# Negative test
|
||||
gdb_test "python arch.disassemble(0, 0)" ".*gdb\.MemoryError.*" \
|
||||
"test bad memory access"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,7 +83,10 @@ proc run_lang_tests {exefile lang} {
|
|||
gdb_py_test_silent_cmd "set print elements 200" "" 1
|
||||
}
|
||||
|
||||
gdb_test "print ns2" ".error reading variable: Cannot access memory at address 0x0."
|
||||
if { ![is_address_zero_readable] } {
|
||||
gdb_test "print ns2" \
|
||||
".error reading variable: Cannot access memory at address 0x0."
|
||||
}
|
||||
|
||||
gdb_test "print x" " = \"this is x\""
|
||||
gdb_test "print cstring" " = \"const string\""
|
||||
|
|
|
|||
|
|
@ -234,14 +234,7 @@ proc test_value_in_inferior {} {
|
|||
# Test displaying a variable that is temporarily at a bad address.
|
||||
# But if we can examine what's at memory address 0, then we'll also be
|
||||
# able to display it without error. Don't run the test in that case.
|
||||
set can_read_0 0
|
||||
gdb_test_multiple "x 0" "memory at address 0" {
|
||||
-re "0x0:\[ \t\]*Cannot access memory at address 0x0\r\n$gdb_prompt $" { }
|
||||
-re "0x0:\[ \t\]*Error accessing memory address 0x0\r\n$gdb_prompt $" { }
|
||||
-re "\r\n$gdb_prompt $" {
|
||||
set can_read_0 1
|
||||
}
|
||||
}
|
||||
set can_read_0 [is_address_zero_readable]
|
||||
|
||||
# Test memory error.
|
||||
set test "parse_and_eval with memory error"
|
||||
|
|
|
|||
|
|
@ -1946,6 +1946,24 @@ gdb_caching_proc is_elf_target {
|
|||
return 1
|
||||
}
|
||||
|
||||
# Return 1 if the memory at address zero is readable.
|
||||
|
||||
gdb_caching_proc is_address_zero_readable {
|
||||
global gdb_prompt
|
||||
|
||||
set ret 0
|
||||
gdb_test_multiple "x 0" "" {
|
||||
-re "Cannot access memory at address 0x0.*$gdb_prompt $" {
|
||||
set ret 0
|
||||
}
|
||||
-re ".*$gdb_prompt $" {
|
||||
set ret 1
|
||||
}
|
||||
}
|
||||
|
||||
return $ret
|
||||
}
|
||||
|
||||
# Produce source file NAME and write SOURCES into it.
|
||||
|
||||
proc gdb_produce_source { name sources } {
|
||||
|
|
|
|||
Loading…
Reference in New Issue