import gdb-1999-10-18 snapshot

2 files changed, 160 insertions, 171 deletions

diff --git a/gdb/config/i386/tm-i386.h b/gdb/config/i386/tm-i386.h
index 44e58d1..051b3c7 100644
--- a/gdb/config/i386/tm-i386.h
+++ b/gdb/config/i386/tm-i386.h
@@ -76,10 +76,40 @@ extern int i386_skip_prologue PARAMS ((int));
 
 #define REGISTER_SIZE 4
 
-/* Number of machine registers */
-
-#define NUM_FREGS 0 /*8*/	/* Number of FP regs */
-#define NUM_REGS (16 + NUM_FREGS)	/* Basic i*86 regs + FP regs */
+/* This register file is parameterized by two macros:
+   HAVE_I387_REGS --- register file should include i387 registers
+   HAVE_SSE_REGS  --- register file should include SSE registers
+   If HAVE_SSE_REGS is #defined, then HAVE_I387_REGS must also be #defined.
+   
+   However, GDB code should not test those macros with #ifdef, since
+   that makes code which is annoying to multi-arch.  Instead, GDB code
+   should check the values of NUM_GREGS, NUM_FREGS, and NUM_SSE_REGS,
+   which will eventually get mapped onto architecture vector entries.
+
+   It's okay to use the macros in tm-*.h files, though, since those
+   files will get completely replaced when we multi-arch anyway.  */
+
+/* Number of general registers, present on every 32-bit x86 variant.  */
+#define NUM_GREGS (16)
+
+/* Number of floating-point unit registers.  */
+#ifdef HAVE_I387_REGS
+#define NUM_FREGS (16)
+#else
+#define NUM_FREGS (0)
+#endif
+
+/* Number of SSE registers.  */
+#ifdef HAVE_SSE_REGS
+#define NUM_SSE_REGS (9)
+#else
+#define NUM_SSE_REGS (0)
+#endif
+
+#define NUM_REGS (NUM_GREGS + NUM_FREGS + NUM_SSE_REGS)
+
+/* Largest number of registers we could have in any configuration.  */
+#define MAX_NUM_REGS (16 + 16 + 9)
 
 /* Initializer for an array of names of registers.  There should be at least
    NUM_REGS strings in this initializer.  Any excess ones are simply ignored.
@@ -87,13 +117,18 @@ extern int i386_skip_prologue PARAMS ((int));
    scheme (which is the same as the 386 scheme) and also regmap in the various
    *-nat.c files. */
 
-#define REGISTER_NAMES { "eax",   "ecx",    "edx",   "ebx", \
-			 "esp",   "ebp",    "esi",   "edi", \
-			 "eip",   "eflags", "cs",    "ss", \
-			 "ds",    "es",     "fs",    "gs", \
-			 "st0",   "st1",    "st2",   "st3", \
-			 "st4",   "st5",    "st6",   "st7", \
-			 }
+#define REGISTER_NAMES { "eax",   "ecx",    "edx",   "ebx",	\
+			 "esp",   "ebp",    "esi",   "edi",	\
+			 "eip",   "eflags", "cs",    "ss",	\
+			 "ds",    "es",     "fs",    "gs",	\
+			 "st0",   "st1",    "st2",   "st3",	\
+			 "st4",   "st5",    "st6",   "st7",	\
+			 "fctrl", "fstat",  "ftag",  "fcs",	\
+                         "fcoff", "fds",    "fdoff", "fop",	\
+			 "xmm0",  "xmm1",   "xmm2",  "xmm3",	\
+			 "xmm4",  "xmm5",   "xmm6",  "xmm7",	\
+                         "mxcsr"				\
+		       }
 
 /* Register numbers of various important registers.
    Note that some of these values are "real" register numbers,
@@ -102,53 +137,127 @@ extern int i386_skip_prologue PARAMS ((int));
    to be actual register numbers as far as the user is concerned
    but do serve to get the desired values when passed to read_register.  */
 
