--- gforth/prim	2003/01/26 20:56:37	1.125
+++ gforth/prim	2003/08/15 16:47:43	1.134
@@ -1,6 +1,6 @@
 \ Gforth primitives
 
-\ 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.
 
@@ -106,6 +106,10 @@
 \E set-current
 \E store-optimization on
 \E ' noop tail-nextp2 ! \ now INST_TAIL just stores, but does not jump
+\E
+\E include-skipped-insts on \ static superinsts include cells for components
+\E                          \ useful for dynamic programming and
+\E                          \ superinsts across entry points
 
 \ 
 \ 
@@ -1490,6 +1494,12 @@ wior = IOR(wretval==-1);
 time&date	( -- nsec nmin nhour nday nmonth nyear )	facility-ext	time_and_date
 ""Report the current time of day. Seconds, minutes and hours are numbered from 0.
 Months are numbered from 1.""
+#if 1
+time_t now;
+struct tm *ltime;
+time(&now);
+ltime=localtime(&now);
+#else
 struct timeval time1;
 struct timezone zone1;
 struct tm *ltime;
@@ -1497,6 +1507,7 @@ gettimeofday(&time1,&zone1);
 /* !! Single Unix specification: 
    If tzp is not a null pointer, the behaviour is unspecified. */
 ltime=localtime((time_t *)&time1.tv_sec);
+#endif
 nyear =ltime->tm_year+1900;
 nmonth=ltime->tm_mon+1;
 nday  =ltime->tm_mday;
@@ -1550,7 +1561,7 @@ c_addr = strerror(n);
 u = strlen(c_addr);
 
 strsignal	( n -- c_addr u )	gforth
-c_addr = strsignal(n);
+c_addr = (Address)strsignal(n);
 u = strlen(c_addr);
 
 call-c	( w -- )	gforth	call_c
