Merge GDB 7.5.1

gdb/amd64-nat.c

 /* Native-dependent code for AMD64.
 
    Copyright (C) 2003-2004, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 41 matching lines @@
    general-purpose register set.  */
 
 static int
 amd64_native_gregset_reg_offset (struct gdbarch *gdbarch, int regnum)
 {
   int *reg_offset = amd64_native_gregset64_reg_offset;
   int num_regs = amd64_native_gregset64_num_regs;
 
   gdb_assert (regnum >= 0);
 
-  if (gdbarch_ptr_bit (gdbarch) == 32)
+  if (gdbarch_bfd_arch_info (gdbarch)->bits_per_word == 32)
     {
       reg_offset = amd64_native_gregset32_reg_offset;
       num_regs = amd64_native_gregset32_num_regs;
     }
 
   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];
@@ skipping 16 matching lines @@
 
 void
 amd64_supply_native_gregset (struct regcache *regcache,
                              const void *gregs, int regnum)
 {
   const char *regs = gregs;
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   int num_regs = amd64_native_gregset64_num_regs;
   int i;
 
-  if (gdbarch_ptr_bit (gdbarch) == 32)
+  if (gdbarch_bfd_arch_info (gdbarch)->bits_per_word == 32)
     num_regs = amd64_native_gregset32_num_regs;
 
   if (num_regs > gdbarch_num_regs (gdbarch))
     num_regs = gdbarch_num_regs (gdbarch);
 
   for (i = 0; i < num_regs; i++)
     {
       if (regnum == -1 || regnum == i)
         {
           int offset = amd64_native_gregset_reg_offset (gdbarch, i);
@@ skipping 10 matching lines @@
 
 void
 amd64_collect_native_gregset (const struct regcache *regcache,
                               void *gregs, int regnum)
 {
   char *regs = gregs;
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   int num_regs = amd64_native_gregset64_num_regs;
   int i;
 
-  if (gdbarch_ptr_bit (gdbarch) == 32)
+  if (gdbarch_bfd_arch_info (gdbarch)->bits_per_word == 32)
     {
       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.  */
       for (i = 0; i <= I386_EIP_REGNUM; i++)
         {
           if (regnum == -1 || regnum == i)
             memset (regs + amd64_native_gregset_reg_offset (gdbarch, i), 0, 8);
         }
@@ skipping 12 matching lines @@
     {
       if (regnum == -1 || regnum == i)
         {
           int offset = amd64_native_gregset_reg_offset (gdbarch, i);
 
           if (offset != -1)
             regcache_raw_collect (regcache, i, regs + offset);
         }
     }
 }