* rs6000-tdep.c (BL_MASK, BL_INSTRUCTION, BL_DISPLACEMENT_MASK):

[deliverable/binutils-gdb.git] / gdb / i387-tdep.h

diff --git a/gdb/i387-tdep.h b/gdb/i387-tdep.h
index a94b27ae13f234e2cdf4831cc215b1f1bf1fc0b6..7ac24166c48f690658fd53858e5e69865320503a 100644 (file)
--- a/gdb/i387-tdep.h
+++ b/gdb/i387-tdep.h
@@ -1,6 +1,6 @@
 /* Target-dependent code for the i387.
 
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2007
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2007, 2008
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -27,26 +27,21 @@ struct regcache;
 struct type;
 struct ui_file;
 
-/* Because the number of general-purpose registers is different for
-   AMD64, the floating-point registers and SSE registers get shifted.
-   The following definitions are intended to help writing code that
-   needs the register numbers of floating-point registers and SSE
-   registers.  In order to use these, one should provide a definition
-   for I387_ST0_REGNUM, and possibly I387_NUM_XMM_REGS, preferably by
-   using a local "#define" in the body of the function that uses this.
-   Please "#undef" them before the end of the function.  */
-
-#define I387_FCTRL_REGNUM      (I387_ST0_REGNUM + 8)
-#define I387_FSTAT_REGNUM      (I387_FCTRL_REGNUM + 1)
-#define I387_FTAG_REGNUM       (I387_FCTRL_REGNUM + 2)
-#define I387_FISEG_REGNUM      (I387_FCTRL_REGNUM + 3)
-#define I387_FIOFF_REGNUM      (I387_FCTRL_REGNUM + 4)
-#define I387_FOSEG_REGNUM      (I387_FCTRL_REGNUM + 5)
-#define I387_FOOFF_REGNUM      (I387_FCTRL_REGNUM + 6)
-#define I387_FOP_REGNUM                (I387_FCTRL_REGNUM + 7)
-#define I387_XMM0_REGNUM       (I387_ST0_REGNUM + 16)
-#define I387_MXCSR_REGNUM      (I387_XMM0_REGNUM + I387_NUM_XMM_REGS)
-\f
+#define I387_ST0_REGNUM(tdep) ((tdep)->st0_regnum)
+#define I387_NUM_XMM_REGS(tdep) ((tdep)->num_xmm_regs)
+#define I387_MM0_REGNUM(tdep) ((tdep)->mm0_regnum)
+
+#define I387_FCTRL_REGNUM(tdep) (I387_ST0_REGNUM (tdep) + 8)
+#define I387_FSTAT_REGNUM(tdep) (I387_FCTRL_REGNUM (tdep) + 1)
+#define I387_FTAG_REGNUM(tdep) (I387_FCTRL_REGNUM (tdep) + 2)
+#define I387_FISEG_REGNUM(tdep) (I387_FCTRL_REGNUM (tdep) + 3)
+#define I387_FIOFF_REGNUM(tdep) (I387_FCTRL_REGNUM (tdep) + 4)
+#define I387_FOSEG_REGNUM(tdep) (I387_FCTRL_REGNUM (tdep) + 5)
+#define I387_FOOFF_REGNUM(tdep) (I387_FCTRL_REGNUM (tdep) + 6)
+#define I387_FOP_REGNUM(tdep) (I387_FCTRL_REGNUM (tdep) + 7)
+#define I387_XMM0_REGNUM(tdep) (I387_ST0_REGNUM (tdep) + 16)
+#define I387_MXCSR_REGNUM(tdep) \
+  (I387_XMM0_REGNUM (tdep) + I387_NUM_XMM_REGS (tdep))
 
 /* Print out the i387 floating point state.  */
 
@@ -58,7 +53,8 @@ extern void i387_print_float_info (struct gdbarch *gdbarch,
 /* Return nonzero if a value of type TYPE stored in register REGNUM
    needs any special handling.  */
 
-extern int i387_convert_register_p (int regnum, struct type *type);
+extern int i387_convert_register_p (struct gdbarch *gdbarch, int regnum,
+                                   struct type *type);
 
 /* Read a value of type TYPE from register REGNUM in frame FRAME, and
    return its contents in TO.  */