--- gforth/engine/engine.c	2002/12/15 17:38:52	1.47
+++ gforth/engine/engine.c	2003/08/15 14:07:04	1.64
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -19,8 +19,6 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 */
 
-undefine(`symbols')
-
 #include "config.h"
 #include "forth.h"
 #include <ctype.h>
@@ -61,37 +59,24 @@ undefine(`symbols')
 #include <dl.h>
 #endif
 
+#ifdef HAS_FFCALL
+#include <avcall.h>
+#include <callback.h>
+#endif
+
 #ifndef SEEK_SET
 /* should be defined in stdio.h, but some systems don't have it */
 #define SEEK_SET 0
 #endif
 
-#define IOR(flag)	((flag)? -512-errno : 0)
+#ifndef HAVE_FSEEKO
+#define fseeko fseek
+#endif
 
-struct F83Name {
-  struct F83Name *next;  /* the link field for old hands */
-  char		countetc;
-  char		name[0];
-};
-
-#define F83NAME_COUNT(np)	((np)->countetc & 0x1f)
-
-struct Longname {
-  struct Longname *next;  /* the link field for old hands */
-  Cell		countetc;
-  char		name[0];
-};
-
-#define LONGNAME_COUNT(np)	((np)->countetc & (((~((UCell)0))<<3)>>3))
-
-Cell *SP;
-Float *FP;
-Address UP=NULL;
-
-#if 0
-/* not used currently */
-int emitcounter;
+#ifndef HAVE_FTELLO
+#define ftello ftell
 #endif
+
 #define NULLC '\0'
 
 #ifdef MEMCMP_AS_SUBROUTINE
@@ -99,116 +84,8 @@ extern int gforth_memcmp(const char * s1
 #define memcmp(s1,s2,n) gforth_memcmp(s1,s2,n)
 #endif
 
-#ifdef HAS_FILE
-char *cstr(Char *from, UCell size, int clear)
-/* return a C-string corresponding to the Forth string ( FROM SIZE ).
-   the C-string lives until the next call of cstr with CLEAR being true */
-{
-  static struct cstr_buffer {
-    char *buffer;
-    size_t size;
-  } *buffers=NULL;
-  static int nbuffers=0;
-  static int used=0;
-  struct cstr_buffer *b;
-
-  if (buffers==NULL)
-    buffers=malloc(0);
-  if (clear)
-    used=0;
-  if (used>=nbuffers) {
-    buffers=realloc(buffers,sizeof(struct cstr_buffer)*(used+1));
-    buffers[used]=(struct cstr_buffer){malloc(0),0};
-    nbuffers=used+1;
-  }
-  b=&buffers[used];
-  if (size+1 > b->size) {
-    b->buffer = realloc(b->buffer,size+1);
-    b->size = size+1;
-  }
-  memcpy(b->buffer,from,size);
-  b->buffer[size]='\0';
-  used++;
-  return b->buffer;
-}
-
-char *tilde_cstr(Char *from, UCell size, int clear)
-/* like cstr(), but perform tilde expansion on the string */
-{
-  char *s1,*s2;
-  int s1_len, s2_len;
-  struct passwd *getpwnam (), *user_entry;
-
-  if (size<1 || from[0]!='~')
-    return cstr(from, size, clear);
-  if (size<2 || from[1]=='/') {
-    s1 = (char *)getenv ("HOME");
-    if(s1 == NULL)
-      s1 = "";
-    s2 = from+1;
-    s2_len = size-1;
-  } else {
-    UCell i;
-    for (i=1; i<size && from[i]!='/'; i++)
-      ;
-    if (i==2 && from[1]=='+') /* deal with "~+", i.e., the wd */
-      return cstr(from+3, size<3?0:size-3,clear);
-    {
-      char user[i];
-      memcpy(user,from+1,i-1);
-      user[i-1]='\0';
-      user_entry=getpwnam(user);
-    }
-    if (user_entry==NULL)
-      return cstr(from, size, clear);
-    s1 = user_entry->pw_dir;
-    s2 = from+i;
-    s2_len = size-i;
-  }
-  s1_len = strlen(s1);
-  if (s1_len>1 && s1[s1_len-1]=='/')
-    s1_len--;
-  {
-    char path[s1_len+s2_len];
-    memcpy(path,s1,s1_len);
-    memcpy(path+s1_len,s2,s2_len);
-    return cstr(path,s1_len+s2_len,clear);
-  }
-}
-#endif
-
-DCell timeval2us(struct timeval *tvp)
-{
-#ifndef BUGGY_LONG_LONG
-  return (tvp->tv_sec*(DCell)1000000)+tvp->tv_usec;
-#else
-  DCell d2;
-  DCell d1=mmul(tvp->tv_sec,1000000);
-  d2.lo = d1.lo+tvp->tv_usec;
-  d2.hi = d1.hi + (d2.lo<d1.lo);
-  return d2;
-#endif
-}
-
 #define NEWLINE	'\n'
 
-#ifdef HAS_FILE
-static char* fileattr[6]={"rb","rb","r+b","r+b","wb","wb"};
-static char* pfileattr[6]={"r","r","r+","r+","w","w"};
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-#ifndef O_TEXT
-#define O_TEXT 0
-#endif
-
-static int ufileattr[6]= {
-  O_RDONLY|O_BINARY, O_RDONLY|O_BINARY,
-  O_RDWR  |O_BINARY, O_RDWR  |O_BINARY,
-  O_WRONLY|O_BINARY, O_WRONLY|O_BINARY };
-#endif
-
 /* conversion on fetch */
 
 #define vm_Cell2f(_cell,_x)		((_x)=(Bool)(_cell))
@@ -284,7 +161,7 @@ static int ufileattr[6]= {
 # define CPU_DEP1 0
 #endif
 
-/* instructions containing these must be the last instruction of a
+/* instructions containing SUPER_END must be the last instruction of a
    super-instruction (e.g., branches, EXECUTE, and other instructions
    ending the basic block). Instructions containing SET_IP get this
    automatically, so you usually don't have to write it.  If you have
@@ -298,18 +175,6 @@ static int ufileattr[6]= {
 #endif
 #define SUPER_CONTINUE
 
-#ifdef GFORTH_DEBUGGING
-/* define some VM registers as global variables, so they survive exceptions;
-   global register variables are not up to the task (according to the 
-   GNU C manual) */
-Xt *saved_ip;
-Cell *rp;
-#endif
-
-#ifdef NO_IP
-static Label next_code;
-#endif
-
 #ifdef DEBUG
 #define CFA_TO_NAME(__cfa) \
       Cell len, i; \
@@ -324,19 +189,40 @@ static Label next_code;
       }
 #endif
 
-Xt *primtable(Label symbols[], Cell size)
-     /* used in primitive primtable for peephole optimization */
-{
-  Xt *xts = (Xt *)malloc(size*sizeof(Xt));
-  Cell i;
+#ifdef HAS_FFCALL
+#define SAVE_REGS IF_spTOS(sp[0]=spTOS); IF_fpTOS(fp[0]=fpTOS); SP=sp; FP=fp; RP=rp; LP=lp;
+#define REST_REGS sp=SP; fp=FP; rp=RP; lp=LP; IF_spTOS(spTOS=sp[0]); IF_fpTOS(fpTOS=fp[0]);
+#endif
 
-  for (i=0; i<size; i++)
-    xts[i] = &symbols[i];
-  return xts;
-}
+#if !defined(ENGINE)
+/* normal engine */
+#define VARIANT(v)	(v)
+#define JUMP(target)	goto I_noop
+#define LABEL(name) J_##name: asm(""); I_##name:
+
+#elif ENGINE==2
+/* variant with padding between VM instructions for finding out
+   cross-inst jumps (for dynamic code) */
+#define engine engine2
+#define VARIANT(v)	(v)
+#define JUMP(target)	goto I_noop
+#define LABEL(name) J_##name: SKIP16; I_##name:
+#define IN_ENGINE2
+
+#elif ENGINE==3
+/* variant with different immediate arguments for finding out
+   immediate arguments (for native code) */
+#define engine engine3
+#define VARIANT(v)	((v)^0xffffffff)
+#define JUMP(target)	goto K_lit
+#define LABEL(name) J_##name: asm(""); I_##name:
+#else
+#error illegal ENGINE value
+#endif /* ENGINE */
+
+#define LABEL2(name) K_##name:
 
-define(enginerest,
-`(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
+Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL
    returns array of machine code labels (for use in a loader), if ip==NULL
 */
@@ -354,6 +240,15 @@ define(enginerest,
 #ifdef MORE_VARS
   MORE_VARS
 #endif
+#ifdef HAS_FFCALL
+  av_alist alist;
+  extern va_alist clist;
+  float frv;
+  int irv;
+  double drv;
+  long long llrv;
+  void * prv;
+#endif
   register Address up UPREG = UP;
   IF_spTOS(register Cell spTOS TOSREG;)
   IF_fpTOS(register Float fpTOS FTOSREG;)
@@ -375,19 +270,18 @@ define(enginerest,
     /* the following entry is normally unused;
        it is there because its index indicates a does-handler */
     CPU_DEP1,
-#define INST_ADDR(name) (Label)&&I_##name
+#define INST_ADDR(name) ((Label)&&I_##name)
 #include "prim_lab.i"
 #undef INST_ADDR
     (Label)&&after_last,
     (Label)0,
-#define INST_ADDR(name) (Label)&&K_##name
+#define INST_ADDR(name) ((Label)&&K_##name)
 #include "prim_lab.i"
 #undef INST_ADDR
-#ifdef IN_ENGINE2
-#define INST_ADDR(name) (Label)&&J_##name
+#define INST_ADDR(name) ((Label)&&J_##name)
 #include "prim_lab.i"
 #undef INST_ADDR
-#endif
+    (Label)&&after_last
   };
 #ifdef CPU_DEP2
   CPU_DEP2
@@ -414,7 +308,7 @@ define(enginerest,
       xts[i] = symbols[i] = (Label)routines[i];
     for (; routines[i]!=0; i++) {
       if (i>=MAX_SYMBOLS) {
-	fprintf(stderr,"gforth-ditc: more than %d primitives\n",MAX_SYMBOLS);
+	fprintf(stderr,"gforth-ditc: more than %ld primitives\n",(long)MAX_SYMBOLS);
 	exit(1);
       }
       xts[i] = symbols[i] = &routines[i];
@@ -598,38 +492,7 @@ define(enginerest,
   NEXT;
 #endif
 
-#ifndef IN_ENGINE2
-#define LABEL(name) I_##name:
-#else
-#define LABEL(name) J_##name: asm(".skip 16"); I_##name:
-#endif
-#define LABEL2(name) K_##name:
 #include "prim.i"
-#undef LABEL
   after_last: return (Label *)0;
   /*needed only to get the length of the last primitive */
-}'
-)
-
-#define VARIANT(v)	(v)
-#define JUMP(target)	goto I_noop
-
-Label *engine enginerest
-
-#ifndef NO_DYNAMIC
-
-#ifdef NO_IP
-#undef VARIANT
-#define VARIANT(v)	((v)^0xffffffff)
-#undef JUMP
-#define JUMP(target)	goto K_lit
-Label *engine3 enginerest
-#endif
-
-#undef VARIANT
-#define VARIANT(v)	(v)
-#undef JUMP
-#define JUMP(target)	goto I_noop
-#define IN_ENGINE2
-Label *engine2 enginerest
-#endif
+}