--- gforth/vmgen-ex/mini.h	2001/05/01 10:20:56	1.2
+++ gforth/vmgen-ex/mini.h	2003/03/09 15:17:09	1.9
@@ -1,6 +1,6 @@
 /* support functions for vmgen example
 
-  Copyright (C) 2001 Free Software Foundation, Inc.
+  Copyright (C) 2001,2002 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -21,9 +21,16 @@
 
 #include <stdio.h>
 
-typedef void *Label;
-typedef void *Inst; /* for direct threading, the same as Label */
 typedef long Cell;
+#ifdef __GNUC__
+typedef void *Label;
+typedef Label Inst; /* we could "typedef Cell Inst", removing the need
+                       for casts in a few places, but requiring a few
+                       casts etc. in other places */
+#else
+typedef long Label;
+typedef long Inst;
+#endif
 
 extern Inst *vm_prim;
 extern int locals;
@@ -36,6 +43,7 @@ extern FILE *vm_out;
 extern Inst *vmcodep;
 extern Inst *last_compiled;
 extern Inst *vmcode_end;
+extern int use_super;
 
 /* generic vmgen support functions (e.g., wrappers) */
 void gen_inst(Inst **vmcodepp, Inst i);
@@ -45,6 +53,23 @@ void vm_count_block(Inst *ip);
 struct block_count *block_insert(Inst *ip);
 void vm_print_profile(FILE *file);
 
+/* type change macros; these are specific to the types you use, so you
+   have to change this part */
+#define vm_Cell2i(_cell,x)	((x)=(long)(_cell))
+#define vm_Cell2target(_cell,x)	((x)=(Inst *)(_cell))
+#define vm_Cell2a(_cell,x)	((x)=(char *)(_cell))
+#define vm_i2Cell(x,_cell)	((_cell)=(Cell)(x))
+#define vm_target2Cell(x,_cell)	((_cell)=(Cell)(x))
+#define vm_a2Cell(x,_cell)	((_cell)=(Cell)(x))
+#define vm_Cell2Cell(_x,_y) ((_y)=(Cell)(_x))
+/* the cast in vm_Cell2Cell is needed because the base type for
+   inst-stream is Cell, but *IP is an Inst */
+
+/* for future extensions */
+#define IMM_ARG(access,value)		(access)
+
+#define VM_IS_INST(inst, n) ((inst) == vm_prim[n])
+
 /* mini type-specific support functions */
 void genarg_i(Inst **vmcodepp, Cell i);
 void printarg_i(Cell i);