--- gforth/Attic/forth.h	1994/02/11 16:30:46	1.1
+++ gforth/Attic/forth.h	1995/10/11 19:39:33	1.16
@@ -1,5 +1,4 @@
 /*
-  $Id: forth.h,v 1.1 1994/02/11 16:30:46 anton Exp $
   Copyright 1992 by the ANSI figForth Development Group
 */
 
@@ -7,11 +6,24 @@
 
 typedef void *Label;
 
+/* symbol indexed constants */
+
+#define DOCOL	0
+#define DOCON	1
+#define DOVAR	2
+#define DOUSER	3
+#define DODEFER	4
+#define DOFIELD	5
+#define DODOES	6
+#define DOESJUMP	7
+
 #include "machine.h"
 
 /* Forth data types */
 typedef int Bool;
 #define FLAG(b) (-(b))
+#define FILEIO(error)	(FLAG(error) & -37)
+#define FILEEXIST(error)	(FLAG(error) & -38)
 
 #define F_TRUE (FLAG(0==0))
 #define F_FALSE (FLAG(0!=0))
@@ -26,7 +38,7 @@ typedef Label Xt;
 typedef Label *Xt;
 #endif
 
-Label *engine(Xt *ip, Cell *sp, Cell *rp, Float *fp);
+Label *engine(Xt *ip, Cell *sp, Cell *rp, Float *fp, Address lp);
 
 #ifndef DIRECT_THREADED
 /* i.e. indirect threaded */
@@ -45,15 +57,30 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
    ca is the code address */
 #define MAKE_CF(cfa,ca) ((*(Label *)(cfa)) = ((Label)ca))
 /* make a code field for a defining-word-defined word */
-#define MAKE_DOES_CF(cfa,does_code)	({MAKE_CF(cfa,DODOES);	\
+#define MAKE_DOES_CF(cfa,does_code)	({MAKE_CF(cfa,symbols[DODOES]);	\
 					  ((Cell *)cfa)[1] = (Cell)does_code;})
 /* the does handler resides between DOES> and the following Forth code */
-#define DOES_HANDLER_SIZE	8
+#define DOES_HANDLER_SIZE	(2*sizeof(Cell))
 #define MAKE_DOES_HANDLER(addr)	0 /* do nothing */
 #endif
 
 #ifdef DEBUG
-#	define	NAME(string)	puts(string);
+#	define	NAME(string)	fprintf(stderr,"%08x: "string"\n",(Cell)ip);
 #else
 #	define	NAME(string)
 #endif
+
+#define CF(const)	(-const-2)
+
+#define CF_NIL	-1
+
+#ifndef FLUSH_ICACHE
+#warning flush-icache probably will not work (see manual)
+#	define FLUSH_ICACHE(addr,size) 0
+#endif
+
+#ifdef DIRECT_THREADED
+#define CACHE_FLUSH(addr,size) FLUSH_ICACHE(addr,size)
+#else
+#define CACHE_FLUSH(addr,size) 0
+#endif