From patchwork Fri Aug 8 11:11:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 2352 Received: (qmail 26610 invoked by alias); 8 Aug 2014 11:15:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 26595 invoked by uid 89); 8 Aug 2014 11:15:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 08 Aug 2014 11:15:30 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1XFi8s-0000d6-Rb from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Fri, 08 Aug 2014 04:15:26 -0700 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 8 Aug 2014 04:15:26 -0700 Received: from qiyao.dyndns.org.com (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.2.247.3; Fri, 8 Aug 2014 04:15:25 -0700 From: Yao Qi To: Subject: [PATCH] Remove duplicated code on checking address 0x0 is accessiable Date: Fri, 8 Aug 2014 19:11:13 +0800 Message-ID: <1407496273-29483-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes 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-08 Yao Qi * 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. --- gdb/testsuite/gdb.base/display.exp | 9 +-------- gdb/testsuite/gdb.base/hbreak-unmapped.exp | 10 +++------- gdb/testsuite/gdb.base/sigbpt.exp | 10 +++------- gdb/testsuite/gdb.base/signest.exp | 10 +++------- gdb/testsuite/gdb.base/signull.exp | 10 +++------- gdb/testsuite/gdb.guile/scm-disasm.exp | 8 +++++--- gdb/testsuite/gdb.guile/scm-pretty-print.exp | 4 +++- gdb/testsuite/gdb.guile/scm-value.exp | 9 +-------- gdb/testsuite/gdb.python/py-arch.exp | 8 +++++--- gdb/testsuite/gdb.python/py-prettyprint.exp | 5 ++++- gdb/testsuite/gdb.python/py-value.exp | 9 +-------- gdb/testsuite/lib/gdb.exp | 18 ++++++++++++++++++ 12 files changed, 50 insertions(+), 60 deletions(-) diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp index a9875e0..b2bb0e7 100644 --- a/gdb/testsuite/gdb.base/display.exp +++ b/gdb/testsuite/gdb.base/display.exp @@ -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" diff --git a/gdb/testsuite/gdb.base/hbreak-unmapped.exp b/gdb/testsuite/gdb.base/hbreak-unmapped.exp index 95668f2..b71770f 100644 --- a/gdb/testsuite/gdb.base/hbreak-unmapped.exp +++ b/gdb/testsuite/gdb.base/hbreak-unmapped.exp @@ -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 diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp index 142e739..b184e9e 100644 --- a/gdb/testsuite/gdb.base/sigbpt.exp +++ b/gdb/testsuite/gdb.base/sigbpt.exp @@ -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" diff --git a/gdb/testsuite/gdb.base/signest.exp b/gdb/testsuite/gdb.base/signest.exp index 258e86e..64ceb72 100644 --- a/gdb/testsuite/gdb.base/signest.exp +++ b/gdb/testsuite/gdb.base/signest.exp @@ -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). diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp index 925c762..64f4e72 100644 --- a/gdb/testsuite/gdb.base/signull.exp +++ b/gdb/testsuite/gdb.base/signull.exp @@ -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, diff --git a/gdb/testsuite/gdb.guile/scm-disasm.exp b/gdb/testsuite/gdb.guile/scm-disasm.exp index 5a1dae3..ccc0c88 100644 --- a/gdb/testsuite/gdb.guile/scm-disasm.exp +++ b/gdb/testsuite/gdb.guile/scm-disasm.exp @@ -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. diff --git a/gdb/testsuite/gdb.guile/scm-pretty-print.exp b/gdb/testsuite/gdb.guile/scm-pretty-print.exp index 555d751..55a2393 100644 --- a/gdb/testsuite/gdb.guile/scm-pretty-print.exp +++ b/gdb/testsuite/gdb.guile/scm-pretty-print.exp @@ -81,7 +81,9 @@ proc run_lang_tests {exefile lang} { gdb_scm_test_silent_cmd "set print elements 200" "" 1 } - gdb_test "print ns2" "" + if { ![is_address_zero_readable] } { + gdb_test "print ns2" "" + } gdb_test "print x" " = \"this is x\"" gdb_test "print cstring" " = \"const string\"" diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp index 425873e..91e1a56 100644 --- a/gdb/testsuite/gdb.guile/scm-value.exp +++ b/gdb/testsuite/gdb.guile/scm-value.exp @@ -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" diff --git a/gdb/testsuite/gdb.python/py-arch.exp b/gdb/testsuite/gdb.python/py-arch.exp index a49d50a..554f05f 100644 --- a/gdb/testsuite/gdb.python/py-arch.exp +++ b/gdb/testsuite/gdb.python/py-arch.exp @@ -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" +} diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp index 491b52d..1096389 100644 --- a/gdb/testsuite/gdb.python/py-prettyprint.exp +++ b/gdb/testsuite/gdb.python/py-prettyprint.exp @@ -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\"" diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp index 13433fd..0728266 100644 --- a/gdb/testsuite/gdb.python/py-value.exp +++ b/gdb/testsuite/gdb.python/py-value.exp @@ -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" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 8cb98ae..92069c9 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -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 } {