* cgen-types.h (SETDI): Delete, unused.

[deliverable/binutils-gdb.git] / gdb / i386-darwin-nat.c

diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index df029bcfa02cb5fec82a48a3b2b56cc0d48ef47e..2584dbc3b33ba414a8ba6a94d20650e45b3aecc9 100644 (file)
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -1,5 +1,5 @@
 /* Darwin support for GDB, the GNU debugger.
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2008, 2009
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    Contributed by Apple Computer, Inc.
@@ -30,7 +30,6 @@
 #include "regcache.h"
 #include "gdb_assert.h"
 #include "i386-tdep.h"
-#include "amd64-nat.h"
 #include "i387-tdep.h"
 #include "gdbarch.h"
 #include "arch-utils.h"
@@ -39,6 +38,12 @@
 #include "darwin-nat.h"
 #include "i386-darwin-tdep.h"
 
+#ifdef BFD64
+#include "amd64-nat.h"
+#include "amd64-tdep.h"
+#include "amd64-darwin-tdep.h"
+#endif
+
 /* Read register values from the inferior process.
    If REGNO is -1, do this for all registers.
    Otherwise, REGNO specifies which register (so we can save time).  */
@@ -50,6 +55,7 @@ i386_darwin_fetch_inferior_registers (struct target_ops *ops,
   int fetched = 0;
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
 
+#ifdef BFD64
   if (gdbarch_ptr_bit (gdbarch) == 64)
     {
       if (regno == -1 || amd64_native_gregset_supplies_p (gdbarch, regno))
@@ -84,11 +90,12 @@ i386_darwin_fetch_inferior_registers (struct target_ops *ops,
              printf_unfiltered (_("Error calling thread_get_state for float registers for thread 0x%ulx"), current_thread);
              MACH_CHECK_ERROR (ret);
            }
-          i387_supply_fxsave (regcache, -1, &fp_regs.ufs.fs64);
+          amd64_supply_fxsave (regcache, -1, &fp_regs.ufs.fs64.__fpu_fcw);
           fetched++;
         }
     }
   else
+#endif
     {
       if (regno == -1 || regno < I386_NUM_GREGS)
         {
@@ -151,6 +158,7 @@ i386_darwin_store_inferior_registers (struct target_ops *ops,
   thread_t current_thread = ptid_get_tid (inferior_ptid);
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
 
+#ifdef BFD64
   if (gdbarch_ptr_bit (gdbarch) == 64)
     {
       if (regno == -1 || amd64_native_gregset_supplies_p (gdbarch, regno))
@@ -187,7 +195,7 @@ i386_darwin_store_inferior_registers (struct target_ops *ops,
           gdb_assert (fp_regs.fsh.flavor == x86_FLOAT_STATE64);
           gdb_assert (fp_regs.fsh.count == x86_FLOAT_STATE64_COUNT);
 
-         i387_collect_fxsave (regcache, regno, &fp_regs.ufs.fs64.__fpu_fcw);
+         amd64_collect_fxsave (regcache, regno, &fp_regs.ufs.fs64.__fpu_fcw);
 
          ret = thread_set_state (current_thread, x86_FLOAT_STATE,
                                  (thread_state_t) & fp_regs,
@@ -196,6 +204,7 @@ i386_darwin_store_inferior_registers (struct target_ops *ops,
         }
     }
   else
+#endif
     {
       if (regno == -1 || regno < I386_NUM_GREGS)
         {
@@ -475,6 +484,7 @@ i386_darwin_sstep_at_sigreturn (x86_thread_state_t *regs)
   return 0;
 }
 
+#ifdef BFD64
 static int
 amd64_darwin_sstep_at_sigreturn (x86_thread_state_t *regs)
 {
@@ -504,6 +514,7 @@ amd64_darwin_sstep_at_sigreturn (x86_thread_state_t *regs)
     }
   return 0;
 }
+#endif
 
 void
 darwin_set_sstep (thread_t thread, int enable)
@@ -537,6 +548,7 @@ darwin_set_sstep (thread_t thread, int enable)
        MACH_CHECK_ERROR (kret);
       }
       break;
+#ifdef BFD64
     case x86_THREAD_STATE64:
       {
        __uint64_t bit = enable ? X86_EFLAGS_T : 0;
@@ -551,6 +563,7 @@ darwin_set_sstep (thread_t thread, int enable)
        MACH_CHECK_ERROR (kret);
       }
       break;
+#endif
     default:
       error (_("darwin_set_sstep: unknown flavour: %d\n"), regs.tsh.flavor);
     }
@@ -559,10 +572,12 @@ darwin_set_sstep (thread_t thread, int enable)
 void
 darwin_complete_target (struct target_ops *target)
 {
+#ifdef BFD64
   amd64_native_gregset64_reg_offset = amd64_darwin_thread_state_reg_offset;
   amd64_native_gregset64_num_regs = amd64_darwin_thread_state_num_regs;
   amd64_native_gregset32_reg_offset = i386_darwin_thread_state_reg_offset;
   amd64_native_gregset32_num_regs = i386_darwin_thread_state_num_regs;
+#endif
 
   target->to_fetch_registers = i386_darwin_fetch_inferior_registers;
   target->to_store_registers = i386_darwin_store_inferior_registers;