bytecode2.h -> bytecode.h

8 files changed, 446 insertions, 480 deletions

diff --git a/colm/bytecode.c b/colm/bytecode.c
index 59afafcb..0d699f52 100644
--- a/colm/bytecode.c
+++ b/colm/bytecode.c
@@ -28,7 +28,7 @@
 #include "pdarun.h"
 #include "fsmrun2.h"
 #include "tree.h"
-#include "bytecode2.h"
+#include "bytecode.h"
 #include "pool.h"
 #include "debug.h"
 #include "config.h"
diff --git a/colm/bytecode.h b/colm/bytecode.h
index e633cc44..d885023a 100644
--- a/colm/bytecode.h
+++ b/colm/bytecode.h
@@ -19,19 +19,451 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#ifndef _BYTECODE_H
-#define _BYTECODE_H
+#ifndef _BYTECODE2_H
+#define _BYTECODE2_H
 
-#include "rtvector.h"
-#include "config.h"
-#include "pool.h"
 #include "pdarun.h"
-#include "map.h"
-#include "bytecode2.h"
 #include "tree.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef unsigned long ulong;
+typedef unsigned char uchar;
+
+#define IN_SAVE_LHS              0xbe
+#define IN_RESTORE_LHS           0x01
+
+#define IN_LOAD_INT              0x02
+#define IN_LOAD_STR              0x03
+#define IN_LOAD_NIL              0x04
+#define IN_LOAD_TRUE             0x05
+#define IN_LOAD_FALSE            0x06
+
+#define IN_ADD_INT               0x07
+#define IN_SUB_INT               0x08
+#define IN_MULT_INT              0x09
+#define IN_DIV_INT               0xd0
+
+#define IN_TST_EQL               0x0a
+#define IN_TST_NOT_EQL           0x0b
+#define IN_TST_LESS              0x0c
+#define IN_TST_GRTR              0x0d
+#define IN_TST_LESS_EQL          0x0e
+#define IN_TST_GRTR_EQL          0x0f
+#define IN_TST_LOGICAL_AND       0x10
+#define IN_TST_LOGICAL_OR        0x11
+
+#define IN_NOT                   0x12
+
+#define IN_JMP                   0x13
+#define IN_JMP_FALSE             0x14
+#define IN_JMP_TRUE              0x15
+
+#define IN_STR_ATOI              0x16
+#define IN_STR_LENGTH            0x17
+#define IN_CONCAT_STR            0x18
+
+#define IN_INIT_LOCALS           0x19
+#define IN_POP_LOCALS            0x1a
+#define IN_POP                   0x1b
+#define IN_POP_N_WORDS           0x1c
+#define IN_DUP_TOP               0x1d
+#define IN_DUP_TOP_OFF           0xbc
+#define IN_REJECT                0x1e
+#define IN_MATCH                 0x1f
+#define IN_CONSTRUCT             0x20
+#define IN_TREE_NEW              0x21
+
+#define IN_GET_LOCAL_R           0x22
+#define IN_GET_LOCAL_WC          0x23
+#define IN_SET_LOCAL_WC          0x24
+
+#define IN_GET_LOCAL_REF_R       0x25
+#define IN_GET_LOCAL_REF_WC      0x26
+#define IN_SET_LOCAL_REF_WC      0x27
+
+#define IN_SAVE_RET              0x28
+
+#define IN_GET_FIELD_R           0x29
+#define IN_GET_FIELD_WC          0x2a
+#define IN_GET_FIELD_WV          0x2b
+#define IN_GET_FIELD_BKT         0x2c
+
+#define IN_SET_FIELD_WV          0x2d
+#define IN_SET_FIELD_WC          0x2e
+#define IN_SET_FIELD_BKT         0x2f
+#define IN_SET_FIELD_LEAVE_WC    0x30
+
+#define IN_GET_MATCH_LENGTH_R    0x31
+#define IN_GET_MATCH_TEXT_R      0x32
+
+#define IN_GET_TOKEN_DATA_R      0x33
+#define IN_SET_TOKEN_DATA_WC     0x34
+#define IN_SET_TOKEN_DATA_WV     0x35
+#define IN_SET_TOKEN_DATA_BKT    0x36
+
+#define IN_GET_TOKEN_POS_R       0x37
+
+#define IN_INIT_RHS_EL           0x38
+#define IN_INIT_CAPTURES         0x39
+
+#define IN_TRITER_FROM_REF       0x3a
+#define IN_TRITER_ADVANCE        0x3b
+#define IN_TRITER_NEXT_CHILD     0x3c
+#define IN_TRITER_GET_CUR_R      0x3d
+#define IN_TRITER_GET_CUR_WC     0x3e
+#define IN_TRITER_SET_CUR_WC     0x3f
+#define IN_TRITER_DESTROY        0x40
+#define IN_TRITER_NEXT_REPEAT    0x41
+#define IN_TRITER_PREV_REPEAT    0x42
+
+#define IN_REV_TRITER_FROM_REF   0x43
+#define IN_REV_TRITER_DESTROY    0x44
+#define IN_REV_TRITER_PREV_CHILD 0x45
+
+#define IN_UITER_DESTROY         0x46
+#define IN_UITER_CREATE_WV       0x47
+#define IN_UITER_CREATE_WC       0x48
+#define IN_UITER_ADVANCE         0x49
+#define IN_UITER_GET_CUR_R       0x4a
+#define IN_UITER_GET_CUR_WC      0x4b
+#define IN_UITER_SET_CUR_WC      0x4c
+
+#define IN_TREE_SEARCH           0x4d
+
+#define IN_LOAD_GLOBAL_R         0x4e
+#define IN_LOAD_GLOBAL_WV        0x4f
+#define IN_LOAD_GLOBAL_WC        0x50
+#define IN_LOAD_GLOBAL_BKT       0x51
+
+#define IN_PTR_DEREF_R           0x52
+#define IN_PTR_DEREF_WV          0x53
+#define IN_PTR_DEREF_WC          0x54
+#define IN_PTR_DEREF_BKT         0x55
+
+#define IN_REF_FROM_LOCAL        0x56
+#define IN_REF_FROM_REF          0x57
+#define IN_REF_FROM_QUAL_REF     0x58
+#define IN_TRITER_REF_FROM_CUR   0x59
+#define IN_UITER_REF_FROM_CUR    0x5a
+
+#define IN_MAP_LENGTH            0x5b
+#define IN_MAP_FIND              0x5c
+#define IN_MAP_INSERT_WV         0x5d
+#define IN_MAP_INSERT_WC         0x5e
+#define IN_MAP_INSERT_BKT        0x5f
+#define IN_MAP_STORE_WV          0x60
+#define IN_MAP_STORE_WC          0x61
+#define IN_MAP_STORE_BKT         0x62
+#define IN_MAP_REMOVE_WV         0x63
+#define IN_MAP_REMOVE_WC         0x64
+#define IN_MAP_REMOVE_BKT        0x65
+
+#define IN_LIST_LENGTH           0x66
+#define IN_LIST_APPEND_WV        0x67
+#define IN_LIST_APPEND_WC        0x68
+#define IN_LIST_APPEND_BKT       0x69
+#define IN_LIST_REMOVE_END_WV    0x6a
+#define IN_LIST_REMOVE_END_WC    0x6b
+#define IN_LIST_REMOVE_END_BKT   0x6c
+
+#define IN_GET_LIST_MEM_R        0x6d
+#define IN_GET_LIST_MEM_WC       0x6e
+#define IN_GET_LIST_MEM_WV       0x6f
+#define IN_GET_LIST_MEM_BKT      0x70
+#define IN_SET_LIST_MEM_WV       0x71
+#define IN_SET_LIST_MEM_WC       0x72
+#define IN_SET_LIST_MEM_BKT      0x73
+
+#define IN_VECTOR_LENGTH         0x74
+#define IN_VECTOR_APPEND_WV      0x75
+#define IN_VECTOR_APPEND_WC      0x76
+#define IN_VECTOR_APPEND_BKT     0x77
+#define IN_VECTOR_INSERT_WV      0x78
+#define IN_VECTOR_INSERT_WC      0x79
+#define IN_VECTOR_INSERT_BKT     0x7a
+
+#define IN_PRINT                 0x7b
+#define IN_PRINT_XML_AC          0x7c
+#define IN_PRINT_XML             0x7d
+#define IN_PRINT_STREAM          0x7e
+
+#define IN_HALT                  0x7f
+
+#define IN_CALL_WC               0x80
+#define IN_CALL_WV               0x81
+#define IN_RET                   0x82
+#define IN_YIELD                 0x83
+#define IN_STOP                  0x84
+
+#define IN_STR_UORD8             0x85
+#define IN_STR_SORD8             0x86
+#define IN_STR_UORD16            0x87
+#define IN_STR_SORD16            0x88
+#define IN_STR_UORD32            0x89
+#define IN_STR_SORD32            0x8a
+
+#define IN_INT_TO_STR            0x8b
+#define IN_TREE_TO_STR           0x8c
+
+#define IN_CREATE_TOKEN          0x8d
+#define IN_MAKE_TOKEN            0x8e
+#define IN_MAKE_TREE             0x8f
+#define IN_CONSTRUCT_TERM        0x90
+
+
+#define IN_STREAM_PULL           0x94
+#define IN_STREAM_PULL_BKT       0x95
+
+//#define IN_PARSE_WV              0x91
+//#define IN_PARSE_WC              0x92
+//#define IN_PARSE_BKT             0x93
+//#define IN_PARSE_TREE_WC         0x9a
+//#define IN_PARSE_TREE_WV         0x9b
+
+#define IN_PARSE_FRAG_WC         0xc0
+#define IN_PARSE_FRAG_WV         0xc1
+#define IN_PARSE_FRAG_BKT        0xc2
+
+#define IN_EXTRACT_INPUT_WC      0xc3
+#define IN_EXTRACT_INPUT_WV      0xc4
+#define IN_EXTRACT_INPUT_BKT     0xc5
+
+#define IN_SET_INPUT_WC          0xc9
+
+#define IN_STREAM_APPEND_WC      0xc6
+#define IN_STREAM_APPEND_WV      0xc7
+#define IN_STREAM_APPEND_BKT     0xc8
+
+#define IN_PARSE_FINISH_WC       0x9d
+#define IN_PARSE_FINISH_WV       0xbd
+#define IN_PARSE_FINISH_BKT      0xbf
+
+#define IN_PARSE_EXTRACT_INPUT 
+
+#define IN_OPEN_FILE             0x9e
+#define IN_GET_STDIN             0x9f
+#define IN_GET_STDOUT            0xa0
+#define IN_GET_STDERR            0xa1
+#define IN_LOAD_ARGV             0xa2
+#define IN_TO_UPPER              0xa3
+#define IN_TO_LOWER              0xa4
+#define IN_EXIT                  0xa5
+
+#define IN_STREAM_PUSH_WV        0x96
+#define IN_STREAM_PUSH_BKT       0x97
+#define IN_STREAM_PUSH_IGNORE_WV 0xbb
+#define IN_LOAD_INPUT_R          0xa8
+#define IN_LOAD_INPUT_WV         0xa9
+#define IN_LOAD_INPUT_WC         0xaa
+#define IN_LOAD_INPUT_BKT        0xab
+
+#define IN_LOAD_CONTEXT_R        0xac
+#define IN_LOAD_CONTEXT_WV       0xad
+#define IN_LOAD_CONTEXT_WC       0xae
+#define IN_LOAD_CONTEXT_BKT      0xaf
+
+#define IN_GET_ACCUM_CTX_R       0xb0
+#define IN_GET_ACCUM_CTX_WC      0xb1
+#define IN_GET_ACCUM_CTX_WV      0xb2
+#define IN_SET_ACCUM_CTX_WC      0xb3
+#define IN_SET_ACCUM_CTX_WV      0xb4
+
+#define IN_LOAD_CTX_R            0xb5
+#define IN_LOAD_CTX_WC           0xb6
+#define IN_LOAD_CTX_WV           0xb7
+#define IN_LOAD_CTX_BKT          0xb8
+
+#define IN_SPRINTF               0xcf
+
+
+/* Types */
+#define TYPE_NIL      0x01
+#define TYPE_TREE     0x02
+#define TYPE_REF      0x03
+#define TYPE_PTR      0x04
+#define TYPE_ITER     0x05
+
+/* Types of Generics. */
+#define GEN_LIST      0x10
+#define GEN_MAP       0x11
+#define GEN_VECTOR    0x12
+#define GEN_PARSER    0x13
+
+/* Virtual machine stack size, number of pointers. 
+ * This will be mmapped. */
+#define VM_STACK_SIZE (SIZEOF_WORD*1024ll*1024ll) 
+
+/* Known language element ids. */
+#define LEL_ID_PTR    1
+#define LEL_ID_BOOL   2
+#define LEL_ID_INT    3
+#define LEL_ID_STR    4
+#define LEL_ID_STREAM 5
+
 /*
- * Runtime environment
+ * Flags
  */
 
