diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/arm-tdep.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.arch/arm-bl-branch-dest.c | 29 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp | 37 |
5 files changed, 77 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e553b41..42bc3a1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-04-22 Andrew Haley <aph@redhat.com> + + * arm-tdep.c (BranchDest): Cast result as "unsigned long", + instead of "long". + 2013-04-20 Yao Qi <yao@codesourcery.com> * ctf.c (ctf_fetch_registers): Change the type of 'regs' from diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index e353717..b169e35 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -521,7 +521,7 @@ skip_prologue_function (struct gdbarch *gdbarch, CORE_ADDR pc, int is_thumb) #define sbits(obj,st,fn) \ ((long) (bits(obj,st,fn) | ((long) bit(obj,fn) * ~ submask (fn - st)))) #define BranchDest(addr,instr) \ - ((CORE_ADDR) (((long) (addr)) + 8 + (sbits (instr, 0, 23) << 2))) + ((CORE_ADDR) (((unsigned long) (addr)) + 8 + (sbits (instr, 0, 23) << 2))) /* Extract the immediate from instruction movw/movt of encoding T. INSN1 is the first 16-bit of instruction, and INSN2 is the second 16-bit of diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d262b81..618e3d3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-04-22 Sergio Durigan Junior <sergiodj@redhat.com> + + * gdb.arch/arm-bl-branch-dest.c: New file. + * gdb.arch/arm-bl-branch-dest.exp: Likewise. + 2013-04-19 Vladimir Kargov <kargov@gmail.com> Pedro Alves <palves@redhat.com> diff --git a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.c b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.c new file mode 100644 index 0000000..98269d0 --- /dev/null +++ b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.c @@ -0,0 +1,29 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2013 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/>. */ + +static void +foo (int a) +{ + ++a; +} + +int +main (int argc, char *argv[]) +{ + foo (10); + return 0; +} diff --git a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp new file mode 100644 index 0000000..1e433f3 --- /dev/null +++ b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp @@ -0,0 +1,37 @@ +# Copyright (C) 2013 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/>. + +if { ![istarget "arm*-*-*"] } { + verbose "Skipping ${testfile}." + return +} + +standard_testfile + +# We need to load the text segment in a high address. This is because +# the bug we are dealing with happened when GDB sign-extended the PC +# on ARM, causing the PC to acquire a wrong value. That's why we use +# the "-Wl,-Ttext-segment" option compile the binary. + +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ + [list debug additional_flags=-Wl,-Ttext-segment=0xb0000000]] } { + return -1 +} + +if { ![runto_main] } { + return -1 +} + +gdb_test "next" "\[0-9\]+\\s+return 0;" |