--- gforth/Attic/386.h	1995/10/11 19:39:31	1.9
+++ gforth/Attic/386.h	1996/07/16 20:57:05	1.12
@@ -1,7 +1,23 @@
 /*
-  Copyright 1992 by the ANSI figForth Development Group
-
   This is the machine-specific part for Intel 386 compatible processors
+
+  Copyright (C) 1995 Free Software Foundation, Inc.
+
+  This file is part of Gforth.
+
+  Gforth is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include "32bit.h"
@@ -17,9 +33,14 @@
 /* 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) 0
+#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 */
@@ -30,21 +51,32 @@
 /* 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
  * jump dodoes */
 #define DOES_HANDLER_SIZE       8
-#define DOES_CODE(label)	((Xt *)(CODE_ADDRESS(label)+DOES_HANDLER_SIZE))
+#define DOES_CODE(xt) \
+({ long _xt = (long)(CODE_ADDRESS(xt)); \
+   (((*(unsigned char *)(xt)) == CALL) && \
+    ((*(unsigned char *)_xt) == JMP) && \
+    ((long)(CODE_ADDRESS(_xt)) == (long)symbols[DODOES])) ? \
+      _xt+DOES_HANDLER_SIZE : 0L; })
 
 /* this is a special version of DOES_CODE for use in dodoes */
-#define DOES_CODE1(label)	DOES_CODE(label)
+#define DOES_CODE1(label)      (CODE_ADDRESS(label)+DOES_HANDLER_SIZE)
 
 /* 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
 
 #ifdef FORCE_REG
@@ -61,6 +93,10 @@
 #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 */