+/* A tree that has been generated by a termDup. */
+#define AF_TERM_DUP    0x1
+
+/* Has been processed by the commit function. All children have also been
+ * processed. */
+#define AF_COMMITTED   0x2
+
+/* Created by a token generation action, not made from the input. */
+#define AF_ARTIFICIAL  0x4
+
+/* Named node from a pattern or constructor. */
+#define AF_NAMED       0x8
+
+/* There is reverse code associated with this tree node. */
+#define AF_HAS_RCODE   0x10
+
+/* Tree was produced by a parse routine. This means the data fields for
+ * managing parsing fields will be active. */
+#define AF_PARSED      0x20
+
+/* Tree was allocated as a ParseTree. */
+#define AF_PARSE_TREE  0x40
+
+#define AF_LEFT_IGNORE   0x100
+#define AF_RIGHT_IGNORE  0x200
+
+/*
+ * Call stack.
+ */
+
+/* Number of spots in the frame, after the args. */
+#define FR_AA 3
+
+/* Positions relative to the frame pointer. */
+#define FR_RV 2    /* return value */
+#define FR_RI 1    /* return instruction */
+#define FR_RF 0    /* return frame pointer */
+
+/*
+ * Calling Convention:
+ *   a1
+ *   a2
+ *   a3
+ *   ...
+ *   return value FR_RV
+ *   return instr FR_RI
+ *   return frame FR_RF
+ */
+
+/*
+ * User iterator call stack. 
+ * Adds an iframe pointer, removes the return value.
+ */
+
+/* Number of spots in the frame, after the args. */
+#define IFR_AA  3
+
+/* Positions relative to the frame pointer. */
+#define IFR_RIN 2    /* return instruction */
+#define IFR_RIF 1    /* return iframe pointer */
+#define IFR_RFR 0    /* return frame pointer */
+
+#define vm_push(i) (*(--sp) = (i))
+#define vm_pop() (*sp++)
+#define vm_top() (*sp)
+#define vm_ptop() (sp)
+
+typedef Tree *SW;
+typedef Tree **StackPtr;
+
+
+/* Can't use sizeof() because we have used types that are bigger than the
+ * serial representation. */
+#define SIZEOF_CODE 1
+#define SIZEOF_HALF 2
+#define SIZEOF_WORD sizeof(Word)
+
+typedef struct _Execution
+{
+	Program *prg;
+	PdaTables *pdaTables;
+	PdaRun *pdaRun;
+	FsmRun *fsmRun;
+	Code *code;
+	Tree **frame;
+	Tree **iframe;
+
+	/* The left hand side passed in and the saved left hand side in case we
+	 * need to preserve it for backtracking before we write to it. */
+	Tree *lhs;
+	Tree *parsed;
+
+	long genId;
+	Head *matchText;
+	int reject;
+
+	/* Reverse code. */
+	RtCodeVect *reverseCode;
+	long rcodeUnitLen;
+	char **captures;
+
+} Execution;
+
+long stringLength( Head *str );
+const char *stringData( Head *str );
+Head *stringAllocFull( Program *prg, const char *data, long length );
+Head *stringCopy( Program *prg, Head *head );
+void stringFree( Program *prg, Head *head );
+void stringShorten( Head *tokdata, long newlen );
+Head *concatStr( Head *s1, Head *s2 );
+Word strAtoi( Head *str );
+Word strUord16( Head *head );
+Word strUord8( Head *head );
+Word cmpString( Head *s1, Head *s2 );
+Head *stringToUpper( Head *s );
+Head *stringToLower( Head *s );
+Head *stringSprintf( Program *prg, Str *format, Int *integer );
+
+Head *makeLiteral( Program *prg, long litoffset );
+Head *intToStr( Program *prg, Word i );
+
+Tree *constructString( Program *prg, Head *s );
+
+void initExecution( Execution *exec, Program *prg, RtCodeVect *reverseCode,
+		PdaRun *pdaRun, FsmRun *fsmRun, Code *code, Tree *lhs,
+		long genId, Head *matchText, char **captures );
+
+void rexecute( Execution *exec, Tree **sp, RtCodeVect *allRev );
+
+Kid *allocAttrs( Program *prg, long length );
+void freeAttrs( Program *prg, Kid *attrs );
+void setAttr( Tree *tree, long pos, Tree *val );
+Tree *getAttr( Tree *tree, long pos );
+Kid *getAttrKid( Tree *tree, long pos );
+
+void execute( Execution *exec, Tree **sp );
+
+Tree *splitTree( Program *prg, Tree *t );
+void rcodeDownrefAll( Program *prg, Tree **sp, RtCodeVect *cv );
+void commitFull( Tree **sp, PdaRun *parser, long commitReduce );
+Tree *getParsedRoot( PdaRun *pdaRun, int stop );
+Tree *prepParseTree( Program *prg, Tree **sp, Tree *tree );
+void printTree2( FILE *out, Tree **sp, Program *prg, Tree *tree );
+void splitRef( Tree ***sp, Program *prg, Ref *fromRef );
+
+void initProgram( Program *program, int argc, char **argv,
+		int ctxDepParsing, RuntimeData *rtd );
+void clearProgram( Program *prg, Tree **vm_stack, Tree **sp );
+void runProgram( Program *prg );
+void allocGlobal( Program *prg );
+
+void executeCode( Execution *exec, Tree **sp, Code *instr );
+void rcodeDownref( Program *prg, Tree **sp, Code *instr );
+Tree **stackAlloc();
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/colm/bytecode2.h b/colm/bytecode2.h
deleted file mode 100644
index c25e90bf..00000000
--- a/colm/bytecode2.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- *  Copyright 2007-2010 Adrian Thurston <thurston@complang.org>
- */
-
-/*  This file is part of Colm.
- *
- *  Colm 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 of the License, or
- *  (at your option) any later version.
- * 
- *  Colm is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with Colm; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
- */
-
-#ifndef _BYTECODE2_H
-#define _BYTECODE2_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned long ulong;
-typedef unsigned char uchar;
-
-#define IN_SAVE_LHS              0xbe
-#define IN_RESTORE_LHS           0x01
-
-#define IN_LOAD_INT              0x02
-#define IN_LOAD_STR              0x03
-#define IN_LOAD_NIL              0x04
-#define IN_LOAD_TRUE             0x05
-#define IN_LOAD_FALSE            0x06
-
-#define IN_ADD_INT               0x07
-#define IN_SUB_INT               0x08
-#define IN_MULT_INT              0x09
-#define IN_DIV_INT               0xd0
-
-#define IN_TST_EQL               0x0a
-#define IN_TST_NOT_EQL           0x0b
-#define IN_TST_LESS              0x0c
-#define IN_TST_GRTR              0x0d
-#define IN_TST_LESS_EQL          0x0e
-#define IN_TST_GRTR_EQL          0x0f
-#define IN_TST_LOGICAL_AND       0x10
-#define IN_TST_LOGICAL_OR        0x11
-
-#define IN_NOT                   0x12
-
-#define IN_JMP                   0x13
-#define IN_JMP_FALSE             0x14
-#define IN_JMP_TRUE              0x15
-
-#define IN_STR_ATOI              0x16
-#define IN_STR_LENGTH            0x17
-#define IN_CONCAT_STR            0x18
-
-#define IN_INIT_LOCALS           0x19
-#define IN_POP_LOCALS            0x1a
-#define IN_POP                   0x1b
-#define IN_POP_N_WORDS           0x1c
-#define IN_DUP_TOP               0x1d
-#define IN_DUP_TOP_OFF           0xbc
-#define IN_REJECT                0x1e
-#define IN_MATCH                 0x1f
-#define IN_CONSTRUCT             0x20
-#define IN_TREE_NEW              0x21
-
-#define IN_GET_LOCAL_R           0x22
-#define IN_GET_LOCAL_WC          0x23
-#define IN_SET_LOCAL_WC          0x24
-
-#define IN_GET_LOCAL_REF_R       0x25
-#define IN_GET_LOCAL_REF_WC      0x26
-#define IN_SET_LOCAL_REF_WC      0x27
-
-#define IN_SAVE_RET              0x28
-
-#define IN_GET_FIELD_R           0x29
-#define IN_GET_FIELD_WC          0x2a
-#define IN_GET_FIELD_WV          0x2b
-#define IN_GET_FIELD_BKT         0x2c
-
-#define IN_SET_FIELD_WV          0x2d
-#define IN_SET_FIELD_WC          0x2e
-#define IN_SET_FIELD_BKT         0x2f
-#define IN_SET_FIELD_LEAVE_WC    0x30
-
-#define IN_GET_MATCH_LENGTH_R    0x31
-#define IN_GET_MATCH_TEXT_R      0x32
-
-#define IN_GET_TOKEN_DATA_R      0x33
-#define IN_SET_TOKEN_DATA_WC     0x34
-#define IN_SET_TOKEN_DATA_WV     0x35
-#define IN_SET_TOKEN_DATA_BKT    0x36
-
-#define IN_GET_TOKEN_POS_R       0x37
-
-#define IN_INIT_RHS_EL           0x38
-#define IN_INIT_CAPTURES         0x39
-
-#define IN_TRITER_FROM_REF       0x3a
-#define IN_TRITER_ADVANCE        0x3b
-#define IN_TRITER_NEXT_CHILD     0x3c
-#define IN_TRITER_GET_CUR_R      0x3d
-#define IN_TRITER_GET_CUR_WC     0x3e
-#define IN_TRITER_SET_CUR_WC     0x3f
-#define IN_TRITER_DESTROY        0x40
-#define IN_TRITER_NEXT_REPEAT    0x41
-#define IN_TRITER_PREV_REPEAT    0x42
-
-#define IN_REV_TRITER_FROM_REF   0x43
-#define IN_REV_TRITER_DESTROY    0x44
-#define IN_REV_TRITER_PREV_CHILD 0x45
-
-#define IN_UITER_DESTROY         0x46
-#define IN_UITER_CREATE_WV       0x47
-#define IN_UITER_CREATE_WC       0x48
-#define IN_UITER_ADVANCE         0x49
-#define IN_UITER_GET_CUR_R       0x4a
-#define IN_UITER_GET_CUR_WC      0x4b
-#define IN_UITER_SET_CUR_WC      0x4c
-
-#define IN_TREE_SEARCH           0x4d
-
-#define IN_LOAD_GLOBAL_R         0x4e
-#define IN_LOAD_GLOBAL_WV        0x4f
-#define IN_LOAD_GLOBAL_WC        0x50
-#define IN_LOAD_GLOBAL_BKT       0x51
-
-#define IN_PTR_DEREF_R           0x52
-#define IN_PTR_DEREF_WV          0x53
-#define IN_PTR_DEREF_WC          0x54
-#define IN_PTR_DEREF_BKT         0x55
-
-#define IN_REF_FROM_LOCAL        0x56
-#define IN_REF_FROM_REF          0x57
-#define IN_REF_FROM_QUAL_REF     0x58
-#define IN_TRITER_REF_FROM_CUR   0x59
-#define IN_UITER_REF_FROM_CUR    0x5a
-
-#define IN_MAP_LENGTH            0x5b
-#define IN_MAP_FIND              0x5c
-#define IN_MAP_INSERT_WV         0x5d
-#define IN_MAP_INSERT_WC         0x5e
-#define IN_MAP_INSERT_BKT        0x5f
-#define IN_MAP_STORE_WV          0x60
-#define IN_MAP_STORE_WC          0x61
-#define IN_MAP_STORE_BKT         0x62
-#define IN_MAP_REMOVE_WV         0x63
-#define IN_MAP_REMOVE_WC         0x64
-#define IN_MAP_REMOVE_BKT        0x65
-
-#define IN_LIST_LENGTH           0x66
-#define IN_LIST_APPEND_WV        0x67
-#define IN_LIST_APPEND_WC        0x68
-#define IN_LIST_APPEND_BKT       0x69
-#define IN_LIST_REMOVE_END_WV    0x6a
-#define IN_LIST_REMOVE_END_WC    0x6b
-#define IN_LIST_REMOVE_END_BKT   0x6c
-
-#define IN_GET_LIST_MEM_R        0x6d
-#define IN_GET_LIST_MEM_WC       0x6e
-#define IN_GET_LIST_MEM_WV       0x6f
-#define IN_GET_LIST_MEM_BKT      0x70
-#define IN_SET_LIST_MEM_WV       0x71
-#define IN_SET_LIST_MEM_WC       0x72
-#define IN_SET_LIST_MEM_BKT      0x73
-
-#define IN_VECTOR_LENGTH         0x74
-#define IN_VECTOR_APPEND_WV      0x75
-#define IN_VECTOR_APPEND_WC      0x76
-#define IN_VECTOR_APPEND_BKT     0x77
-#define IN_VECTOR_INSERT_WV      0x78
-#define IN_VECTOR_INSERT_WC      0x79
-#define IN_VECTOR_INSERT_BKT     0x7a
-
-#define IN_PRINT                 0x7b
-#define IN_PRINT_XML_AC          0x7c
-#define IN_PRINT_XML             0x7d
-#define IN_PRINT_STREAM          0x7e
-
-#define IN_HALT                  0x7f
-
-#define IN_CALL_WC               0x80
-#define IN_CALL_WV               0x81
-#define IN_RET                   0x82
-#define IN_YIELD                 0x83
-#define IN_STOP                  0x84
-
-#define IN_STR_UORD8             0x85
-#define IN_STR_SORD8             0x86
-#define IN_STR_UORD16            0x87
-#define IN_STR_SORD16            0x88
-#define IN_STR_UORD32            0x89
-#define IN_STR_SORD32            0x8a
-
-#define IN_INT_TO_STR            0x8b
-#define IN_TREE_TO_STR           0x8c
-
-#define IN_CREATE_TOKEN          0x8d
-#define IN_MAKE_TOKEN            0x8e
-#define IN_MAKE_TREE             0x8f
-#define IN_CONSTRUCT_TERM        0x90
-
-
-#define IN_STREAM_PULL           0x94
-#define IN_STREAM_PULL_BKT       0x95
-
-//#define IN_PARSE_WV              0x91
-//#define IN_PARSE_WC              0x92
-//#define IN_PARSE_BKT             0x93
-//#define IN_PARSE_TREE_WC         0x9a
-//#define IN_PARSE_TREE_WV         0x9b
-
-#define IN_PARSE_FRAG_WC         0xc0
-#define IN_PARSE_FRAG_WV         0xc1
-#define IN_PARSE_FRAG_BKT        0xc2
-
-#define IN_EXTRACT_INPUT_WC      0xc3
-#define IN_EXTRACT_INPUT_WV      0xc4
-#define IN_EXTRACT_INPUT_BKT     0xc5
-
-#define IN_SET_INPUT_WC          0xc9
-
-#define IN_STREAM_APPEND_WC      0xc6
-#define IN_STREAM_APPEND_WV      0xc7
-#define IN_STREAM_APPEND_BKT     0xc8
-
-#define IN_PARSE_FINISH_WC       0x9d
-#define IN_PARSE_FINISH_WV       0xbd
-#define IN_PARSE_FINISH_BKT      0xbf
-
-#define IN_PARSE_EXTRACT_INPUT 
-
-#define IN_OPEN_FILE             0x9e
-#define IN_GET_STDIN             0x9f
-#define IN_GET_STDOUT            0xa0
-#define IN_GET_STDERR            0xa1
-#define IN_LOAD_ARGV             0xa2
-#define IN_TO_UPPER              0xa3
-#define IN_TO_LOWER              0xa4
-#define IN_EXIT                  0xa5
-
-#define IN_STREAM_PUSH_WV        0x96
-#define IN_STREAM_PUSH_BKT       0x97
-#define IN_STREAM_PUSH_IGNORE_WV 0xbb
-#define IN_LOAD_INPUT_R          0xa8
-#define IN_LOAD_INPUT_WV         0xa9
-#define IN_LOAD_INPUT_WC         0xaa
-#define IN_LOAD_INPUT_BKT        0xab
-
-#define IN_LOAD_CONTEXT_R        0xac
-#define IN_LOAD_CONTEXT_WV       0xad
-#define IN_LOAD_CONTEXT_WC       0xae
-#define IN_LOAD_CONTEXT_BKT      0xaf
-
-#define IN_GET_ACCUM_CTX_R       0xb0
-#define IN_GET_ACCUM_CTX_WC      0xb1
-#define IN_GET_ACCUM_CTX_WV      0xb2
-#define IN_SET_ACCUM_CTX_WC      0xb3
-#define IN_SET_ACCUM_CTX_WV      0xb4
-
-#define IN_LOAD_CTX_R            0xb5
-#define IN_LOAD_CTX_WC           0xb6
-#define IN_LOAD_CTX_WV           0xb7
-#define IN_LOAD_CTX_BKT          0xb8
-
-#define IN_SPRINTF               0xcf
-
-
-/* Types */
-#define TYPE_NIL      0x01
-#define TYPE_TREE     0x02
-#define TYPE_REF      0x03
-#define TYPE_PTR      0x04
-#define TYPE_ITER     0x05
-
-/* Types of Generics. */
-#define GEN_LIST      0x10
-#define GEN_MAP       0x11
-#define GEN_VECTOR    0x12
-#define GEN_PARSER    0x13
-
-/* Virtual machine stack size, number of pointers. 
- * This will be mmapped. */
-#define VM_STACK_SIZE (SIZEOF_WORD*1024ll*1024ll) 
-
-/* Known language element ids. */
-#define LEL_ID_PTR    1
-#define LEL_ID_BOOL   2
-#define LEL_ID_INT    3
-#define LEL_ID_STR    4
-#define LEL_ID_STREAM 5
-
-/*
- * Flags
- */
-
-/* A tree that has been generated by a termDup. */
-#define AF_TERM_DUP    0x1
-
-/* Has been processed by the commit function. All children have also been
- * processed. */
-#define AF_COMMITTED   0x2
-
-/* Created by a token generation action, not made from the input. */
-#define AF_ARTIFICIAL  0x4
-
-/* Named node from a pattern or constructor. */
-#define AF_NAMED       0x8
-
-/* There is reverse code associated with this tree node. */
-#define AF_HAS_RCODE   0x10
-
-/* Tree was produced by a parse routine. This means the data fields for
- * managing parsing fields will be active. */
-#define AF_PARSED      0x20
-
-/* Tree was allocated as a ParseTree. */
-#define AF_PARSE_TREE  0x40
-
-#define AF_LEFT_IGNORE   0x100
-#define AF_RIGHT_IGNORE  0x200
-
-/*
- * Call stack.
- */
-
-/* Number of spots in the frame, after the args. */
-#define FR_AA 3
-
-/* Positions relative to the frame pointer. */
-#define FR_RV 2    /* return value */
-#define FR_RI 1    /* return instruction */
-#define FR_RF 0    /* return frame pointer */
-
-/*
- * Calling Convention:
- *   a1
- *   a2
- *   a3
- *   ...
- *   return value FR_RV
- *   return instr FR_RI
- *   return frame FR_RF
- */
-
-/*
- * User iterator call stack. 
- * Adds an iframe pointer, removes the return value.
- */
-
-/* Number of spots in the frame, after the args. */
-#define IFR_AA  3
-
-/* Positions relative to the frame pointer. */
-#define IFR_RIN 2    /* return instruction */
-#define IFR_RIF 1    /* return iframe pointer */
-#define IFR_RFR 0    /* return frame pointer */
-
-#define vm_push(i) (*(--sp) = (i))
-#define vm_pop() (*sp++)
-#define vm_top() (*sp)
-#define vm_ptop() (sp)
-
-typedef Tree *SW;
-typedef Tree **StackPtr;
-
-
-/* Can't use sizeof() because we have used types that are bigger than the
- * serial representation. */
-#define SIZEOF_CODE 1
-#define SIZEOF_HALF 2
-#define SIZEOF_WORD sizeof(Word)
-
-typedef struct _Execution
-{
-	Program *prg;
-	PdaTables *pdaTables;
-	PdaRun *pdaRun;
-	FsmRun *fsmRun;
-	Code *code;
-	Tree **frame;
-	Tree **iframe;
-
-	/* The left hand side passed in and the saved left hand side in case we
-	 * need to preserve it for backtracking before we write to it. */
-	Tree *lhs;
-	Tree *parsed;
-
-	long genId;
-	Head *matchText;
-	int reject;
-
-	/* Reverse code. */
-	RtCodeVect *reverseCode;
-	long rcodeUnitLen;
-	char **captures;
-
-} Execution;
-
-long stringLength( Head *str );
-const char *stringData( Head *str );
-Head *stringAllocFull( Program *prg, const char *data, long length );
-Head *stringCopy( Program *prg, Head *head );
-void stringFree( Program *prg, Head *head );
-void stringShorten( Head *tokdata, long newlen );
-Head *concatStr( Head *s1, Head *s2 );
-Word strAtoi( Head *str );
-Word strUord16( Head *head );
-Word strUord8( Head *head );
-Word cmpString( Head *s1, Head *s2 );
-Head *stringToUpper( Head *s );
-Head *stringToLower( Head *s );
-Head *stringSprintf( Program *prg, Str *format, Int *integer );
-
-Head *makeLiteral( Program *prg, long litoffset );
-Head *intToStr( Program *prg, Word i );
-
-Tree *constructString( Program *prg, Head *s );
-
-void initExecution( Execution *exec, Program *prg, RtCodeVect *reverseCode,
-		PdaRun *pdaRun, FsmRun *fsmRun, Code *code, Tree *lhs,
-		long genId, Head *matchText, char **captures );
-
-void rexecute( Execution *exec, Tree **sp, RtCodeVect *allRev );
-
-Kid *allocAttrs( Program *prg, long length );
-void freeAttrs( Program *prg, Kid *attrs );
-void setAttr( Tree *tree, long pos, Tree *val );
-Tree *getAttr( Tree *tree, long pos );
-Kid *getAttrKid( Tree *tree, long pos );
-
-void execute( Execution *exec, Tree **sp );
-
-Tree *splitTree( Program *prg, Tree *t );
-void rcodeDownrefAll( Program *prg, Tree **sp, RtCodeVect *cv );
-void commitFull( Tree **sp, PdaRun *parser, long commitReduce );
-Tree *getParsedRoot( PdaRun *pdaRun, int stop );
-Tree *prepParseTree( Program *prg, Tree **sp, Tree *tree );
-void printTree2( FILE *out, Tree **sp, Program *prg, Tree *tree );
-void splitRef( Tree ***sp, Program *prg, Ref *fromRef );
-
-void initProgram( Program *program, int argc, char **argv,
-		int ctxDepParsing, RuntimeData *rtd );
-void clearProgram( Program *prg, Tree **vm_stack, Tree **sp );
-void runProgram( Program *prg );
-void allocGlobal( Program *prg );
-
-void executeCode( Execution *exec, Tree **sp, Code *instr );
-void rcodeDownref( Program *prg, Tree **sp, Code *instr );
-Tree **stackAlloc();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/colm/fsmrun.c b/colm/fsmrun.c
index 04df873a..2f475782 100644
--- a/colm/fsmrun.c
+++ b/colm/fsmrun.c
@@ -24,7 +24,7 @@
 #include "input.h"
 #include "debug.h"
 #include "tree.h"
