Re: [try 2nd 7/8] Test case

Yao Qi
2011-05-05T13:26:29Z

[-- Attachment #1: Type: text/plain, Size: 134 bytes --]

On 03/24/2011 10:05 PM, Yao Qi wrote:
> Test cases for Thumb displaced stepping.
>

Here is the updated one.

--
Yao (é½å°§)

[-- Attachment #2: 0003-test-cases.patch --]
[-- Type: text/x-patch, Size: 11008 bytes --]

gdb/testsuite/

2011-05-05 Yao Qi <yao@codesourcery.com>

* gdb.arch/arm-disp-step.S (test_ldr_literal): Test for Thumb
instructions.
(test_adr_32bit, test_pop_pc): Likewise.
(test_ldr_literal_16, test_cbz_cbnz, test_adr): New test for
Thumb instructions.
* gdb.arch/arm-disp-step.exp (test_ldm_stm_pc): Match $gdb_prompt
in gdb_test_multiple.
(test_ldr_literal_16, test_cbz_cbnz, test_adr): New.

---
gdb/testsuite/gdb.arch/arm-disp-step.S | 90 ++++++++++++++--
gdb/testsuite/gdb.arch/arm-disp-step.exp | 171 ++++++++++++++++++++++-------
2 files changed, 209 insertions(+), 52 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.S b/gdb/testsuite/gdb.arch/arm-disp-step.S
index fa69e31..61f695b 100644
--- a/gdb/testsuite/gdb.arch/arm-disp-step.S
+++ b/gdb/testsuite/gdb.arch/arm-disp-step.S
@@ -48,20 +48,32 @@ test_ret_end:
bl test_ldm_stm_pc
#endif

- /* Test ldrX literal in ARM */
-#if !defined (__thumb__)
+ /* Test ldrX literal in ARM and Thumb-2 */
+#if !defined (__thumb__) || defined(__thumb2__)
bl test_ldr_literal
#endif

- /* Test 32-bit adr in ARM */
-#if !defined(__thumb__)
- bl test_adr_32bit
+ /* Test ldr literal in Thumb */
+#if defined(__thumb__)
+ bl test_ldr_literal_16
#endif

-#if !defined(__thumb__)
- bl test_pop_pc
+ /* Test cbnz/cbz in Thumb-2 */
+#if defined(__thumb2__)
+ bl test_cbz_cbnz
#endif

+ /* Test adr in Thumb and Thumb-2 */
+#if defined(__thumb__)
+ bl test_adr
+#endif
+ /* Test 32-bit adr in ARM and Thumb-2 */
+#if defined(__thumb2__) || !defined(__thumb__)
+ bl test_adr_32bit
+#endif
+
+ bl test_pop_pc
+
/* Test str in ARM mode and Thumb-2 */
#if !defined(__thumb__)
bl test_str_pc
@@ -136,8 +148,8 @@ test_ldm_stm_pc_ret:
.word test_ldm_stm_pc_ret
.size test_ldm_stm_pc, .-test_ldm_stm_pc
#endif
-
-#if !defined (__thumb__)
+
+#if !defined (__thumb__) || defined(__thumb2__)
.global test_ldr_literal
.type test_ldr_literal, %function
test_ldr_literal:
@@ -154,8 +166,66 @@ test_ldr_literal_end:
.size test_ldr_literal, .-test_ldr_literal
#endif

+#if defined(__thumb__)
+ .global test_ldr_literal_16
+ .code 16
+ .thumb_func
+test_ldr_literal_16:
+ ldr r0, .L2
+ .global test_ldr_literal_16_end
+test_ldr_literal_16_end:
+ bx lr
+ .align 2
+.L2:
+ .word test_ldr_literal_16
+ .size test_ldr_literal_16, .-test_ldr_literal_16
+#endif

-#if !defined(__thumb__)
+#if defined(__thumb2__)
+ .global test_cbz_cbnz
+ .code 16
+ .thumb_func
+test_cbz_cbnz:
+ movs r0, #0
+ .global test_zero_cbnz
+test_zero_cbnz:
+ cbnz r0, .L3
+ .global test_zero_cbz
+test_zero_cbz:
+ cbz r0, .L3
+.L3:
+ movs r0, #1
+ .global test_non_zero_cbz
+test_non_zero_cbz:
+ cbz r0, .L4
+ .global test_non_zero_cbnz
+test_non_zero_cbnz:
+ cbnz r0, .L4
+ nop
+.L4:
+ .global test_cbz_cbnz_end
+test_cbz_cbnz_end:
+ bx lr
+ .size test_cbz_cbnz, .-test_cbz_cbnz
+#endif
+
+#if defined(__thumb__)
+ .global test_adr
+ .code 16
+ .thumb_func
+test_adr:
+ adr r0, .L8
+ nop
+ nop
+ nop
+.L8:
+ .global test_adr_end
+test_adr_end:
+ bx lr
+ .size test_adr, .-test_adr
+#endif
+
+#if defined(__thumb2__) || !defined(__thumb__)
.global test_adr_32bit
#if defined(__thumb2__)
.code 16
diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp
index 0427a04..4ae70f6 100644
--- a/gdb/testsuite/gdb.arch/arm-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp
@@ -42,15 +42,17 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
# Test ldm/stm related to PC.
proc test_ldm_stm_pc {} {
global srcfile
+ global gdb_prompt
+
# Try to set breakpoint on test_ldm_stm_pc. If symbol 'test_ldm_stm_pc'
# can't be resolved, test case is compiled in Thumb mode, skip it.
gdb_test_multiple "break *test_ldm_stm_pc" "break test_ldm_stm_pc" {
- -re "Breakpoint.*at.* file .*$srcfile, line.*" {
+ -re "Breakpoint.*at.* file .*$srcfile, line.*\r\n$gdb_prompt $" {
pass "break test_ldm_stm_pc"
}
- -re "Function \"test_ldm_stm_pc\" not defined\..*Make breakpoint pending on future shared library load.*y or .n.. $" {
- gdb_test "n" "" "Test case is compiled in Thumb mode"
- return
+ -re "No symbol.*\r\n$gdb_prompt $" {
+ pass "break test_ldm_stm_pc"
+ return 0
}
}

@@ -104,10 +106,38 @@ proc test_ldr_literal {} {
".*bx lr.*"
}

+proc test_ldr_literal_16 {} {
+ global srcfile
+ global gdb_prompt
+
+ gdb_test_multiple "break *test_ldr_literal_16" "break test_ldr_literal_16" {
+ -re "Breakpoint.*at.* file .*$srcfile, line.*\r\n$gdb_prompt $" {
+ pass "break test_ldr_literal"
+ }
+ -re "No symbol.*\r\n$gdb_prompt $" {
+ return 0
+ }
+ }
+ gdb_test "break *test_ldr_literal_16_end" \
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_ldr_literal_16_end"
+
+ gdb_continue_to_breakpoint "continue to test_ldr_literal_16" \
+ ".*ldr.*r0\,.*L2.*"
+ gdb_continue_to_breakpoint "continue to test_ldr_literal_16_end" \
+ ".*bx lr.*"
+}
+
##########################################
# Test call/ret.
proc test_call_ret {} {
global srcfile
+ global testfile
+
+ gdb_test "break *test_call" \
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_call"
+
gdb_test "break *test_call_end" \
"Breakpoint.*at.* file .*$srcfile, line.*" \
"break test_call_end"
@@ -118,9 +148,10 @@ proc test_call_ret {} {
"Breakpoint.*at.* file .*$srcfile, line.*" \
"break test_ret_end"

- gdb_continue_to_breakpoint "continue to test_call_end" \
+ gdb_continue_to_breakpoint "test_call" ".*bl test_call_subr.*"
+ gdb_continue_to_breakpoint "test_call_end" \
".*@ Location test_call_end.*"
- gdb_continue_to_breakpoint "continue to test_ret" \
+ gdb_continue_to_breakpoint "test_ret" \
".*bx lr.*"
gdb_continue_to_breakpoint "continue to test_ret_end" \
".*@ Location test_ret_end.*"
@@ -158,7 +189,68 @@ proc test_ldr_from_pc {} {

gdb_continue_to_breakpoint "continue to test_ldr_pc" \
".*ldr.*r1\,.*\[pc, #0\].*"
- gdb_continue_to_breakpoint "continue to Lbranch" \
+ gdb_continue_to_breakpoint "continue to test_ldr_pc_ret" \
+ ".*bx lr.*"
+}
+
+#########################################
+
+# Test cbz and cbnz
+proc test_cbz_cbnz {} {
+ global srcfile
+ global gdb_prompt
+
+ gdb_test_multiple "break *test_zero_cbnz" "break test_zero_cbnz" {
+ -re "Breakpoint.*at.* file .*$srcfile, line.*\r\n$gdb_prompt $" {
+ pass "break test_ldr_literal"
+ }
+ -re "No symbol.*\r\n$gdb_prompt $" {
+ return 0
+ }
+ }
+
+ gdb_test "break *test_zero_cbz" \
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_zero_cbz"
+ gdb_test "break *test_non_zero_cbnz" \
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_non_zero_cbnz"
+ gdb_test "break *test_non_zero_cbz" \
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_non_zero_cbz"
+
+ gdb_continue_to_breakpoint "continue to test_zero_cbnz" \
+ ".*cbnz.*r0\,.*\.L3.*"
+ gdb_continue_to_breakpoint "continue to test_zero_cbz" \
+ ".*cbz.*r0\,.*\.L3.*"
+ gdb_continue_to_breakpoint "continue to test_non_zero_cbz" \
+ ".*cbz.*r0\,.*\.L4.*"
+ gdb_continue_to_breakpoint "continue to test_non_zero_cbnz" \
+ ".*cbnz.*r0\,.*\.L4.*"
+}
+
+# Test adr
+
+proc test_adr {} {
+ global srcfile
+ global gdb_prompt
+
+ gdb_test_multiple "break *test_adr" "break test_adr" {
+ -re "Breakpoint.*at.* file .*$srcfile, line.*\r\n$gdb_prompt $" {
+ pass "break test_adr"
+ }
+ -re "No symbol.*\r\n$gdb_prompt $" {
+ return 0
+ }
+ }
+
+ gdb_test "break *test_adr_end" \
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_adr_end"
+
+ gdb_continue_to_breakpoint "test_adr" \
+ ".*adr.*r0\,.*\.L8.*"
+ gdb_continue_to_breakpoint "test_adr_end" \
".*bx lr.*"
}

@@ -167,28 +259,28 @@ proc test_adr_32bit {} {
global gdb_prompt

gdb_test_multiple "break *test_adr_32bit" "break test_adr_32bit" {
- -re "Breakpoint.*at.* file .*$srcfile, line.*\r\n$gdb_prompt $" {
- pass "break test_adr"
- }
- -re "No symbol.*\r\n$gdb_prompt $" {
- return 0
- }
+ -re "Breakpoint.*at.* file .*$srcfile, line.*\r\n$gdb_prompt $" {
+ pass "break test_adr"
+ }
+ -re "No symbol.*\r\n$gdb_prompt $" {
+ return 0
+ }
}

gdb_test "break *test_adr_32bit_after" \
- "Breakpoint.*at.* file .*$srcfile, line.*" \
- "break test_adr_32bit_after"
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_adr_32bit_after"

gdb_test "break *test_adr_32bit_end" \
- "Breakpoint.*at.* file .*$srcfile, line.*" \
- "break test_adr_32bit_end"
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_adr_32bit_end"

gdb_continue_to_breakpoint "test_adr_32bit" \
- ".*adr.*r0\,.*\.L6.*"
+ ".*adr.*r0\,.*\.L6.*"
gdb_continue_to_breakpoint "test_adr_32bit_after" \
- ".*adr.*r0\,.*\.L6.*"
+ ".*adr.*r0\,.*\.L6.*"
gdb_continue_to_breakpoint "test_adr_32bit_end" \
- ".*bx lr.*"
+ ".*bx lr.*"
}

#########################################
@@ -196,27 +288,29 @@ proc test_adr_32bit {} {
proc test_pop_pc {} {
global srcfile
gdb_test "break *test_pop_pc_1" \
- "Breakpoint.*at.* file .*$srcfile, line.*" \
- "break test_pop_pc"
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_pop_pc"
gdb_test "break *test_pop_pc_ret" \
- "Breakpoint.*at.* file .*$srcfile, line.*" \
- "break test_pop_pc_ret"
+ "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "break test_pop_pc_ret"

gdb_continue_to_breakpoint "continue to test_pop_pc" \
- ".*b.*\{r1\, pc\}.*"
+ ".*b.*\{r1\, pc\}.*"
gdb_continue_to_breakpoint "continue to test_pop_pc_ret" \
- ".*bx lr.*"
+ ".*bx lr.*"
}

###########################################

proc test_str_pc {} {
global srcfile
+ global gdb_prompt
+
gdb_test_multiple "break *test_str_pc" "break test_str_pc" {
- -re "Breakpoint.*at.* file .*$srcfile, line.*" {
+ -re "Breakpoint.*at.* file .*$srcfile, line.*\r\n$gdb_prompt $" {
pass "break test_str_pc"
}
- -re "No symbol.*" {
+ -re "No symbol.*\r\n$gdb_prompt $" {
pass "break test_str_pc"
return
}
@@ -261,20 +355,6 @@ if ![runto_main] then {
gdb_test_no_output "set displaced-stepping on"
gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"

-gdb_test "break *test_call" \
- "Breakpoint.*at.* file .*$srcfile, line.*" \
- "break test_call"
-
-gdb_test_multiple "continue" "continue to test_call" {
- -re ".*bl test_call_subr.*" {
- pass "continue to test_call"
- }
- -re "Displaced stepping is only supported in" {
- kfail "gdb/NNNN" $testfile
- return
- }
- }
-
test_call_ret

test_branch
@@ -285,11 +365,18 @@ test_ldm_stm_pc

test_ldr_literal

+test_ldr_literal_16
+
+test_cbz_cbnz
+
+test_adr
+
test_adr_32bit

test_pop_pc

test_str_pc
+
##########################################

# Done, run program to exit.
--
1.7.0.4