--- gforth/engine/engine.c 2003/01/20 17:07:40 1.57
+++ gforth/engine/engine.c 2003/08/04 20:32:36 1.63
@@ -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.
@@ -59,6 +59,11 @@
#include
#endif
+#ifdef HAS_FFCALL
+#include
+#include
+#endif
+
#ifndef SEEK_SET
/* should be defined in stdio.h, but some systems don't have it */
#define SEEK_SET 0
@@ -72,24 +77,6 @@
#define ftello ftell
#endif
-#define IOR(flag) ((flag)? -512-errno : 0)
-
-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))
-
#define NULLC '\0'
#ifdef MEMCMP_AS_SUBROUTINE
@@ -174,7 +161,7 @@ extern int gforth_memcmp(const char * s1
# 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
@@ -202,6 +189,11 @@ extern int gforth_memcmp(const char * s1
}
#endif
+#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
+
#if !defined(ENGINE)
/* normal engine */
#define VARIANT(v) (v)
@@ -230,7 +222,6 @@ extern int gforth_memcmp(const char * s1
#define LABEL2(name) K_##name:
-
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
@@ -249,6 +240,15 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
#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;)
@@ -307,7 +307,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
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];