1999-01-19 Fernando Nasser <fnasser@totem.to.cygnus.com>

[deliverable/binutils-gdb.git] / gdb / i386b-nat.c

diff --git a/gdb/i386b-nat.c b/gdb/i386b-nat.c
index bb78d7288dd18a42a7a2ac71561c70334b95b181..e784773f0834d439d81894c7ab3afdb8d05a5d0e 100644 (file)
--- a/gdb/i386b-nat.c
+++ b/gdb/i386b-nat.c
@@ -57,7 +57,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, ignore)
      char *core_reg_sect;
      unsigned core_reg_size;
      int which;
-     unsigned int ignore;
+     CORE_ADDR ignore;
 {
   struct md_core *core_reg = (struct md_core *)core_reg_sect;
 
@@ -81,12 +81,25 @@ static int tregmap[] =
   tEIP, tEFLAGS, tCS, tSS
 };
 
+#ifdef sEAX
 static int sregmap[] = 
 {
   sEAX, sECX, sEDX, sEBX,
   sESP, sEBP, sESI, sEDI,
   sEIP, sEFLAGS, sCS, sSS
 };
+#else /* No sEAX */
+
+/* FreeBSD has decided to collapse the s* and t* symbols.  So if the s*
+   ones aren't around, use the t* ones for sregmap too.  */
+
+static int sregmap[] = 
+{
+  tEAX, tECX, tEDX, tEBX,
+  tESP, tEBP, tESI, tEDI,
+  tEIP, tEFLAGS, tCS, tSS
+};
+#endif /* No sEAX */
 
 /* blockend is the value of u.u_ar0, and points to the
    place where ES is stored.  */
@@ -112,6 +125,7 @@ i386_register_u_addr (blockend, regnum)
 #endif /* !FETCH_INFERIOR_REGISTERS */
 
 #ifdef FLOAT_INFO
+#include "expression.h"
 #include "language.h"                  /* for local_hex_string */
 #include "floatformat.h"