--- gforth/vmgen-ex/mini.h	2002/07/30 20:55:11	1.5
+++ gforth/vmgen-ex/mini.h	2007/12/31 19:02:25	1.12
@@ -1,12 +1,12 @@
 /* support functions for vmgen example
 
-  Copyright (C) 2001 Free Software Foundation, Inc.
+  Copyright (C) 2001,2002,2003,2007 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
+  as published by the Free Software Foundation, either version 3
   of the License, or (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
@@ -15,20 +15,21 @@
   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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+  along with this program; if not, see http://www.gnu.org/licenses/.
 */
 
 #include <stdio.h>
 
+typedef long Cell;
 #ifdef __GNUC__
 typedef void *Label;
-typedef void *Inst; /* for direct threading, the same as 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
-typedef long Cell;
 
 extern Inst *vm_prim;
 extern int locals;
@@ -50,6 +51,22 @@ void vm_disassemble(Inst *ip, Inst *endp
 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 */