--- gforth/Attic/engine.c	1994/09/26 20:31:10	1.16
+++ gforth/Attic/engine.c	1996/12/28 17:19:24	1.38
@@ -1,8 +1,25 @@
-/*
-  $Id: engine.c,v 1.16 1994/09/26 20:31:10 pazsan Exp $
-  Copyright 1992 by the ANSI figForth Development Group
+/* Gforth virtual machine (aka inner interpreter)
+
+  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 "config.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
@@ -14,21 +31,19 @@
 #include <stdlib.h>
 #include <time.h>
 #include <sys/time.h>
+#include <unistd.h>
+#include <errno.h>
+#include <pwd.h>
 #include "forth.h"
 #include "io.h"
+#include "threading.h"
 
-typedef union {
-  struct {
-#ifdef BIG_ENDIAN
-    Cell high;
-    Cell low;
-#else
-    Cell low;
-    Cell high;
-#endif;
-  } cells;
-  DCell dcell;
-} Double_Store;
+#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)
 
 typedef struct F83Name {
   struct F83Name	*next;  /* the link field for old hands */
@@ -41,85 +56,94 @@ typedef struct F83Name {
 #define F83NAME_SMUDGE(np)	(((np)->countetc & 0x40) != 0)
 #define F83NAME_IMMEDIATE(np)	(((np)->countetc & 0x20) != 0)
 
-/* NEXT and NEXT1 are split into several parts to help scheduling,
-   unless CISC_NEXT is defined */
-#ifdef CISC_NEXT
-#define NEXT1_P1
-#define NEXT_P1
-#define DEF_CA
-#ifdef DIRECT_THREADED
-#define NEXT1_P2 ({goto *cfa;})
-#else
-#define NEXT1_P2 ({goto **cfa;})
-#endif /* DIRECT_THREADED */
-#define NEXT_P2 ({cfa = *ip++; NEXT1_P2;})
-#else /* CISC_NEXT */
-#ifdef DIRECT_THREADED
-#define NEXT1_P1
-#define NEXT1_P2 ({goto *cfa;})
-#define DEF_CA
-#else /* DIRECT_THREADED */
-#define NEXT1_P1 ({ca = *cfa;})
-#define NEXT1_P2 ({goto *ca;})
-#define DEF_CA	Label ca;
-#endif /* DIRECT_THREADED */
-#define NEXT_P1 ({cfa=*ip++; NEXT1_P1;})
-#define NEXT_P2 NEXT1_P2
-#endif /* CISC_NEXT */
-
-#define NEXT1 ({DEF_CA NEXT1_P1; NEXT1_P2;})
-#define NEXT ({DEF_CA NEXT_P1; NEXT_P2;})
-
-#ifdef USE_TOS
-#define IF_TOS(x) x
-#else
-#define IF_TOS(x)
-#define TOS (sp[0])
-#endif
-
-#ifdef USE_FTOS
-#define IF_FTOS(x) x
-#else
-#define IF_FTOS(x)
-#define FTOS (fp[0])
-#endif
-
+Cell *SP;
+Float *FP;
+#if 0
+/* not used currently */
 int emitcounter;
+#endif
 #define NULLC '\0'
 
 char *cstr(Char *from, UCell size, int clear)
-/* if clear is true, scratch can be reused, otherwise we want more of
-   the same */
+/* 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 char *scratch=NULL;
-  static unsigned scratchsize=0;
-  static char *nextscratch;
-  char *oldnextscratch;
+  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)
-    nextscratch=scratch;
-  if (scratch==NULL) {
-    scratch=malloc(size+1);
-    nextscratch=scratch;
-    scratchsize=size;
-  }
-  else if (nextscratch+size>scratch+scratchsize) {
-    char *oldscratch=scratch;
-    scratch = realloc(scratch, (nextscratch-scratch)+size+1);
-    nextscratch=scratch+(nextscratch-oldscratch);
-    scratchsize=size;
-  }
-  memcpy(nextscratch,from,size);
-  nextscratch[size]='\0';
-  oldnextscratch = nextscratch;
-  nextscratch += size+1;
-  return oldnextscratch;
+    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");
+    s2 = from+1;
+    s2_len = size-1;
+  } else {
+    int i;
+    for (i=1; i<size && from[i]!='/'; i++)
+      ;
+    {
+      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);
+  }
 }
+   
 
 #define NEWLINE	'\n'
 
+#ifndef HAVE_RINT
+#define rint(x)	floor((x)+0.5)
+#endif
 
-static char* fileattr[6]={"r","rb","r+","r+b","w+","w+b"};
+static char* fileattr[6]={"r","rb","r+","r+b","w","wb"};
 
 static Address up0=NULL;
 
@@ -152,6 +176,14 @@ static Address up0=NULL;
 #define FTOSREG
 #endif
 
+/* declare and compute cfa for certain threading variants */
+/* warning: this is nonsyntactical; it will not work in place of a statement */
+#ifdef CFA_NEXT
+#define DOCFA
+#else
+#define DOCFA	Xt cfa; GETCFA(cfa)
+#endif
+
 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
@@ -162,7 +194,9 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   register Cell *rp RPREG = rp0;
   register Float *fp FPREG = fp0;
   register Address lp LPREG = lp0;
+#ifdef CFA_NEXT
   register Xt cfa CFAREG;
+#endif
   register Address up UPREG = up0;
   IF_TOS(register Cell TOS TOSREG;)
   IF_FTOS(register Float FTOS FTOSREG;)
@@ -172,17 +206,26 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     &&dovar,
     &&douser,
     &&dodefer,
+    &&dofield,
     &&dodoes,
-    &&dodoes,  /* dummy for does handler address */
+    /* the following entry is normally unused;
+       it's there because its index indicates a does-handler */
+#ifdef CPU_DEP1
+    CPU_DEP1,
+#else
+    (Label)0,
+#endif
 #include "prim_labels.i"
+    (Label)0
   };
