gdb: Add aliases for read_core_file_mappings callbacks

[binutils-gdb.git] / gdb / amd64-nat.c

diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
index 17552a6b81b5e48c66f8df7fa1d2e3c97d196008..83b6e923fdd1214e6ae44e6b52ad7abf7939876e 100644 (file)
--- a/gdb/amd64-nat.c
+++ b/gdb/amd64-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for AMD64.
 
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2021 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -30,11 +30,11 @@
    the register number as used by GDB and the register set used by the
    host to represent the general-purpose registers; one for 32-bit
    code and one for 64-bit code.  The mappings are specified by the
-   follwing variables and consist of an array of offsets within the
+   following variables and consist of an array of offsets within the
    register set indexed by register number, and the number of
    registers supported by the mapping.  We don't need mappings for the
    floating-point and SSE registers, since the difference between
-   64-bit and 32-bit variants are negligable.  The difference in the
+   64-bit and 32-bit variants are negligible.  The difference in the
    number of SSE registers is already handled by the target code.  */
 
 /* General-purpose register mapping for native 32-bit code.  */
@@ -65,10 +65,10 @@ amd64_native_gregset_reg_offset (struct gdbarch *gdbarch, int regnum)
   if (num_regs > gdbarch_num_regs (gdbarch))
     num_regs = gdbarch_num_regs (gdbarch);
 
-  if (regnum < num_regs && regnum < gdbarch_num_regs (gdbarch))
-    return reg_offset[regnum];
+  if (regnum >= num_regs)
+    return -1;
 
-  return -1;
+  return reg_offset[regnum];
 }
 
 /* Return whether the native general-purpose register set supplies
@@ -88,8 +88,8 @@ void
 amd64_supply_native_gregset (struct regcache *regcache,
                             const void *gregs, int regnum)
 {
-  const char *regs = gregs;
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  const char *regs = (const char *) gregs;
+  struct gdbarch *gdbarch = regcache->arch ();
   int num_regs = amd64_native_gregset64_num_regs;
   int i;
 
@@ -106,7 +106,7 @@ amd64_supply_native_gregset (struct regcache *regcache,
          int offset = amd64_native_gregset_reg_offset (gdbarch, i);
 
          if (offset != -1)
-           regcache_raw_supply (regcache, i, regs + offset);
+           regcache->raw_supply (i, regs + offset);
        }
     }
 }
@@ -119,8 +119,8 @@ void
 amd64_collect_native_gregset (const struct regcache *regcache,
                              void *gregs, int regnum)
 {
-  char *regs = gregs;
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  char *regs = (char *) gregs;
+  struct gdbarch *gdbarch = regcache->arch ();
   int num_regs = amd64_native_gregset64_num_regs;
   int i;
 
@@ -129,7 +129,7 @@ amd64_collect_native_gregset (const struct regcache *regcache,
       num_regs = amd64_native_gregset32_num_regs;
 
       /* Make sure %eax, %ebx, %ecx, %edx, %esi, %edi, %ebp, %esp and
-         %eip get zero-extended to 64 bits.  */
+        %eip get zero-extended to 64 bits.  */
       for (i = 0; i <= I386_EIP_REGNUM; i++)
        {
          if (regnum == -1 || regnum == i)
@@ -153,7 +153,7 @@ amd64_collect_native_gregset (const struct regcache *regcache,
          int offset = amd64_native_gregset_reg_offset (gdbarch, i);
 
          if (offset != -1)
-           regcache_raw_collect (regcache, i, regs + offset);
+           regcache->raw_collect (i, regs + offset);
        }
     }
 }