-#define FP_REGNUM 5		/* (ebp) Contains address of executing stack frame */
+#define FP_REGNUM 5		/* (ebp) Contains address of executing stack
+				   frame */
 #define SP_REGNUM 4		/* (usp) Contains address of top of stack */
 #define PC_REGNUM 8		/* (eip) Contains program counter */
 #define PS_REGNUM 9		/* (ps)  Contains processor status */
 
-#define FP0_REGNUM 16		/* (st0) 387 register */
-#define FPC_REGNUM 25		/* 80387 control register */
+/* These registers are present only if HAVE_I387_REGS is #defined.
+   We promise that FP0 .. FP7 will always be consecutive register numbers.  */
+#define FP0_REGNUM   16		/* first FPU floating-point register */
+#define FP7_REGNUM   23		/* last  FPU floating-point register */
+
+/* All of these control registers are sixteen bits long (at most) in
+   the FPU, but are zero-extended to thirty-two bits in GDB's register
+   file.  This makes it easier to compute the size of the control
+   register file, and somewhat easier to convert to and from the FSAVE
+   instruction's 32-bit format.  */
+#define FIRST_FPU_CTRL_REGNUM 24
+#define FCTRL_REGNUM 24	        /* FPU control word */
+#define FPC_REGNUM   24		/* old name for FCTRL_REGNUM */
+#define FSTAT_REGNUM 25		/* FPU status word */
+#define FTAG_REGNUM  26		/* FPU register tag word */
+#define FCS_REGNUM   27		/* FPU instruction's code segment selector
+				   16 bits, called "FPU Instruction Pointer
+				   Selector" in the x86 manuals  */
+#define FCOFF_REGNUM 28		/* FPU instruction's offset within segment
+				   ("Fpu Code OFFset") */
+#define FDS_REGNUM   29		/* FPU operand's data segment */
+#define FDOFF_REGNUM 30		/* FPU operand's offset within segment */
+#define FOP_REGNUM   31		/* FPU opcode, bottom eleven bits */
+#define LAST_FPU_CTRL_REGNUM 31
+
+/* These registers are present only if HAVE_SSE_REGS is #defined.
+   We promise that XMM0 .. XMM7 will always have consecutive reg numbers. */
+#define XMM0_REGNUM  32		/* first SSE data register */
+#define XMM7_REGNUM  39		/* last  SSE data register */
+#define MXCSR_REGNUM 40		/* Streaming SIMD Extension control/status */
+
+#define IS_FP_REGNUM(n) (FP0_REGNUM <= (n) && (n) <= FP7_REGNUM)
+#define IS_SSE_REGNUM(n) (XMM0_REGNUM <= (n) && (n) <= XMM7_REGNUM)
+
+#define FPU_REG_RAW_SIZE (10)
+
+/* Sizes of individual register sets.  These cover the entire register
+   file, so summing up the sizes of those portions actually present
+   yields REGISTER_BYTES.  */
+#define SIZEOF_GREGS (NUM_GREGS * 4)
+#define SIZEOF_FPU_REGS (8 * FPU_REG_RAW_SIZE)
+#define SIZEOF_FPU_CTRL_REGS \
+  ((LAST_FPU_CTRL_REGNUM - FIRST_FPU_CTRL_REGNUM + 1) * 4)
+#define SIZEOF_SSE_REGS (8 * 16 + 4)
+
 
 /* Total amount of space needed to store our copies of the machine's register
    state, the array `registers'. */
-
-#define REGISTER_BYTES ((NUM_REGS - NUM_FREGS)*4 + NUM_FREGS*10)
+#ifdef HAVE_SSE_REGS
+#define REGISTER_BYTES \
+  (SIZEOF_GREGS + SIZEOF_FPU_REGS + SIZEOF_FPU_CTRL_REGS + SIZEOF_SSE_REGS)
+#else
+#ifdef HAVE_I387_REGS
+#define REGISTER_BYTES (SIZEOF_GREGS + SIZEOF_FPU_REGS + SIZEOF_FPU_CTRL_REGS)
+#else
+#define REGISTER_BYTES (SIZEOF_GREGS)
+#endif
+#endif
 
 /* Index within `registers' of the first byte of the space for register N. */