-#include "bytecode2.h"
+#include "bytecode.h"
 #include "pool.h"
 
 #include <string.h>
diff --git a/colm/pdacodegen.cpp b/colm/pdacodegen.cpp
index fab5bffc..cd3907b2 100644
--- a/colm/pdacodegen.cpp
+++ b/colm/pdacodegen.cpp
@@ -86,7 +86,7 @@ void PdaCodeGen::writeFirst()
 		"#include <colm/pdarun.h>\n"
 		"#include <colm/fsmrun2.h>\n"
 		"#include <colm/debug.h>\n"
-		"#include <colm/bytecode2.h>\n"
+		"#include <colm/bytecode.h>\n"
 		"\n"
 		"extern RuntimeData main_runtimeData;\n";
 
diff --git a/colm/pdarun.c b/colm/pdarun.c
index 45dbcf12..c4ff8b88 100644
--- a/colm/pdarun.c
+++ b/colm/pdarun.c
@@ -23,7 +23,7 @@
 #include "debug.h"
 #include "pdarun.h"
 #include "fsmrun2.h"
-#include "bytecode2.h"
+#include "bytecode.h"
 #include "tree.h"
 #include "pool.h"
 
diff --git a/colm/string.c b/colm/string.c
index c9a41b6d..76db3204 100644
--- a/colm/string.c
+++ b/colm/string.c
@@ -21,7 +21,7 @@
 
 #include "pool.h"
 #include "pdarun.h"
-#include "bytecode2.h"
+#include "bytecode.h"
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/colm/tree.c b/colm/tree.c
index b5c46526..caf5b377 100644
--- a/colm/tree.c
+++ b/colm/tree.c
@@ -22,7 +22,7 @@
 #include "pdarun.h"
 #include "tree.h"
 #include "pool.h"
-#include "bytecode2.h"
+#include "bytecode.h"
 #include "debug.h"
 #include "map.h"
 #include <string.h>