OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2004-05-01 Andrew Cagney <cagney@redhat.com>

Browse Source 
* frv-linux-tdep.c: Include "trad-frame.h" and "frame-unwind.h".
	(frv_linux_sigtramp_frame_cache)
	(frv_linux_sigtramp_frame_this_id)
	(frv_linux_sigtramp_frame_prev_register)
	(frv_linux_sigtramp_frame_unwind)
	(frv_linux_sigtramp_frame_sniffer): Copied from frv-tdep.c,
	include "linux" in function and variable names, directly call
	frv_linux_pc_in_sigtramp and frv_linux_sigcontext_reg_addr, use
	the latest trad-frame code.
	(frv_linux_init_abi): Append frv_linux_sigtramp_frame_sniffer, do
	not set frv_sigcontext_reg_addr or deprecated_pc_in_sigtramp
	* Makefile.in (frv-linux-tdep.o): Update dependencies.
	* frv-tdep.h (frv_set_sigcontext_reg_addr): Delete declaration.
	* frv-tdep.c (frv_sigtramp_frame_cache)
	(frv_sigtramp_frame_this_id, frv_sigtramp_frame_prev_register)
	(frv_sigtramp_frame_unwind, frv_sigtramp_frame_sniffer): Moved to
	frv-linux-tdep.c.
	(frv_gdbarch_init): Do not append a sigtramp sniffer.
	(struct gdbarch_tdep): Delete sigcontext_reg_addr.
	(frv_set_sigcontext_reg_addr): Delete function.
This commit is contained in:
Andrew Cagney 2004-05-01 14:00:57 +00:00
parent 8c6b0e0607
commit 9df0bb3fab
5 changed files with 110 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gdb/ChangeLog
View File

@ -1,5 +1,26 @@
2004-05-01 Andrew Cagney <cagney@redhat.com>
* frv-linux-tdep.c: Include "trad-frame.h" and "frame-unwind.h".
(frv_linux_sigtramp_frame_cache)
(frv_linux_sigtramp_frame_this_id)
(frv_linux_sigtramp_frame_prev_register)
(frv_linux_sigtramp_frame_unwind)
(frv_linux_sigtramp_frame_sniffer): Copied from frv-tdep.c,
include "linux" in function and variable names, directly call
frv_linux_pc_in_sigtramp and frv_linux_sigcontext_reg_addr, use
the latest trad-frame code.
(frv_linux_init_abi): Append frv_linux_sigtramp_frame_sniffer, do
not set frv_sigcontext_reg_addr or deprecated_pc_in_sigtramp
* Makefile.in (frv-linux-tdep.o): Update dependencies.
* frv-tdep.h (frv_set_sigcontext_reg_addr): Delete declaration.
* frv-tdep.c (frv_sigtramp_frame_cache)
(frv_sigtramp_frame_this_id, frv_sigtramp_frame_prev_register)
(frv_sigtramp_frame_unwind, frv_sigtramp_frame_sniffer): Moved to
frv-linux-tdep.c.
(frv_gdbarch_init): Do not append a sigtramp sniffer.
(struct gdbarch_tdep): Delete sigcontext_reg_addr.
(frv_set_sigcontext_reg_addr): Delete function.
* gdbarch.sh (DEPRECATED_SIGTRAMP_START)
(DEPRECATED_SIGTRAMP_END): Delete.
* gdbarch.h, gdbarch.c: Re-generate.

3
gdb/Makefile.in
View File

@ -1780,7 +1780,8 @@ frame.o: frame.c $(defs_h) $(frame_h) $(target_h) $(value_h) $(inferior_h) \
frame-unwind.o: frame-unwind.c $(defs_h) $(frame_h) $(frame_unwind_h) \
$(gdb_assert_h) $(dummy_frame_h) $(gdb_obstack_h)
frv-linux-tdep.o: frv-linux-tdep.c $(defs_h) $(target_h) $(frame_h) \
$(osabi_h) $(elf_bfd_h) $(elf_frv_h) $(frv_tdep_h)
$(osabi_h) $(elf_bfd_h) $(elf_frv_h) $(frv_tdep_h) \
$(trad_frame_h) $(frame_unwind_h)
frv-tdep.o: frv-tdep.c $(defs_h) $(gdb_string_h) $(inferior_h) $(gdbcore_h) \
$(arch_utils_h) $(regcache_h) $(frame_h) $(frame_unwind_h) \
$(frame_base_h) $(trad_frame_h) $(dis_asm_h) $(gdb_assert_h) \

94
gdb/frv-linux-tdep.c
View File