-
-#define REGISTER_BYTE(N) \
-  (((N) < FP0_REGNUM) ? ((N) * 4) : ((((N) - FP0_REGNUM) * 10) + 64))
+#define REGISTER_BYTE(n) (i386_register_byte[(n)])
+extern int i386_register_byte[];
 
 /* Number of bytes of storage in the actual machine representation for
-   register N.  All registers are 4 bytes, except 387 st(0) - st(7),
-   which are 80 bits each. */
-
-#define REGISTER_RAW_SIZE(N) (((N) < FP0_REGNUM) ? 4 : 10)
+   register N.  */
+#define REGISTER_RAW_SIZE(n) (i386_register_raw_size[(n)])
+extern int i386_register_raw_size[];
 
 /* Largest value REGISTER_RAW_SIZE can have.  */
-
-#define MAX_REGISTER_RAW_SIZE 10
+#define MAX_REGISTER_RAW_SIZE 16
 
 /* Number of bytes of storage in the program's representation
    for register N. */
-
-#define REGISTER_VIRTUAL_SIZE(N) (((N) < FP0_REGNUM) ? 4 : 8)
+#define REGISTER_VIRTUAL_SIZE(n) (i386_register_virtual_size[(n)])
+extern int i386_register_virtual_size[];
 
 /* Largest value REGISTER_VIRTUAL_SIZE can have.  */
-
-#define MAX_REGISTER_VIRTUAL_SIZE 8
+#define MAX_REGISTER_VIRTUAL_SIZE 16
 
 /* Return the GDB type object for the "standard" data type of data in 
    register N.  Perhaps si and di should go here, but potentially they
    could be used for things other than address.  */
 
-#define REGISTER_VIRTUAL_TYPE(N) \
-  (((N) == PC_REGNUM || (N) == FP_REGNUM || (N) == SP_REGNUM) \
-   ? lookup_pointer_type (builtin_type_void) \
-   : (((N) < FP0_REGNUM) \
-      ? builtin_type_int \
-      : builtin_type_double))
+#define REGISTER_VIRTUAL_TYPE(N)				\
+  (((N) == PC_REGNUM || (N) == FP_REGNUM || (N) == SP_REGNUM)	\
+   ? lookup_pointer_type (builtin_type_void)			\
+   : IS_FP_REGNUM(N) ? builtin_type_double			\
+   : IS_SSE_REGNUM(N) ? builtin_type_v4sf			\
+   : builtin_type_int)
+
+/* REGISTER_CONVERTIBLE(N) is true iff register N's virtual format is
+   different from its raw format.  Note that this definition assumes
+   that the host supports IEEE 32-bit floats, since it doesn't say
+   that SSE registers need conversion.  Even if we can't find a
+   counterexample, this is still sloppy.  */
+#define REGISTER_CONVERTIBLE(n) (IS_FP_REGNUM (n))
+
+/* Convert data from raw format for register REGNUM in buffer FROM
+   to virtual format with type TYPE in buffer TO.  */
+extern void i387_to_double (char *, char *);
+
+#define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO)	\
+{								\
+  double val;							\
+  i387_to_double ((FROM), (char *)&val);			\
+  store_floating ((TO), TYPE_LENGTH (TYPE), val);		\
+}
+
+extern void double_to_i387 (char *, char *);
+
+#define REGISTER_CONVERT_TO_RAW(TYPE,REGNUM,FROM,TO)		\
+{								\
+  double val = extract_floating ((FROM), TYPE_LENGTH (TYPE));	\
+  double_to_i387((char *)&val, (TO));				\
+}
 
 /* Store the address of the place in which to copy the structure the
    subroutine will return.  This is called from call_function. */
diff --git a/gdb/config/i386/tm-linux.h b/gdb/config/i386/tm-linux.h
index 9f5ac78..5faa6ff 100644
--- a/gdb/config/i386/tm-linux.h
+++ b/gdb/config/i386/tm-linux.h
@@ -22,6 +22,7 @@
 #define TM_LINUX_H
 
 #define I386_GNULINUX_TARGET