@@ -2151,6 +2162,147 @@ r = fp[u+1]; /* +1, because update of fp
 
 \g syslib
 
+open-lib	( c_addr1 u1 -- u2 )	gforth	open_lib
+#if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN)
+#ifndef RTLD_GLOBAL
+#define RTLD_GLOBAL 0
+#endif
+u2=(UCell) dlopen(cstr(c_addr1, u1, 1), RTLD_GLOBAL | RTLD_LAZY);
+#else
+#  ifdef _WIN32
+u2 = (Cell) GetModuleHandle(cstr(c_addr1, u1, 1));
+#  else
+#warning Define open-lib!
+u2 = 0;
+#  endif
+#endif
+
+lib-sym	( c_addr1 u1 u2 -- u3 )	gforth	lib_sym
+#if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN)
+u3 = (UCell) dlsym((void*)u2,cstr(c_addr1, u1, 1));
+#else
+#  ifdef _WIN32
+u3 = (Cell) GetProcAddress((HMODULE)u2, cstr(c_addr1, u1, 1));
+#  else
+#warning Define lib-sym!
+u3 = 0;
+#  endif
+#endif
+
+\+FFCALL
+
+av-start-void   ( c_addr -- )    gforth  av_start_void
+av_start_void(alist, c_addr);
+
+av-start-int    ( c_addr -- )    gforth  av_start_int
+av_start_int(alist, c_addr, &irv);
+
+av-start-float    ( c_addr -- )    gforth  av_start_float
+av_start_float(alist, c_addr, &frv);
+
+av-start-double    ( c_addr -- )    gforth  av_start_double
+av_start_double(alist, c_addr, &drv);
+
+av-start-longlong    ( c_addr -- )    gforth  av_start_longlong
+av_start_longlong(alist, c_addr, &llrv);
+
+av-start-ptr    ( c_addr -- )    gforth  av_start_ptr
+av_start_ptr(alist, c_addr, void*, &prv);
+
+av-int  ( w -- )  gforth  av_int
+av_int(alist, w);
+
+av-float        ( r -- )        gforth  av_float
+av_float(alist, r);
+
+av-double        ( r -- )        gforth  av_double
+av_double(alist, r);
+
+av-longlong        ( d -- )        gforth  av_longlong
+av_longlong(alist, d);
+
+av-ptr        ( c_addr -- )        gforth  av_ptr
+av_ptr(alist, void*, c_addr);
+
+av-call-void    ( -- )          gforth  av_call_void
+SAVE_REGS
+av_call(alist);
+REST_REGS
+
+av-call-int    ( -- w )        gforth  av_call_int
+SAVE_REGS
+av_call(alist);
+REST_REGS
+w = irv;
+
+av-call-float   ( -- r )        gforth  av_call_float
+SAVE_REGS
+av_call(alist);
+REST_REGS
+r = frv;
+
+av-call-double   ( -- r )        gforth  av_call_double
+SAVE_REGS
+av_call(alist);
+REST_REGS
+r = drv;
+
+av-call-longlong   ( -- d )        gforth  av_call_longlong
+SAVE_REGS
+av_call(alist);
+REST_REGS
+d = llrv;
+
+av-call-ptr   ( -- c_addr )        gforth  av_call_ptr
+SAVE_REGS
+av_call(alist);
+REST_REGS
+c_addr = prv;
+
+alloc-callback	( xt -- c_addr )	gforth	alloc_callback
+c_addr = (char *)alloc_callback(engine_callback, ((Xt *)xt)+2);
+
+va-start-int	( -- w )	gforth	va_start_int
+w = va_start_int(clist);
+
+va-start-longlong	( -- d )	gforth	va_start_longlong
+d = va_start_longlong(clist);
+
+va-start-ptr	( -- c_addr )	gforth	va_start_ptr
+c_addr = (char *)va_start_ptr(clist, (char *));
+
+va-start-float	( -- r )	gforth	va_start_float
+r = va_start_float(clist);
+
+va-start-double	( -- r )	gforth	va_start_double
+r = va_start_double(clist);
+
+va-return-void ( -- )	gforth va_return_void
+va_return_void(clist);
+return 0;
+
+va-return-int ( w -- )	gforth va_return_int
+va_return_int(clist, w);
+return 0;
+
+va-return-ptr ( c_addr -- )	gforth va_return_ptr
+va_return_ptr(clist, void *, c_addr);
+return 0;
+
+va-return-longlong ( d -- )	gforth va_return_longlong
+va_return_longlong(clist, d);
+return 0;
+
+va-return-float ( r -- )	gforth va_return_float
+va_return_float(clist, r);
+return 0;
+
+va-return-double ( r -- )	gforth va_return_double
+va_return_double(clist, r);
+return 0;
+
+\-
+
 define(`uploop',
        `pushdef(`$1', `$2')_uploop(`$1', `$2', `$3', `$4', `$5')`'popdef(`$1')')
 define(`_uploop',
@@ -2182,39 +2334,13 @@ rret = (SYSCALL(Float(*)(argdlist($1)))u
 
 \ close ' to keep fontify happy
 
-open-lib	( c_addr1 u1 -- u2 )	gforth	open_lib
-#if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN)
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif
-u2=(UCell) dlopen(cstr(c_addr1, u1, 1), RTLD_GLOBAL | RTLD_LAZY);
-#else
-#  ifdef _WIN32
-u2 = (Cell) GetModuleHandle(cstr(c_addr1, u1, 1));
-#  else
-#warning Define open-lib!
-u2 = 0;
-#  endif
-#endif
-
-lib-sym	( c_addr1 u1 u2 -- u3 )	gforth	lib_sym
-#if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN)
-u3 = (UCell) dlsym((void*)u2,cstr(c_addr1, u1, 1));
-#else
-#  ifdef _WIN32
-u3 = (Cell) GetProcAddress((HMODULE)u2, cstr(c_addr1, u1, 1));
-#  else
-#warning Define lib-sym!
-u3 = 0;
-#  endif
-#endif
-
 uploop(i, 0, 7, `icall(i)')
 icall(20)
 uploop(i, 0, 7, `fcall(i)')
 fcall(20)
 
 \+
+\+
 
 wcall	( u -- )	gforth
 IF_fpTOS(fp[0]=fpTOS);
@@ -2262,8 +2388,18 @@ JUMP(a_callee);
 assert(0);
 #endif
 
+tag-offsets ( -- a_addr ) gforth tag_offsets
+extern Cell groups[32];
+a_addr = groups;
+
 \+
 
+\g static_super
+
+\C #if !defined(GFORTH_DEBUGGING) && !defined(INDIRECT_THREADED) && !defined(DOUBLY_INDIRECT) && !defined(VM_PROFILING)
+
 include(peeprules.vmg)
 
+\C #endif
+
 \g end