* mn10300-tdep.c (mn10300_dwarf2_reg_to_regnum): New function.

[deliverable/binutils-gdb.git] / gdb / alpha-mdebug-tdep.c

diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c
index 4baae9752f0e42354d1c30ee693652addaea2198..2ec8b21f6fa7670f35c0ebbec50b9aa4c33e504a 100644 (file)
--- 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.  */
 
@@ -45,7 +46,7 @@
    |  |localoff        |  Copies of 1st .. 6th         |
    |  |  |  |  |  argument if necessary.       |
    |  |  |  v  |                               |
-   |  |  |  ---        |-------------------------------|<-- FRAME_LOCALS_ADDRESS
+   |  |  |  ---        |-------------------------------|<-- LOCALS_ADDRESS
    |  |  |      |                              |
    |  |  |      |  Locals and temporaries.     |
    |  |  |      |                              |
@@ -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)
@@ -108,12 +109,12 @@ find_proc_desc (CORE_ADDR pc)
           symbol reading.  */
        sym = NULL;
       else
-       sym = lookup_symbol (MIPS_EFI_SYMBOL_NAME, b, LABEL_DOMAIN, 0, NULL);
+       sym = lookup_symbol (MDEBUG_EFI_SYMBOL_NAME, b, LABEL_DOMAIN, 0, NULL);
     }
 
   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,13 +129,13 @@ 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)
     {
       /* If function is frameless, then we need to do it the hard way.  I
          strongly suspect that frameless always means prologueless... */
-      if (PROC_FRAME_REG (proc_desc) == SP_REGNUM
+      if (PROC_FRAME_REG (proc_desc) == ALPHA_SP_REGNUM
          && PROC_FRAME_OFFSET (proc_desc) == 0)
        return 0;
     }
@@ -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;
@@ -227,7 +228,7 @@ alpha_mdebug_frame_unwind_cache (struct frame_info *next_frame,
   for (ireg = 0; ireg <= 31; ++ireg)
     if (mask & (1 << ireg))
       {
-       info->saved_regs[FP0_REGNUM + ireg] = reg_position;
+       info->saved_regs[ALPHA_FP0_REGNUM + ireg] = reg_position;
        reg_position += 8;
       }
 
@@ -255,7 +256,7 @@ alpha_mdebug_frame_prev_register (struct frame_info *next_frame,
                                  void **this_prologue_cache,
                                  int regnum, int *optimizedp,
                                  enum lval_type *lvalp, CORE_ADDR *addrp,
-                                 int *realnump, void *bufferp)
+                                 int *realnump, gdb_byte *bufferp)
 {
   struct alpha_mdebug_unwind_cache *info
     = alpha_mdebug_frame_unwind_cache (next_frame, this_prologue_cache);
@@ -263,7 +264,7 @@ alpha_mdebug_frame_prev_register (struct frame_info *next_frame,
   /* The PC of the previous frame is stored in the link register of
      the current frame.  Frob regnum so that we pull the value from
      the correct place.  */
-  if (regnum == PC_REGNUM)
+  if (regnum == ALPHA_PC_REGNUM)
     regnum = PROC_PC_REG (info->proc_desc);
   
   /* For all registers known to be saved in the current frame, 
@@ -275,13 +276,13 @@ alpha_mdebug_frame_prev_register (struct frame_info *next_frame,
       *addrp = info->saved_regs[regnum];
       *realnump = -1;
       if (bufferp != NULL)
-       read_memory (*addrp, bufferp, ALPHA_REGISTER_SIZE);
+       get_frame_memory (next_frame, *addrp, bufferp, ALPHA_REGISTER_SIZE);
       return;
     }
 
   /* The stack pointer of the previous frame is computed by popping
      the current stack frame.  */
-  if (regnum == SP_REGNUM)
+  if (regnum == ALPHA_SP_REGNUM)
     {
       *optimizedp = 0;
       *lvalp = not_lval;
@@ -304,9 +305,10 @@ static const struct frame_unwind alpha_mdebug_frame_unwind = {
 };
 
 const struct frame_unwind *
-alpha_mdebug_frame_p (CORE_ADDR pc)
+alpha_mdebug_frame_sniffer (struct frame_info *next_frame)
 {
-  alpha_extra_func_info_t proc_desc;
+  CORE_ADDR pc = frame_pc_unwind (next_frame);
+  struct mdebug_extra_func_info *proc_desc;
 
   /* If this PC does not map to a PDR, then clearly this isn't an
      mdebug frame.  */
@@ -360,9 +362,10 @@ static const struct frame_base alpha_mdebug_frame_base = {
 };
 
 static const struct frame_base *
-alpha_mdebug_frame_base_p (CORE_ADDR pc)
+alpha_mdebug_frame_base_sniffer (struct frame_info *next_frame)
 {
-  alpha_extra_func_info_t proc_desc;
+  CORE_ADDR pc = frame_pc_unwind (next_frame);
+  struct mdebug_extra_func_info *proc_desc;
 
   /* If this PC does not map to a PDR, then clearly this isn't an
      mdebug frame.  */
@@ -379,6 +382,6 @@ alpha_mdebug_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
-  frame_unwind_append_predicate (gdbarch, alpha_mdebug_frame_p);
-  frame_base_append_predicate (gdbarch, alpha_mdebug_frame_base_p);
+  frame_unwind_append_sniffer (gdbarch, alpha_mdebug_frame_sniffer);
+  frame_base_append_sniffer (gdbarch, alpha_mdebug_frame_base_sniffer);
 }