From 5f6a23518ec7ebbe6ff22053326f0d074d5523ac Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Sat, 6 Nov 2004 17:18:10 +0000 Subject: [PATCH] * alpha-mdebug-tdep.c: #include mdebugread.h. Replace alpha_extra_func_info_t by struct mdebug_extra_func_info *. * Makefile.in (alpha-mdebug-tdep.o): Add dependency on mdebugread.h. --- gdb/ChangeLog | 6 ++++++ gdb/Makefile.in | 2 +- gdb/alpha-mdebug-tdep.c | 19 ++++++++++--------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1519f59..dcf03ba 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2004-11-06 Joel Brobecker + + * alpha-mdebug-tdep.c: #include mdebugread.h. + Replace alpha_extra_func_info_t by struct mdebug_extra_func_info *. + * Makefile.in (alpha-mdebug-tdep.o): Add dependency on mdebugread.h. + 2004-11-05 Andrew Cagney * dwarf2-frame.c (dwarf2_frame_cache): Only complain when both the diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c179641b..c6572e5 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1651,7 +1651,7 @@ alpha-linux-tdep.o: alpha-linux-tdep.c $(defs_h) $(frame_h) $(gdb_assert_h) \ $(osabi_h) $(alpha_tdep_h) alpha-mdebug-tdep.o: alpha-mdebug-tdep.c $(defs_h) $(frame_h) \ $(frame_unwind_h) $(frame_base_h) $(symtab_h) $(gdbcore_h) \ - $(block_h) $(gdb_assert_h) $(alpha_tdep_h) + $(block_h) $(gdb_assert_h) $(alpha_tdep_h) $(mdebugread_h) alpha-nat.o: alpha-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) \ $(gdbcore_h) $(target_h) $(regcache_h) $(alpha_tdep_h) $(gregset_h) alphanbsd-tdep.o: alphanbsd-tdep.c $(defs_h) $(gdbcore_h) $(frame_h) \ diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c index ea8eeea..3e00666 100644 --- a/gdb/alpha-mdebug-tdep.c +++ b/gdb/alpha-mdebug-tdep.c @@ -29,6 +29,7 @@ #include "gdb_assert.h" #include "alpha-tdep.h" +#include "mdebugread.h" /* FIXME: Some of this code should perhaps be merged with mips. */ @@ -90,11 +91,11 @@ /* Locate the mdebug PDR for the given PC. Return null if one can't be found; you'll have to fall back to other methods in that case. */ -static alpha_extra_func_info_t +static struct mdebug_extra_func_info * find_proc_desc (CORE_ADDR pc) { struct block *b = block_for_pc (pc); - alpha_extra_func_info_t proc_desc = NULL; + struct mdebug_extra_func_info *proc_desc = NULL; struct symbol *sym = NULL; if (b) @@ -113,7 +114,7 @@ find_proc_desc (CORE_ADDR pc) if (sym) { - proc_desc = (alpha_extra_func_info_t) SYMBOL_VALUE (sym); + proc_desc = (struct mdebug_extra_func_info *) SYMBOL_VALUE (sym); /* If we never found a PDR for this function in symbol reading, then examine prologues to find the information. */ @@ -128,7 +129,7 @@ find_proc_desc (CORE_ADDR pc) find the prologue, then return 0. */ static CORE_ADDR -alpha_mdebug_after_prologue (CORE_ADDR pc, alpha_extra_func_info_t proc_desc) +alpha_mdebug_after_prologue (CORE_ADDR pc, struct mdebug_extra_func_info *proc_desc) { if (proc_desc) { @@ -146,7 +147,7 @@ alpha_mdebug_after_prologue (CORE_ADDR pc, alpha_extra_func_info_t proc_desc) if we are definitively *not* in a function prologue. */ static int -alpha_mdebug_in_prologue (CORE_ADDR pc, alpha_extra_func_info_t proc_desc) +alpha_mdebug_in_prologue (CORE_ADDR pc, struct mdebug_extra_func_info *proc_desc) { CORE_ADDR after_prologue_pc = alpha_mdebug_after_prologue (pc, proc_desc); return (after_prologue_pc == 0 || pc < after_prologue_pc); @@ -157,7 +158,7 @@ alpha_mdebug_in_prologue (CORE_ADDR pc, alpha_extra_func_info_t proc_desc) struct alpha_mdebug_unwind_cache { - alpha_extra_func_info_t proc_desc; + struct mdebug_extra_func_info *proc_desc; CORE_ADDR vfp; CORE_ADDR *saved_regs; }; @@ -170,7 +171,7 @@ alpha_mdebug_frame_unwind_cache (struct frame_info *next_frame, void **this_prologue_cache) { struct alpha_mdebug_unwind_cache *info; - alpha_extra_func_info_t proc_desc; + struct mdebug_extra_func_info *proc_desc; ULONGEST vfp; CORE_ADDR pc, reg_position; unsigned long mask; @@ -307,7 +308,7 @@ const struct frame_unwind * alpha_mdebug_frame_sniffer (struct frame_info *next_frame) { CORE_ADDR pc = frame_pc_unwind (next_frame); - alpha_extra_func_info_t proc_desc; + struct mdebug_extra_func_info *proc_desc; /* If this PC does not map to a PDR, then clearly this isn't an mdebug frame. */ @@ -364,7 +365,7 @@ static const struct frame_base * alpha_mdebug_frame_base_sniffer (struct frame_info *next_frame) { CORE_ADDR pc = frame_pc_unwind (next_frame); - alpha_extra_func_info_t proc_desc; + struct mdebug_extra_func_info *proc_desc; /* If this PC does not map to a PDR, then clearly this isn't an mdebug frame. */ -- 2.7.4