@ -26,6 +26,8 @@
#include "elf-bfd.h"
#include "elf/frv.h"
#include "frv-tdep.h"
#include "trad-frame.h"
#include "frame-unwind.h"
/* Define the size (in bytes) of an FR-V instruction. */
static const int frv_instr_size = 4;
@ -151,7 +153,7 @@ frv_linux_pc_in_sigtramp (CORE_ADDR pc, char *name)
void *extension;
} __attribute__((aligned(8))); */
static CORE_ADDR
static LONGEST
frv_linux_sigcontext_reg_addr (struct frame_info *next_frame, int regno,
CORE_ADDR *sc_addr_cache_ptr)
{
@ -233,15 +235,93 @@ frv_linux_sigcontext_reg_addr (struct frame_info *next_frame, int regno,
}
}
/* Signal trampolines. */
static struct trad_frame_cache *
frv_linux_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache)
{
struct trad_frame_cache *cache;
struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
CORE_ADDR addr;
char buf[4];
int regnum;
CORE_ADDR sc_addr_cache_val = 0;
struct frame_id this_id;
if (*this_cache)
return *this_cache;
cache = trad_frame_cache_zalloc (next_frame);
/* FIXME: cagney/2004-05-01: This is is long standing broken code.
The frame ID's code address should be the start-address of the
signal trampoline and not the current PC within that
trampoline. */
frame_unwind_register (next_frame, sp_regnum, buf);
this_id = frame_id_build (extract_unsigned_integer (buf, sizeof buf),
frame_pc_unwind (next_frame));
trad_frame_set_id (cache, this_id);
for (regnum = 0; regnum < frv_num_regs; regnum++)
{
LONGEST reg_addr = frv_linux_sigcontext_reg_addr (next_frame, regnum,
&sc_addr_cache_val);
if (reg_addr != -1)
trad_frame_set_reg_addr (cache, regnum, reg_addr);
}
*this_cache = cache;
return cache;
}
static void
frv_linux_sigtramp_frame_this_id (struct frame_info *next_frame, void **this_cache,
struct frame_id *this_id)
{
struct trad_frame_cache *cache =
frv_linux_sigtramp_frame_cache (next_frame, this_cache);
trad_frame_get_id (cache, this_id);
}
static void
frv_linux_sigtramp_frame_prev_register (struct frame_info *next_frame,
void **this_cache,
int regnum, int *optimizedp,
enum lval_type *lvalp, CORE_ADDR *addrp,
int *realnump, void *valuep)
{
/* Make sure we've initialized the cache. */
struct trad_frame_cache *cache =
frv_linux_sigtramp_frame_cache (next_frame, this_cache);
trad_frame_get_register (cache, next_frame, regnum, optimizedp, lvalp,
addrp, realnump, valuep);
}
static const struct frame_unwind frv_linux_sigtramp_frame_unwind =
{
SIGTRAMP_FRAME,
frv_linux_sigtramp_frame_this_id,
frv_linux_sigtramp_frame_prev_register
};
static const struct frame_unwind *
frv_linux_sigtramp_frame_sniffer (struct frame_info *next_frame)
{
CORE_ADDR pc = frame_pc_unwind (next_frame);
char *name;
find_pc_partial_function (pc, &name, NULL, NULL);
if (frv_linux_pc_in_sigtramp (pc, name))
return &frv_linux_sigtramp_frame_unwind;
return NULL;
}
static void
frv_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
/* When the FR-V Linux kernel calls a signal handler, the return
address points to a bit of code on the stack. This function is
used to identify this bit of code as a signal trampoline in order
to support backtracing through calls to signal handlers. */
set_gdbarch_deprecated_pc_in_sigtramp (gdbarch, frv_linux_pc_in_sigtramp);
frv_set_sigcontext_reg_addr (gdbarch, frv_linux_sigcontext_reg_addr);
/* Set the sigtramp frame sniffer. */
frame_unwind_append_sniffer (gdbarch, frv_linux_sigtramp_frame_sniffer);
}
static enum gdb_osabi

113
gdb/frv-tdep.c
View File