-#ifdef CPU_DEP
-  CPU_DEP;
+#ifdef CPU_DEP2
+  CPU_DEP2
 #endif
 
 #ifdef DEBUG
   fprintf(stderr,"ip=%x, sp=%x, rp=%x, fp=%x, lp=%x, up=%x\n",
-          ip,sp,rp,fp,lp,up);
+          (unsigned)ip,(unsigned)sp,(unsigned)rp,
+	  (unsigned)fp,(unsigned)lp,(unsigned)up);
 #endif
 
   if (ip == NULL)
@@ -190,78 +233,110 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 
   IF_TOS(TOS = sp[0]);
   IF_FTOS(FTOS = fp[0]);
-  prep_terminal();
+/*  prep_terminal(); */
+  NEXT_P0;
   NEXT;
+
+#ifdef CPU_DEP3
+  CPU_DEP3
+#endif
   
  docol:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: col: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+    fprintf(stderr,"%08lx: col: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef CISC_NEXT
-  /* this is the simple version */
-  *--rp = (Cell)ip;
-  ip = (Xt *)PFA1(cfa);
-  NEXT;
-#else
-  /* this one is important, so we help the compiler optimizing
-     The following version may be better (for scheduling), but probably has
-     problems with code fields employing calls and delay slots
-  */
-  {
-    DEF_CA
-    Xt *current_ip = (Xt *)PFA1(cfa);
-    cfa = *current_ip;
-    NEXT1_P1;
+    /* this is the simple version */
     *--rp = (Cell)ip;
-    ip = current_ip+1;
-    NEXT1_P2;
-  }
+    ip = (Xt *)PFA1(cfa);
+    NEXT_P0;
+    NEXT;
+#else
+    /* this one is important, so we help the compiler optimizing
+       The following version may be better (for scheduling), but probably has
+       problems with code fields employing calls and delay slots
+       */
+    {
+      DEF_CA
+      Xt *current_ip = (Xt *)PFA1(cfa);
+      cfa = *current_ip;
+      NEXT1_P1;
+      *--rp = (Cell)ip;
+      ip = current_ip+1;
+      NEXT1_P2;
+    }
 #endif
-  
+  }
+
  docon:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: con: %08x\n",(Cell)ip,*(Cell*)PFA1(cfa));
