This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[ob] Kill some dead code in arm-tdep.c
- From: Daniel Jacobowitz <drow at false dot org>
- To: gdb-patches at sources dot redhat dot com
- Cc: Richard Earnshaw <Richard dot Earnshaw at arm dot com>
- Date: Fri, 25 Mar 2005 16:32:40 -0500
- Subject: [ob] Kill some dead code in arm-tdep.c
arm_pc_is_thumb_dummy can never return anything but 0; it depends on a
global variable that is no longer set. The setter went away sometime
between 2002 and 2004. The only thing it can do now is call read_sp;
and sometimes, when it's called, there are no registers. So GDB works
better if the entire function is removed.
Committed as obvious, HEAD and csl-arm-20050325-branch.
--
Daniel Jacobowitz
CodeSourcery, LLC
2005-03-25 Daniel Jacobowitz <dan@codesourcery.com>
* arm-tdep.c (target_is_thumb, caller_is_thumb)
(arm_pc_is_thumb_dummy): Remove.
(arm_breakpoint_from_pc): Don't call arm_pc_is_thumb_dummy.
Index: gdb/arm-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/arm-tdep.c,v
retrieving revision 1.194.2.1
diff -u -p -r1.194.2.1 arm-tdep.c
--- gdb/arm-tdep.c 25 Mar 2005 21:09:23 -0000 1.194.2.1
+++ gdb/arm-tdep.c 25 Mar 2005 21:25:30 -0000
@@ -184,20 +184,6 @@ struct arm_prologue_cache
int arm_apcs_32 = 1;
-/* Flag set by arm_fix_call_dummy that tells whether the target
- function is a Thumb function. This flag is checked by
- arm_push_arguments. FIXME: Change the PUSH_ARGUMENTS macro (and
- its use in valops.c) to pass the function address as an additional
- parameter. */
-
-static int target_is_thumb;
-
-/* Flag set by arm_fix_call_dummy that tells whether the calling
- function is a Thumb function. This flag is checked by
- arm_pc_is_thumb. */
-
-static int caller_is_thumb;
-
/* Determine if the program counter specified in MEMADDR is in a Thumb
function. */
@@ -222,27 +208,6 @@ arm_pc_is_thumb (CORE_ADDR memaddr)
}
}
-/* Determine if the program counter specified in MEMADDR is in a call
- dummy being called from a Thumb function. */
-
-int
-arm_pc_is_thumb_dummy (CORE_ADDR memaddr)
-{
- CORE_ADDR sp = read_sp ();
-
- /* FIXME: Until we switch for the new call dummy macros, this heuristic
- is the best we can do. We are trying to determine if the pc is on
- the stack, which (hopefully) will only happen in a call dummy.
- We hope the current stack pointer is not so far alway from the dummy
- frame location (true if we have not pushed large data structures or
- gone too many levels deep) and that our 1024 is not enough to consider
- code regions as part of the stack (true for most practical purposes). */
- if (deprecated_pc_in_call_dummy (memaddr))
- return caller_is_thumb;
- else
- return 0;
-}
-
/* Remove useless bits from addresses in a running program. */
static CORE_ADDR
arm_addr_bits_remove (CORE_ADDR val)
@@ -2016,7 +1981,7 @@ arm_breakpoint_from_pc (CORE_ADDR *pcptr
{
struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
- if (arm_pc_is_thumb (*pcptr) || arm_pc_is_thumb_dummy (*pcptr))
+ if (arm_pc_is_thumb (*pcptr))
{
*pcptr = UNMAKE_THUMB_ADDR (*pcptr);
*lenptr = tdep->thumb_breakpoint_size;