Change how DWARF index writer finds address map

[deliverable/binutils-gdb.git] / gdb / hppa-tdep.c

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index ac7d268a677d4d5a4b245145c18de8e7678b02dc..70a518ed1020077b2c840255d7a9f58d4d4ffe7d 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for the HP PA-RISC architecture.
 
-   Copyright (C) 1986-2020 Free Software Foundation, Inc.
+   Copyright (C) 1986-2021 Free Software Foundation, Inc.
 
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
@@ -1865,7 +1865,7 @@ hppa_find_unwind_entry_in_block (struct frame_info *this_frame)
 struct hppa_frame_cache
 {
   CORE_ADDR base;
-  struct trad_frame_saved_reg *saved_regs;
+  trad_frame_saved_reg *saved_regs;
 };
 
 static struct hppa_frame_cache *
@@ -1990,7 +1990,7 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
        gdb_byte buf4[4];
        long inst;
 
-       if (!safe_frame_unwind_memory (this_frame, pc, buf4, sizeof buf4)) 
+       if (!safe_frame_unwind_memory (this_frame, pc, buf4))
          {
            error (_("Cannot read instruction at %s."),
                   paddress (gdbarch, pc));
@@ -2007,18 +2007,18 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
        if (inst == 0x6bc23fd9) /* stw rp,-0x14(sr0,sp) */
          {
            looking_for_rp = 0;
-           cache->saved_regs[HPPA_RP_REGNUM].addr = -20;
+           cache->saved_regs[HPPA_RP_REGNUM].set_addr (-20);
          }
        else if (inst == 0x6bc23fd1) /* stw rp,-0x18(sr0,sp) */
          {
            looking_for_rp = 0;
-           cache->saved_regs[HPPA_RP_REGNUM].addr = -24;
+           cache->saved_regs[HPPA_RP_REGNUM].set_addr (-24);
          }
        else if (inst == 0x0fc212c1 
                 || inst == 0x73c23fe1) /* std rp,-0x10(sr0,sp) */
          {
            looking_for_rp = 0;
-           cache->saved_regs[HPPA_RP_REGNUM].addr = -16;
+           cache->saved_regs[HPPA_RP_REGNUM].set_addr (-16);
          }
        
        /* Check to see if we saved SP into the stack.  This also
@@ -2028,7 +2028,7 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
            || (inst & 0xffffc00c) == 0x73c10008) /* std,ma r1,N(sr0,sp) */
          {
            looking_for_sp = 0;
-           cache->saved_regs[HPPA_FP_REGNUM].addr = 0;
+           cache->saved_regs[HPPA_FP_REGNUM].set_addr (0);
          }
        else if (inst == 0x08030241) /* copy %r3, %r1 */
          {
@@ -2044,10 +2044,10 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
            if ((inst >> 26) == 0x1b && hppa_extract_14 (inst) >= 0)
              /* stwm with a positive displacement is a _post_
                 _modify_.  */
-             cache->saved_regs[reg].addr = 0;
+             cache->saved_regs[reg].set_addr (0);
            else if ((inst & 0xfc00000c) == 0x70000008)
              /* A std has explicit post_modify forms.  */
-             cache->saved_regs[reg].addr = 0;
+             cache->saved_regs[reg].set_addr (0);
            else
              {
                CORE_ADDR offset;
@@ -2062,10 +2062,10 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
                
                /* Handle code with and without frame pointers.  */
                if (u->Save_SP)
-                 cache->saved_regs[reg].addr = offset;
+                 cache->saved_regs[reg].set_addr (offset);
                else
-                 cache->saved_regs[reg].addr
-                   = (u->Total_frame_size << 3) + offset;
+                 cache->saved_regs[reg].set_addr ((u->Total_frame_size << 3)
+                                                  + offset);
              }
          }
 
@@ -2095,12 +2095,12 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
                /* 1st HP CC FP register store.  After this
                   instruction we've set enough state that the GCC and
                   HPCC code are both handled in the same manner.  */
-               cache->saved_regs[reg + HPPA_FP4_REGNUM + 4].addr = 0;
+               cache->saved_regs[reg + HPPA_FP4_REGNUM + 4].set_addr (0);
                fp_loc = 8;
              }
            else
              {
-               cache->saved_regs[reg + HPPA_FP0_REGNUM + 4].addr = fp_loc;
+               cache->saved_regs[reg + HPPA_FP0_REGNUM + 4].set_addr (fp_loc);
                fp_loc += 8;
              }
          }