+    fprintf(stderr,"%08lx: con: %08lx\n",(Cell)ip,*(Cell*)PFA1(cfa));
 #endif
 #ifdef USE_TOS
-  *sp-- = TOS;
-  TOS = *(Cell *)PFA1(cfa);
+    *sp-- = TOS;
+    TOS = *(Cell *)PFA1(cfa);
 #else
-  *--sp = *(Cell *)PFA1(cfa);
+    *--sp = *(Cell *)PFA1(cfa);
 #endif
+  }
+  NEXT_P0;
   NEXT;
   
  dovar:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: var: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+    fprintf(stderr,"%08lx: var: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef USE_TOS
-  *sp-- = TOS;
-  TOS = (Cell)PFA1(cfa);
+    *sp-- = TOS;
+    TOS = (Cell)PFA1(cfa);
 #else
-  *--sp = (Cell)PFA1(cfa);
+    *--sp = (Cell)PFA1(cfa);
 #endif
+  }
+  NEXT_P0;
   NEXT;
   
-  /* !! user? */
-  
  douser:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: user: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+    fprintf(stderr,"%08lx: user: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef USE_TOS
-  *sp-- = TOS;
-  TOS = (Cell)(up+*(Cell*)PFA1(cfa));
+    *sp-- = TOS;
+    TOS = (Cell)(up+*(Cell*)PFA1(cfa));
 #else
-  *--sp = (Cell)(up+*(Cell*)PFA1(cfa));
+    *--sp = (Cell)(up+*(Cell*)PFA1(cfa));
 #endif
+  }
+  NEXT_P0;
   NEXT;
   
  dodefer:
+  {
+    DOCFA;
+#ifdef DEBUG
+    fprintf(stderr,"%08lx: defer: %08lx\n",(Cell)ip,*(Cell*)PFA1(cfa));
+#endif
+    EXEC(*(Xt *)PFA1(cfa));
+  }
+
+ dofield:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: defer: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+    fprintf(stderr,"%08lx: field: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
-  cfa = *(Xt *)PFA1(cfa);
-  NEXT1;
+    TOS += *(Cell*)PFA1(cfa); 
+  }
+  NEXT_P0;
+  NEXT;
 
  dodoes:
   /* this assumes the following structure:
@@ -281,19 +356,26 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
      pfa:
      
      */
+  {
+    DOCFA;
+
+    /*    fprintf(stderr, "Got CFA %08lx at doescode %08lx/%08lx: does: %08lx\n",cfa,(Cell)ip,(Cell)PFA(cfa),(Cell)DOES_CODE1(cfa));*/
 #ifdef DEBUG
-  fprintf(stderr,"%08x/%08x: does: %08x\n",(Cell)ip,(Cell)cfa,DOES_CODE1(cfa));
-  fflush(stderr);
+    fprintf(stderr,"%08lx/%08lx: does: %08lx\n",(Cell)ip,(Cell)PFA(cfa),(Cell)DOES_CODE1(cfa));
+    fflush(stderr);
 #endif
-  *--rp = (Cell)ip;
-  /* PFA1 might collide with DOES_CODE1 here, so we use PFA */
-  ip = DOES_CODE1(cfa);
+    *--rp = (Cell)ip;
+    /* PFA1 might collide with DOES_CODE1 here, so we use PFA */
+    ip = DOES_CODE1(cfa);
 #ifdef USE_TOS
-  *sp-- = TOS;
-  TOS = (Cell)PFA(cfa);
+    *sp-- = TOS;
+    TOS = (Cell)PFA(cfa);
 #else
-  *--sp = (Cell)PFA(cfa);
+    *--sp = (Cell)PFA(cfa);
 #endif
+    /*    fprintf(stderr,"TOS = %08lx, IP=%08lx\n", TOS, IP);*/
+  }
+  NEXT_P0;
   NEXT;
 
 #include "primitives.i"