--- gforth/Attic/386.h	1994/09/08 17:20:03	1.3
+++ gforth/Attic/386.h	1995/10/26 22:48:38	1.10
@@ -1,47 +1,41 @@
 /*
-  $Id: 386.h,v 1.3 1994/09/08 17:20:03 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 and/or has few registers */
+   parallelism (no pipelining or too few registers) */
 #define CISC_NEXT
 
+/* 386 and below have no cache, 486 has a shared cache, and the
+   Pentium probably employs hardware cache consistency, so
+   flush-icache is a noop */
+#define FLUSH_ICACHE(addr,size)
+
 #ifdef DIRECT_THREADED
+
+#define CALL 0xe8 /* call */
+#define JMP  0xe9 /* jmp  */
+#define GETCFA(reg)  ({ asm("popl %0" : "=r" (reg)); (int)reg -= 5;});
+
 /* PFA gives the parameter field address corresponding to a cfa */
 #define PFA(cfa)	(((Cell *)cfa)+2)
 /* PFA1 is a special version for use just after a NEXT1 */
 #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); \
-			  *(char *)_cfa = 0xe9; /* jmp */ \
+			  *(char *)_cfa = CALL; \
 			  *(long *)(_cfa+1) = _ca-(_cfa+5);})
 
 /* this is the point where the does code starts if label points to the
@@ -53,9 +47,35 @@ typedef float SFloat;
 #define DOES_CODE1(label)	DOES_CODE(label)
 
 /* this stores a jump dodoes at addr */
-#define MAKE_DOES_HANDLER(addr) MAKE_CF(addr,symbols[DODOES])
-
-#define MAKE_DOES_CF(addr,doesp) MAKE_CF(addr,((int)(doesp)-8))
+#define MAKE_DOES_CF(addr,doesp)	({long _addr = (long)(addr); \
+                          long _doesp  = (long)(doesp)-8; \
+			  *(char *)_addr = CALL; \
+			  *(long *)(_addr+1) = _doesp-(_addr+5);})
+
+#define MAKE_DOES_HANDLER(addr)	({long _addr = (long)(addr); \
+                          long _dodo  = (long)symbols[DODOES]; \
+			  *(char *)_addr = JMP; \
+			  *(long *)(_addr+1) = _dodo-(_addr+5);})
 #endif
 
-#define rint(x)	floor((x)+0.5)
+#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
+#define CFAREG asm("%ecx")
+#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 */
+#if defined(USE_TOS) && !defined(CFA_NEXT)
+#define IPREG asm("%ebx")
+#else
+#define SPREG asm("%ebx")
+#endif /* USE_TOS && !CFA_NEXT */
+#endif /* gcc-version */
+#endif /* FORCE_REG */