+#define HAVE_I387_REGS
 
 #include "i386/tm-i386.h"
 
@@ -38,100 +39,18 @@
 
 #include "tm-sysv4.h"
 
-/* copy of tm-cygwin32.h */
-#undef REGISTER_RAW_SIZE
-#undef REGISTER_VIRTUAL_SIZE
-#undef REGISTER_VIRTUAL_TYPE
-#undef REGISTER_NAMES
-#undef REGISTER_BYTES
-#undef REGISTER_BYTE
-#undef MAX_REGISTER_VIRTUAL_SIZE
-#undef NUM_REGS
-#undef NUM_FREGS
-
-/* Number of machine registers */
-
-#define NUM_REGS 31
-#define NUM_FREGS 15 
-
-/* Initializer for an array of names of registers.
-   There should be NUM_REGS strings in this initializer.  */
-
-/* the order of the first 8 registers must match the compiler's 
- * numbering scheme (which is the same as the 386 scheme)
- * also, this table must match regmap in i386-pinsn.c.
- */
-
-#define REGISTER_NAMES { "eax",  "ecx",  "edx",  "ebx",  \
-			 "esp",  "ebp",  "esi",  "edi",  \
-			 "eip",  "eflags","cs",  "ss",   \
-			 "ds",   "es",   "fs",   "gs",   \
-			 "cwd",  "swd",  "twd",  "fip",  \
-			 "fcs",  "fopo", "fos",          \
-			 "st",   "st1",  "st2",  "st3",  \
-                         "st4",  "st5",  "st6",  "st7",}
-
 #define LOW_RETURN_REGNUM 0	/* holds low four bytes of result */
 #define HIGH_RETURN_REGNUM 2	/* holds high four bytes of result */
 
-#define FPSTART_REGNUM	  16    /* start of FPU registers */
-#define FPCONTROL_REGNUM  16	/* FPU control register */
-#define FPSTATUS_REGNUM   17	/* FPU status register */
-#define FPTAG_REGNUM	  18    /* FPU tag register */
-#define FPDATA_REGNUM     23	/* actual floating-point values */
-#define FPEND_REGNUM	  (FPSTART_REGNUM + 14)	/* last FPU register */
-
-#define FPENV_BYTES (7 * 4)
-
-#define FPREG_RAW_SIZE (10)
-
-/* Total amount of space needed to store our copies of the machine's
-   FPU state.  */
-
-#define FPREG_BYTES (FPENV_BYTES + 8 * FPREG_RAW_SIZE)
-
-/* Total amount of space needed to store our copies of the machine's
-   register state, the array `registers'.  */
-
-#define REGISTER_BYTES (FPSTART_REGNUM * 4 + FPREG_BYTES)
-
-/* Index within `registers' of the first byte of the space for
-   register N.  */
-
-#define REGISTER_BYTE(N) (((N) < FPDATA_REGNUM) ? \
-			  (N) * 4 : \
-			  (((N) - FPDATA_REGNUM) * FPREG_RAW_SIZE) \
-			  + (FPDATA_REGNUM * 4))
-
-/* Number of bytes of storage in the actual machine representation
-   for register N.  */
-
-#define REGISTER_RAW_SIZE(N) (((N) < FPDATA_REGNUM) ? 4 : FPREG_RAW_SIZE)
-
-/* Number of bytes of storage in the program's representation
-   for register N. */
-
-#define REGISTER_VIRTUAL_SIZE(N) (((N) < FPDATA_REGNUM) ? 4 : FPREG_RAW_SIZE)
-
-/* Largest value REGISTER_RAW_SIZE can have.  */
-
-#undef MAX_REGISTER_RAW_SIZE
-#define MAX_REGISTER_RAW_SIZE FPREG_RAW_SIZE
-
-/* Largest value REGISTER_VIRTUAL_SIZE can have.  */
-
-#define MAX_REGISTER_VIRTUAL_SIZE FPREG_RAW_SIZE
+/* This should probably move to tm-i386.h.  */
+#define TARGET_LONG_DOUBLE_BIT 80
 
 #if defined(HAVE_LONG_DOUBLE) && defined(HOST_I386)
 /* The host and target are i386 machines and the compiler supports
    long doubles. Long doubles on the host therefore have the same
    layout as a 387 FPU stack register. */
 #define LD_I387
