--- gforth/Attic/386.h	1994/09/09 16:27:15	1.4
+++ gforth/Attic/386.h	1995/06/03 14:24:38	1.8
@@ -1,30 +1,14 @@
 /*
-  $Id: 386.h,v 1.4 1994/09/09 16:27:15 anton Exp $
   Copyright 1992 by the ANSI figForth Development Group
 
   This is the machine-specific part for Intel 386 compatible processors
 */
 
+#include "32bit.h"
 
-/* Cell and UCell must be the same size as a pointer */
-typedef long Cell;
-typedef unsigned long UCell;
-
-/* DCell and UDCell must be twice as large as Cell */
-typedef long long DCell;
-typedef unsigned long long UDCell;
-
-/* define this if IEEE singles and doubles are available as C data types */
-#define IEEE_FP
-
-/* the IEEE types are used only for loading and storing */
-/* the IEEE double precision type */
-typedef double DFloat;
-/* the IEEE single precision type */
-typedef float SFloat;
-
-/* define this if the least-significant byte is at the largets address */
-/* #define BIG_ENDIAN */
+/* indirect threading is faster on the 486, on the 386 direct
+   threading is probably faster. Therefore we leave defining
+   DIRECT_THREADED to configure */
 
 /* define this if the processor cannot exploit instruction-level
    parallelism (no pipelining or too few registers) */
@@ -37,7 +21,7 @@ typedef float SFloat;
 #define PFA1(cfa)	PFA(cfa)
 /* CODE_ADDRESS is the address of the code jumped to through the code field */
 #define CODE_ADDRESS(cfa) \
-    ({long _cfa = (char *)(cfa); (Label)(_cfa+*((long *)(_cfa+1))+5);})
+    ({long _cfa = (long)(cfa); (Label)(_cfa+*((long *)(_cfa+1))+5);})
 /* MAKE_CF creates an appropriate code field at the cfa; ca is the code address */
 #define MAKE_CF(cfa,ca)	({long _cfa = (long)(cfa); \
                           long _ca  = (long)(ca); \
@@ -59,6 +43,9 @@ typedef float SFloat;
 #endif
 
 #ifdef FORCE_REG
+#if (__GNUC__==2 && defined(__GNUC_MINOR__) && __GNUC_MINOR__==5)
+/* i.e. gcc-2.5.x */
+/* this works with 2.5.7; nothing works with 2.5.8 */
 #define IPREG asm("%esi")
 #define SPREG asm("%edi")
 #ifdef USE_TOS
@@ -66,6 +53,9 @@ typedef float SFloat;
 #else
 #define CFAREG asm("%edx")
 #endif
+#else /* gcc-version */
+/* this works with 2.6.3 (and quite well, too) */
+/* since this is not very demanding, it's the default for other gcc versions */
+#define SPREG asm("%ebx")
+#endif /* gcc-version */
 #endif /* FORCE_REG */
-
-#define rint(x)	floor((x)+0.5)