MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* arm-tdep.c (thumb_get_next_pc_raw): Mask off low bits for bx pc

Browse Source 
and blx pc.

testsuite:
	* gdb.arch/thumb-bx-pc.S: New file.
	* gdb.arch/thumb-bx-pc.exp: New file.
This commit is contained in:
Joseph Myers 2012-08-22 19:47:58 +00:00
parent 8315665ec1
commit 6ca1b14767
5 changed files with 86 additions and 1 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-08-22 Joseph Myers <joseph@codesourcery.com>
* arm-tdep.c (thumb_get_next_pc_raw): Mask off low bits for bx pc
and blx pc.
2012-08-22 Khoo Yit Phang <khooyp@cs.umd.edu>
Add a new "python-interactive" command that starts a standard

2
gdb/arm-tdep.c
View File

@ -4540,7 +4540,7 @@ thumb_get_next_pc_raw (struct frame_info *frame, CORE_ADDR pc)
else if ((inst1 & 0xff00) == 0x4700) /* bx REG, blx REG */
{
if (bits (inst1, 3, 6) == 0x0f)
nextpc = pc_val;
nextpc = UNMAKE_THUMB_ADDR (pc_val);
else
nextpc = get_frame_register_unsigned (frame, bits (inst1, 3, 6));
}

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2012-08-22 Joseph Myers <joseph@codesourcery.com>
* gdb.arch/thumb-bx-pc.S: New file.
* gdb.arch/thumb-bx-pc.exp: New file.
2012-08-22 Tom Tromey <tromey@redhat.com>
* gdb.base/maint.exp: Update.

34
gdb/testsuite/gdb.arch/thumb-bx-pc.S Normal file
View File

@ -0,0 +1,34 @@
/* Test PC adjustment from Thumb-mode "bx pc" instruction.
Copyright 2012 Free Software Foundation, Inc.
This file is part of GDB.
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/>. */
.syntax unified
.thumb
.text
.p2align 2
.global main
.thumb
.thumb_func
.type main, %function
main:
bx pc
nop
.code 32
mov r0, #0
bx lr
.size main, .-main

41
gdb/testsuite/gdb.arch/thumb-bx-pc.exp Normal file
View File

@ -0,0 +1,41 @@
# Copyright 2012 Free Software Foundation, Inc.
# 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/>.
# Test PC adjustment from Thumb-mode "bx pc" instruction.
if {![istarget arm*-*]} then {
verbose "Skipping ARM tests."
return
}
set testfile "thumb-bx-pc"
set srcfile ${testfile}.S
set opts {}
if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] {
untested "Failed to compile $srcfile"
return -1
}
if ![runto_main] then {
untested "could not run to main"
return -1
}
gdb_test "stepi" "$hex in main \\(\\)" "stepi for bx pc"
gdb_test "x /i \$pc" \
"$hex <main\\+4>:\[ \t\]+mov\[ \t\]+r0,\[ \t\]+#0.*" \
"stepi reached correct instruction"