--- gforth/engine/engine.c	2000/07/27 10:40:42	1.20
+++ gforth/engine/engine.c	2001/01/27 20:14:55	1.25
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
   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.
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 */
 
 #include "config.h"
@@ -39,6 +39,7 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <dirent.h>
+#include <sys/resource.h>
 #ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
 #else
@@ -71,10 +72,15 @@ struct F83Name {
   char		name[0];
 };
 
-/* are macros for setting necessary? */
 #define F83NAME_COUNT(np)	((np)->countetc & 0x1f)
-#define F83NAME_SMUDGE(np)	(((np)->countetc & 0x40) != 0)
-#define F83NAME_IMMEDIATE(np)	(((np)->countetc & 0x20) != 0)
+
+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;
@@ -169,6 +175,19 @@ char *tilde_cstr(Char *from, UCell size,
 }
 #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'
 
 #ifndef HAVE_RINT
@@ -259,8 +278,8 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   MORE_VARS
 #endif
   register Address up UPREG = UP;
-  IF_TOS(register Cell TOS TOSREG;)
-  IF_FTOS(register Float FTOS FTOSREG;)
+  IF_spTOS(register Cell spTOS TOSREG;)
+  IF_fpTOS(register Float fpTOS FTOSREG;)
 #if defined(DOUBLY_INDIRECT)
   static Label *symbols;
   static void *routines[]= {
@@ -313,8 +332,8 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     return symbols;
   }
 
-  IF_TOS(TOS = sp[0]);
-  IF_FTOS(FTOS = fp[0]);
+  IF_spTOS(spTOS = sp[0]);
+  IF_fpTOS(fpTOS = fp[0]);
 /*  prep_terminal(); */
   SET_IP(ip);
   NEXT;
@@ -355,8 +374,8 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     fprintf(stderr,"%08lx: con: %08lx\n",(Cell)ip,*(Cell*)PFA1(cfa));
 #endif
 #ifdef USE_TOS
-    *sp-- = TOS;
-    TOS = *(Cell *)PFA1(cfa);
+    *sp-- = spTOS;
+    spTOS = *(Cell *)PFA1(cfa);
 #else
     *--sp = *(Cell *)PFA1(cfa);
 #endif
@@ -371,8 +390,8 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     fprintf(stderr,"%08lx: var: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef USE_TOS
-    *sp-- = TOS;
-    TOS = (Cell)PFA1(cfa);
+    *sp-- = spTOS;
+    spTOS = (Cell)PFA1(cfa);
 #else
     *--sp = (Cell)PFA1(cfa);
 #endif
@@ -387,8 +406,8 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     fprintf(stderr,"%08lx: user: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef USE_TOS
-    *sp-- = TOS;
-    TOS = (Cell)(up+*(Cell*)PFA1(cfa));
+    *sp-- = spTOS;
+    spTOS = (Cell)(up+*(Cell*)PFA1(cfa));
 #else
     *--sp = (Cell)(up+*(Cell*)PFA1(cfa));
 #endif
@@ -411,7 +430,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #ifdef DEBUG
     fprintf(stderr,"%08lx: field: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
-    TOS += *(Cell*)PFA1(cfa);
+    spTOS += *(Cell*)PFA1(cfa);
   }
   NEXT_P0;
   NEXT;
@@ -445,13 +464,13 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     *--rp = (Cell)ip;
     /* PFA1 might collide with DOES_CODE1 here, so we use PFA */
 #ifdef USE_TOS
-    *sp-- = TOS;
-    TOS = (Cell)PFA(cfa);
+    *sp-- = spTOS;
+    spTOS = (Cell)PFA(cfa);
 #else
     *--sp = (Cell)PFA(cfa);
 #endif
     SET_IP(DOES_CODE1(cfa));
-    /*    fprintf(stderr,"TOS = %08lx, IP=%08lx\n", TOS, IP);*/
+    /*    fprintf(stderr,"TOS = %08lx, IP=%08lx\n", spTOS, IP);*/
   }
   NEXT;