@ -96,11 +96,6 @@ struct gdbarch_tdep
/* Register names. */
char **register_names;
/* Given NEXT_FRAME, determine the address of register REGNO saved in
the calling sigtramp frame. */
CORE_ADDR (*sigcontext_reg_addr) (struct frame_info *next_frame, int regno,
CORE_ADDR *);
};
#define CURRENT_VARIANT (gdbarch_tdep (current_gdbarch))
@ -112,15 +107,6 @@ frv_abi (struct gdbarch *gdbarch)
return gdbarch_tdep (gdbarch)->frv_abi;
}
/* Set sigcontext_reg_addr. */
void
frv_set_sigcontext_reg_addr (struct gdbarch *gdbarch,
CORE_ADDR (*sigcontext_reg_addr)
(struct frame_info *, int, CORE_ADDR *))
{
gdbarch_tdep (gdbarch)->sigcontext_reg_addr = sigcontext_reg_addr;
}
/* Fetch the interpreter and executable loadmap addresses (for shared
library support) for the FDPIC ABI. Return 0 if successful, -1 if
not. (E.g, -1 will be returned if the ABI isn't the FDPIC ABI.) */
@ -1432,102 +1418,6 @@ frv_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame)
frame_pc_unwind (next_frame));
}
/* Signal trampolines. */
static struct frv_unwind_cache *
frv_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache)
{
struct frv_unwind_cache *cache;
struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
CORE_ADDR addr;
char buf[4];
int regno;
CORE_ADDR sc_addr_cache_val = 0;
if (*this_cache)
return *this_cache;
cache = FRAME_OBSTACK_ZALLOC (struct frv_unwind_cache);
cache->saved_regs = trad_frame_alloc_saved_regs (next_frame);
frame_unwind_register (next_frame, sp_regnum, buf);
cache->base = extract_unsigned_integer (buf, sizeof buf);
for (regno = 0; regno < frv_num_regs; regno++)
{
cache->saved_regs[regno].addr
= tdep->sigcontext_reg_addr (next_frame, regno, &sc_addr_cache_val);
}
if (cache->saved_regs[sp_regnum].addr != -1
&& target_read_memory (cache->saved_regs[sp_regnum].addr,
buf, sizeof buf) == 0)
{
cache->prev_sp = extract_unsigned_integer (buf, sizeof buf);
/* Now that we've bothered to read it out of memory, save the
prev frame's SP value in the cache. */
trad_frame_set_value (cache->saved_regs, sp_regnum, cache->prev_sp);
}
else
{
warning ("Can't read SP value from sigtramp frame");
}
*this_cache = cache;
return cache;
}
static void
frv_sigtramp_frame_this_id (struct frame_info *next_frame, void **this_cache,
struct frame_id *this_id)
{
struct frv_unwind_cache *cache =
frv_sigtramp_frame_cache (next_frame, this_cache);
(*this_id) = frame_id_build (cache->base, frame_pc_unwind (next_frame));
}
static void
frv_sigtramp_frame_prev_register (struct frame_info *next_frame,
void **this_cache,
int regnum, int *optimizedp,
enum lval_type *lvalp, CORE_ADDR *addrp,
int *realnump, void *valuep)
{
/* Make sure we've initialized the cache. */
frv_sigtramp_frame_cache (next_frame, this_cache);
frv_frame_prev_register (next_frame, this_cache, regnum,
optimizedp, lvalp, addrp, realnump, valuep);
}
static const struct frame_unwind frv_sigtramp_frame_unwind =
{
SIGTRAMP_FRAME,
frv_sigtramp_frame_this_id,
frv_sigtramp_frame_prev_register
};
static const struct frame_unwind *
frv_sigtramp_frame_sniffer (struct frame_info *next_frame)
{
CORE_ADDR pc = frame_pc_unwind (next_frame);
char *name;
/* We shouldn't even bother to try if the OSABI didn't register
a sigcontext_reg_addr handler. */
if (!gdbarch_tdep (current_gdbarch)->sigcontext_reg_addr)
return NULL;
find_pc_partial_function (pc, &name, NULL, NULL);
if (DEPRECATED_PC_IN_SIGTRAMP (pc, name))
return &frv_sigtramp_frame_unwind;
return NULL;
}
static struct gdbarch *
frv_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
{
@ -1667,9 +1557,6 @@ frv_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Hook in ABI-specific overrides, if they have been registered. */
gdbarch_init_osabi (info, gdbarch);
/* Set the sigtramp frame sniffer. */
frame_unwind_append_sniffer (gdbarch, frv_sigtramp_frame_sniffer);
/* Set the fallback (prologue based) frame sniffer. */
frame_unwind_append_sniffer (gdbarch, frv_frame_sniffer);

5
gdb/frv-tdep.h
View File

@ -97,11 +97,6 @@ enum {
/* Return the FR-V ABI associated with GDBARCH. */
enum frv_abi frv_abi (struct gdbarch *gdbarch);
/* Associate a sigcontext address fetcher with GDBARCH. */
void frv_set_sigcontext_reg_addr (struct gdbarch *gdbarch,
CORE_ADDR (*sigcontext_reg_addr)
(struct frame_info *, int, CORE_ADDR *));
/* Fetch the interpreter and executable loadmap addresses (for shared
library support) for the FDPIC ABI. Return 0 if successful, -1 if
not. (E.g, -1 will be returned if the ABI isn't the FDPIC ABI.) */