Fix "beneath" conversion on AIX

[deliverable/binutils-gdb.git] / gdb / s390-linux-nat.c

diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
index c54c8d212d6062e9381b30ae0ab855e222ad6593..8d3ed55ed0570f53e687fd44f84e8d200ed03ce4 100644 (file)
--- a/gdb/s390-linux-nat.c
+++ b/gdb/s390-linux-nat.c
@@ -122,9 +122,8 @@ public:
   int remove_hw_breakpoint (struct gdbarch *, struct bp_target_info *)
     override;
   int region_ok_for_hw_watchpoint (CORE_ADDR, int) override;
-  bool have_continuable_watchpoint () { return 1; }
+  bool have_continuable_watchpoint () override { return true; }
   bool stopped_by_watchpoint () override;
-  bool watchpoint_addr_within_range (CORE_ADDR, CORE_ADDR, int) override;
   int insert_watchpoint (CORE_ADDR, int, enum target_hw_bp_type,
                         struct expression *) override;
   int remove_watchpoint (CORE_ADDR, int, enum target_hw_bp_type,
@@ -171,10 +170,10 @@ supply_gregset (struct regcache *regcache, const gregset_t *regp)
       pswa = extract_unsigned_integer ((const gdb_byte *) regp
                                       + S390_PSWA_OFFSET, 8, byte_order);
       store_unsigned_integer (buf, 4, byte_order, (pswm >> 32) | 0x80000);
-      regcache_raw_supply (regcache, S390_PSWM_REGNUM, buf);
+      regcache->raw_supply (S390_PSWM_REGNUM, buf);
       store_unsigned_integer (buf, 4, byte_order,
                              (pswa & 0x7fffffff) | (pswm & 0x80000000));
-      regcache_raw_supply (regcache, S390_PSWA_REGNUM, buf);
+      regcache->raw_supply (S390_PSWA_REGNUM, buf);
       return;
     }
 #endif
@@ -211,14 +210,14 @@ fill_gregset (const struct regcache *regcache, gregset_t *regp, int regno)
          if (regno == -1 || regno == S390_PSWM_REGNUM)
            {
              pswm &= 0x80000000;
-             regcache_raw_collect (regcache, S390_PSWM_REGNUM, buf);
+             regcache->raw_collect (S390_PSWM_REGNUM, buf);
              pswm |= (extract_unsigned_integer (buf, 4, byte_order)
                       & 0xfff7ffff) << 32;
            }
 
          if (regno == -1 || regno == S390_PSWA_REGNUM)
            {
-             regcache_raw_collect (regcache, S390_PSWA_REGNUM, buf);
+             regcache->raw_collect (S390_PSWA_REGNUM, buf);
              pswa = extract_unsigned_integer (buf, 4, byte_order);
              pswm ^= (pswm ^ pswa) & 0x80000000;
              pswa &= 0x7fffffff;
@@ -409,7 +408,7 @@ check_regset (int tid, int regset, int regsize)
 void
 s390_linux_nat_target::fetch_registers (struct regcache *regcache, int regnum)
 {
-  pid_t tid = get_ptrace_pid (regcache_get_ptid (regcache));
+  pid_t tid = get_ptrace_pid (regcache->ptid ());
 
   if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum))
     fetch_regs (regcache, tid);
@@ -463,7 +462,7 @@ s390_linux_nat_target::fetch_registers (struct regcache *regcache, int regnum)
 void
 s390_linux_nat_target::store_registers (struct regcache *regcache, int regnum)
 {
-  pid_t tid = get_ptrace_pid (regcache_get_ptid (regcache));
+  pid_t tid = get_ptrace_pid (regcache->ptid ());
 
   if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum))
     store_regs (regcache, tid, regnum);
@@ -1020,7 +1019,7 @@ s390_linux_nat_target::read_description ()
   {
     CORE_ADDR hwcap = 0;
 
-    target_auxv_search (target_stack, AT_HWCAP, &hwcap);
+    target_auxv_search (current_top_target (), AT_HWCAP, &hwcap);
     have_regset_tdb = (hwcap & HWCAP_S390_TE)
       && check_regset (tid, NT_S390_TDB, s390_sizeof_tdbregset);