@@ -2163,7 +2163,7 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
                              paddress (gdbarch, cache->base));
       }
      else if (u->Save_SP 
-             && trad_frame_addr_p (cache->saved_regs, HPPA_SP_REGNUM))
+             && cache->saved_regs[HPPA_SP_REGNUM].is_addr ())
       {
            /* Both we're expecting the SP to be saved and the SP has been
               saved.  The entry SP value is saved at this frame's SP
@@ -2184,14 +2184,14 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
                              paddress (gdbarch, cache->base));
 
       }
-    trad_frame_set_value (cache->saved_regs, HPPA_SP_REGNUM, cache->base);
+    cache->saved_regs[HPPA_SP_REGNUM].set_value (cache->base);
   }
 
   /* The PC is found in the "return register", "Millicode" uses "r31"
      as the return register while normal code uses "rp".  */
   if (u->Millicode)
     {
-      if (trad_frame_addr_p (cache->saved_regs, 31))
+      if (cache->saved_regs[31].is_addr ())
        {
          cache->saved_regs[HPPA_PCOQ_HEAD_REGNUM] = cache->saved_regs[31];
          if (hppa_debug)
@@ -2200,14 +2200,14 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
       else
        {
          ULONGEST r31 = get_frame_register_unsigned (this_frame, 31);
-         trad_frame_set_value (cache->saved_regs, HPPA_PCOQ_HEAD_REGNUM, r31);
+         cache->saved_regs[HPPA_PCOQ_HEAD_REGNUM].set_value (r31);
          if (hppa_debug)
            fprintf_unfiltered (gdb_stdlog, " (pc=r31) [frame] } ");
        }
     }
   else
     {
-      if (trad_frame_addr_p (cache->saved_regs, HPPA_RP_REGNUM))
+      if (cache->saved_regs[HPPA_RP_REGNUM].is_addr ())
        {
          cache->saved_regs[HPPA_PCOQ_HEAD_REGNUM] = 
            cache->saved_regs[HPPA_RP_REGNUM];
@@ -2218,7 +2218,7 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
        {
          ULONGEST rp = get_frame_register_unsigned (this_frame,
                                                     HPPA_RP_REGNUM);
-         trad_frame_set_value (cache->saved_regs, HPPA_PCOQ_HEAD_REGNUM, rp);
+         cache->saved_regs[HPPA_PCOQ_HEAD_REGNUM].set_value (rp);
          if (hppa_debug)
            fprintf_unfiltered (gdb_stdlog, " (pc=rp) [frame] } ");
        }
@@ -2238,11 +2238,11 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
      on the stack, but it's been overwritten.  The prologue analyzer will
      set fp_in_r1 when it sees the copy insn so we know to get the value 
      from r1 instead.  */
-  if (u->Save_SP && !trad_frame_addr_p (cache->saved_regs, HPPA_FP_REGNUM)
+  if (u->Save_SP && !cache->saved_regs[HPPA_FP_REGNUM].is_addr ()
       && fp_in_r1)
     {
       ULONGEST r1 = get_frame_register_unsigned (this_frame, 1);
-      trad_frame_set_value (cache->saved_regs, HPPA_FP_REGNUM, r1);
+      cache->saved_regs[HPPA_FP_REGNUM].set_value (r1);
     }
 
   {
@@ -2250,8 +2250,9 @@ hppa_frame_cache (struct frame_info *this_frame, void **this_cache)
     int reg;
     for (reg = 0; reg < gdbarch_num_regs (gdbarch); reg++)
       {
-       if (trad_frame_addr_p (cache->saved_regs, reg))
-         cache->saved_regs[reg].addr += cache->base;
+       if (cache->saved_regs[reg].is_addr ())
+         cache->saved_regs[reg].set_addr (cache->saved_regs[reg].addr ()
+                                          + cache->base);
       }
   }
 
@@ -2357,13 +2358,13 @@ hppa_fallback_frame_cache (struct frame_info *this_frame, void **this_cache)
             stack.  */
          if (insn == 0x6bc23fd9) /* stw rp,-0x14(sr0,sp) */
            {
-             cache->saved_regs[HPPA_RP_REGNUM].addr = -20;
+             cache->saved_regs[HPPA_RP_REGNUM].set_addr (-20);
              found_rp = 1;
            }
          else if (insn == 0x0fc212c1
                   || insn == 0x73c23fe1) /* std rp,-0x10(sr0,sp) */
            {
-             cache->saved_regs[HPPA_RP_REGNUM].addr = -16;
+             cache->saved_regs[HPPA_RP_REGNUM].set_addr (-16);
              found_rp = 1;
            }
        }
@@ -2375,11 +2376,12 @@ hppa_fallback_frame_cache (struct frame_info *this_frame, void **this_cache)
 
   cache->base = get_frame_register_unsigned (this_frame, HPPA_SP_REGNUM);
   cache->base -= frame_size;
-  trad_frame_set_value (cache->saved_regs, HPPA_SP_REGNUM, cache->base);
+  cache->saved_regs[HPPA_SP_REGNUM].set_value (cache->base);
 
-  if (trad_frame_addr_p (cache->saved_regs, HPPA_RP_REGNUM))
+  if (cache->saved_regs[HPPA_RP_REGNUM].is_addr ())
     {
-      cache->saved_regs[HPPA_RP_REGNUM].addr += cache->base;
+      cache->saved_regs[HPPA_RP_REGNUM].set_addr (cache->saved_regs[HPPA_RP_REGNUM].addr ()
+                                                 + cache->base);
       cache->saved_regs[HPPA_PCOQ_HEAD_REGNUM] = 
        cache->saved_regs[HPPA_RP_REGNUM];
     }
@@ -2387,7 +2389,7 @@ hppa_fallback_frame_cache (struct frame_info *this_frame, void **this_cache)
     {
       ULONGEST rp;
       rp = get_frame_register_unsigned (this_frame, HPPA_RP_REGNUM);
-      trad_frame_set_value (cache->saved_regs, HPPA_PCOQ_HEAD_REGNUM, rp);
+      cache->saved_regs[HPPA_PCOQ_HEAD_REGNUM].set_value (rp);
     }
 
   return cache;
@@ -2428,7 +2430,7 @@ static const struct frame_unwind hppa_fallback_frame_unwind =
 struct hppa_stub_unwind_cache
 {
   CORE_ADDR base;
-  struct trad_frame_saved_reg *saved_regs;
+  trad_frame_saved_reg *saved_regs;
 };
 
 static struct hppa_stub_unwind_cache *
@@ -2447,7 +2449,7 @@ hppa_stub_frame_unwind_cache (struct frame_info *this_frame,
   info->base = get_frame_register_unsigned (this_frame, HPPA_SP_REGNUM);
 
   /* By default we assume that stubs do not change the rp.  */
-  info->saved_regs[HPPA_PCOQ_HEAD_REGNUM].realreg = HPPA_RP_REGNUM;
+  info->saved_regs[HPPA_PCOQ_HEAD_REGNUM].set_realreg (HPPA_RP_REGNUM);
 
   return info;
 }
@@ -2754,7 +2756,7 @@ hppa_find_global_pointer (struct gdbarch *gdbarch, struct value *function)
 
 struct value *
 hppa_frame_prev_register_helper (struct frame_info *this_frame,
-                                struct trad_frame_saved_reg saved_regs[],
+                                trad_frame_saved_reg saved_regs[],
                                 int regnum)
 {
   struct gdbarch *arch = get_frame_arch (this_frame);