-#endif
 
-#define TARGET_LONG_DOUBLE_BIT 80
-
-#ifdef LD_I387
 extern int i387_extract_floating (PTR addr, int len, long double *dretptr);
 extern int i387_store_floating   (PTR addr, int len, long double val);
 
@@ -153,67 +72,29 @@ extern int i387_store_floating   (PTR addr, int len, long double val);
 	&& (((high & 0x7fffffff) | low) != 0);			\
     }								\
   while (0)
-#endif
-
-#ifndef LD_I387
-/* Nonzero if register N requires conversion
-   from raw format to virtual format.  */
-#define REGISTER_CONVERTIBLE(N) \
-  ((N < FPDATA_REGNUM) ? 0 : 1)
-#endif
-
-#ifdef LD_I387
-#define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO) \
-{ \
-  long double val = *((long double *)FROM); \
-  store_floating ((TO), TYPE_LENGTH (TYPE), val); \
-}
-#else
-/* Convert data from raw format for register REGNUM in buffer FROM
-   to virtual format with type TYPE in buffer TO.  */
-extern void
-i387_to_double PARAMS ((char *, char *));
-
-#define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO) \
-{ \
-  double val; \
-  i387_to_double ((FROM), (char *)&val); \
-  store_floating ((TO), TYPE_LENGTH (TYPE), val); \
-}
-#endif
 
-#ifdef LD_I387
-#define REGISTER_CONVERT_TO_RAW(TYPE,REGNUM,FROM,TO) \
-{ \
-  long double val = extract_floating ((FROM), TYPE_LENGTH (TYPE)); \
-  *((long double *)TO) = val; \
+#undef REGISTER_CONVERT_TO_VIRTUAL
+#define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO)	\
+{								\
+  long double val = *((long double *)FROM);			\
+  store_floating ((TO), TYPE_LENGTH (TYPE), val);		\
 }
-#else
-extern void
-double_to_i387 PARAMS ((char *, char *));
 
-#define REGISTER_CONVERT_TO_RAW(TYPE,REGNUM,FROM,TO) \
-{ \
-  double val = extract_floating ((FROM), TYPE_LENGTH (TYPE)); \
-  double_to_i387((char *)&val, (TO)); \
+#undef REGISTER_CONVERT_TO_RAW
+#define REGISTER_CONVERT_TO_RAW(TYPE,REGNUM,FROM,TO)			\
+{									\
+  long double val = extract_floating ((FROM), TYPE_LENGTH (TYPE));	\
+  *((long double *)TO) = val;						\
 }
-#endif
 
 /* Return the GDB type object for the "standard" data type
    of data in register N.  */
+#undef REGISTER_VIRTUAL_TYPE
+#define REGISTER_VIRTUAL_TYPE(N)					\
+  (IS_FP_REGNUM (N) ? builtin_type_long_double : builtin_type_int)
 
-#ifdef LD_I387
-#define REGISTER_VIRTUAL_TYPE(N) \
-  ((N < FPDATA_REGNUM) ? builtin_type_int : \
-   builtin_type_long_double)
-#else
-#define REGISTER_VIRTUAL_TYPE(N) \
-  ((N < FPDATA_REGNUM) ? builtin_type_int : \
-   builtin_type_double)
 #endif
 
-/* end of copy */
-
 /* The following works around a problem with /usr/include/sys/procfs.h  */
 #define sys_quotactl 1
 
@@ -304,4 +185,3 @@ extern CORE_ADDR i386_linux_skip_solib_resolver (CORE_ADDR pc);
 #define SOFUN_ADDRESS_MAYBE_MISSING
 
 #endif /* #ifndef TM_LINUX_H */
-