working assembly baby!
authorBrendan Hansen <brendan.f.hansen@gmail.com>
Wed, 15 Jun 2022 03:50:47 +0000 (22:50 -0500)
committerBrendan Hansen <brendan.f.hansen@gmail.com>
Wed, 15 Jun 2022 03:50:47 +0000 (22:50 -0500)
13 files changed:
build.sh
docs/assembly.md [new file with mode: 0644]
docs/fileformat.md
include/assembler.h [new file with mode: 0644]
include/bh.h
include/vm.h
src/cli.c
src/tools/asm.l [new file with mode: 0644]
src/tools/assembler.c [new file with mode: 0644]
src/tools/lex.yy.c [new file with mode: 0644]
src/vm/program_loader.c
src/vm/vm.c
test.asm [new file with mode: 0644]

index 829b2400ca20e8324be8ac8e5758128e179c14cd..b4bc9a79b3280b0dfb40e1c5467bbba16620e348 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -15,3 +15,11 @@ TARGET=onyx-debug
 LIBS="-L$(pwd) -lonyx_embedder -Wl,-rpath=./"
 
 $CC $FLAGS $INCLUDES -o $TARGET $C_FILES $LIBS $WARNINGS
+
+flex -o src/tools/lex.yy.c src/tools/asm.l
+
+TARGET="assembler"
+C_FILES="src/tools/assembler.c src/tools/lex.yy.c"
+
+$CC $FLAGS $INCLUDES -o $TARGET $C_FILES $LIBS $WARNINGS
+
diff --git a/docs/assembly.md b/docs/assembly.md
new file mode 100644 (file)
index 0000000..50cae28
--- /dev/null
@@ -0,0 +1,34 @@
+
+# Assembly Format
+
+    .native_func print_int 1
+    
+    .func add 2
+        add.i32 %2, %0, %1
+        return %2
+
+    .func count 1
+        imm.i32 %1, 1
+
+      loop:
+        param %0
+        native_call print_int
+        sub.i32 %0, %0, %1
+        br_nz loop, %0
+        return
+
+    .func main 0
+        imm.i32 %0, 1
+        imm.i32 %0, 2
+        param %0
+        param %1
+        call %2, add
+        param %2
+        native_call print_int
+
+        imm.i32 %3, 10
+        param %3
+        call count
+
+        return
+
index 0424fd9a8bd8e76fe043887609500b22ad0e4801..96b3947dac0edf4f87ba27805f422329eabc18a0 100644 (file)
@@ -3,11 +3,11 @@
 
 ## Necessary sections
 
-- [ ] Header
-- [ ] Code
+- [X] Header
+- [X] Code
 - [ ] Data
-- [ ] Func Desc
-- [ ] Native Func Link
+- [X] Func Desc
+- [X] Native Func Link
 
 ### Header
 "OVMI"
diff --git a/include/assembler.h b/include/assembler.h
new file mode 100644 (file)
index 0000000..2205e94
--- /dev/null
@@ -0,0 +1,31 @@
+#ifndef _ASSEMBLER_H
+#define _ASSEMBLER_H
+
+typedef enum token_type_t token_type_t;
+typedef struct token_t token_t;
+
+enum token_type_t {
+    token_none,
+    token_newline,
+    token_integer,
+    token_command,
+    token_symbol,
+    token_register,
+    token_label,
+    token_comma,
+};
+
+struct token_t {
+    token_type_t type;
+    char        *text;
+    int          line;
+};
+
+token_t asm_lexer_next_token();
+token_t asm_lexer_peek_token();
+void asm_lexer_input(char *data, int size);
+
+extern char *token_names[];
+
+#endif
+
index b83fd81211ea36a6c519635342fe3de9d0c27220..30bb0952a7776db53697b715fb4900ef33dc8d37 100644 (file)
@@ -1480,8 +1480,13 @@ b32 bh_file_read_at(bh_file* file, i64 offset, void* buffer, isize buff_size, is
     }
 
     isize res = pread(file->fd, buffer, buff_size, offset);
+
     if (res < 0) return 0;
     if (bytes_read) *bytes_read = res;
+
+    i64 ignore;
+    bh__file_seek_wrapper(file->fd, offset + res, BH_FILE_WHENCE_BEGIN, &ignore);
+
     return 1;
 #endif
 }
index 04d15b9988c40b1ef235ae0938af5c3d4abadd3c..0a66d8ee10fdda4e5d8671c91a822a23d10144c3 100644 (file)
@@ -55,6 +55,7 @@ ovm_program_t *ovm_program_new(ovm_store_t *store);
 void ovm_program_delete(ovm_program_t *program);
 void ovm_program_add_instructions(ovm_program_t *program, i32 instr_count, ovm_instr_t *instrs);
 void ovm_program_print_instructions(ovm_program_t *program, i32 start_instr, i32 instr_count);
+void ovm_raw_print_instructions(i32 instr_count, ovm_instr_t *instrs);
 
 void ovm_program_register_func(ovm_program_t *program, char *name, i32 instr, i32 param_count, i32 value_number_count);
 void ovm_program_begin_func(ovm_program_t *program, char *name, i32 param_count, i32 value_number_count);
@@ -178,14 +179,7 @@ struct ovm_value_t {
 };
 
 struct ovm_instr_t {
-    union {
-        struct {
-            ovm_valtype_t    type  : 8;
-            ovm_instr_kind_t instr : 24;
-        };
-
-        u32 full_instr;
-    };
+    u32 full_instr;
 
     // Destination value number.
     ovm_valnum_t r;
@@ -204,12 +198,8 @@ struct ovm_instr_t {
     };
 };
 
-// Missing instructions
-//    - mov
-//    - load
-//    - store
-//    - copy
-//    - fill
+#define OVM_INSTR_TYPE(instr)  ((instr).full_instr >> 24)
+#define OVM_INSTR_INSTR(instr) ((instr).full_instr & 0xffffff)
 
 
 #define OVMI_NOP               0x00
@@ -252,7 +242,7 @@ struct ovm_instr_t {
 #define OVMI_CALLI             0x34   // $r = $a(...)
 #define OVMI_NATIVE_CALLI      0x35   // $r = $a(...)
 
-#define OVMI_BR                0x40   // br pc + a             // Relative branching
+#define OVMI_BR                0x40   // br pc + a              // Relative branching
 #define OVMI_BR_NZ             0x41   // br pc + a if $b != 0
 #define OVMI_BRI               0x42   // br pc + $a             // Relative branching
 #define OVMI_BRI_NZ            0x43   // br pc + $a if $b != 0
@@ -265,7 +255,7 @@ struct ovm_instr_t {
 //
 // OVM_TYPED_INSTR(OVMI_ADD, OVM_TYPE_I32) == instruction for adding i32s
 //
-#define OVM_TYPED_INSTR(instr, type)  (((instr) << 8) | (type))
+#define OVM_TYPED_INSTR(instr, type)  (((type) << 24) | (instr))
 
 
 #endif
index 199e8fc9157d6c9e73ab453fb2ce1a0ded204939..636f76402c4911f9ffae519250bdbefa70abab9b 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -1,10 +1,7 @@
 #include "vm.h"
 
 void print_result(void *data, ovm_value_t *params, ovm_value_t *result) {
-    printf("Result: %f\n", params[0].f32);
-
-    result->type = OVM_TYPE_F32;
-    result->f32 = 123;
+    printf("Result: %d\n", params[0].i32);
 }
 
 int main(int argc, char *argv[]) {
@@ -13,7 +10,7 @@ int main(int argc, char *argv[]) {
 
     ovm_program_t *prog = ovm_program_new(store);
 
-    ovm_instr_t func1_instrs[] = {
+/*    ovm_instr_t func1_instrs[] = {
         // { .full_instr = OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I32), 0, 10 },
         // { .full_instr = OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I32), 1, 20 },
         // { .full_instr = OVM_TYPED_INSTR(OVMI_ADD, OVM_TYPE_F32), 2, 0, 1 },
@@ -46,11 +43,58 @@ int main(int argc, char *argv[]) {
     ovm_program_begin_func(prog, "add", 2, 6);
     ovm_program_add_instructions(prog, sizeof(func2_instrs) / sizeof(*func2_instrs), func2_instrs);
 
-    ovm_program_register_native_func(prog, "print_result", print_result, NULL, 1);
+    ovm_instr_t add_instrs[] = {
+        { .full_instr = OVM_TYPED_INSTR(OVMI_ADD, OVM_TYPE_I32), 2, 0, 1 },
+        { .full_instr = OVMI_RETURN, 2 },
+    };
 
-    ovm_program_print_instructions(prog, 0, bh_arr_length(prog->code));
+    ovm_instr_t count_instrs[] = {
+        { .full_instr = OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I32), 1, .i = 1 },
+        { .full_instr = OVMI_PARAM, 0, 0 },
+        { .full_instr = OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_NONE), 0, 0 },
+        { .full_instr = OVM_TYPED_INSTR(OVMI_SUB, OVM_TYPE_I32), 0, 0, 1 },
+        { .full_instr = OVMI_BR_NZ, 0, -4, 0 },
+        { .full_instr = OVMI_RETURN, -1 },
+    };
+
+    ovm_instr_t main_instrs[] = {
+        { .full_instr = OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I32), 0, 1 },
+        { .full_instr = OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I32), 1, 2 },
+        { .full_instr = OVMI_PARAM, 0, 0 },
+        { .full_instr = OVMI_PARAM, 0, 1 },
+        { .full_instr = OVMI_CALL, 2, 0 },
+        { .full_instr = OVMI_PARAM, 0, 2 },
+        { .full_instr = OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_NONE), 0, 0 },
+
+        { .full_instr = OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I32), 3, .i = 10 },
+        { .full_instr = OVMI_PARAM, 0, 3 },
+        { .full_instr = OVMI_CALL, -1, 1 },
+    };
+
+    ovm_program_begin_func(prog, "add", 2, 3);
+    ovm_program_add_instructions(prog, sizeof(add_instrs) / sizeof(*add_instrs), add_instrs);
+    ovm_program_begin_func(prog, "count", 1, 2);
+    ovm_program_add_instructions(prog, sizeof(count_instrs) / sizeof(*count_instrs), count_instrs);
+    ovm_program_begin_func(prog, "main", 0, 4);
+    ovm_program_add_instructions(prog, sizeof(main_instrs) / sizeof(*main_instrs), main_instrs);
+*/
+
+    ovm_program_register_native_func(prog, "dummy", print_result, NULL, 0);
+    ovm_program_register_native_func(prog, "print_int", print_result, NULL, 1);
+
+    static ovm_native_func_t native_funcs[] = {
+        { "dummy", 0, print_result, NULL },
+        { "print_int", 1, print_result, NULL },
+        { NULL },
+    };
 
     ovm_engine_t *engine = ovm_engine_new(store);
+
+    ovm_program_load_from_file(prog, engine, "./out.ovm");
+    ovm_program_link_native_funcs(prog, native_funcs);
+
+    ovm_program_print_instructions(prog, 0, bh_arr_length(prog->code));
+
     ovm_state_t  *state = ovm_state_new(engine);
 
     state->pc = 0;
@@ -58,8 +102,8 @@ int main(int argc, char *argv[]) {
         { .type = OVM_TYPE_F32, .f32 = 20 },
         { .type = OVM_TYPE_F32, .f32 = 40 },
     };
-    ovm_value_t result = ovm_func_call(engine, state, prog, 0, 2, values);
-    printf("%d %f\n", result.type, result.f32);
+    ovm_value_t result = ovm_func_call(engine, state, prog, 2, 0, NULL);
+    // printf("%d %f\n", result.type, result.f32);
 
     ovm_state_delete(state);
     ovm_engine_delete(engine);
diff --git a/src/tools/asm.l b/src/tools/asm.l
new file mode 100644 (file)
index 0000000..8fde370
--- /dev/null
@@ -0,0 +1,81 @@
+
+%{
+    #include "bh.h"
+    #include "assembler.h"
+
+    static char *file_data;
+    static int   bytes_remaining;
+
+    static token_t peeked_token;
+
+    token_t asm_lexer_next_token();
+    token_t asm_lexer_peek_token();
+    void asm_lexer_input(char *data, int size);
+
+#define YY_DECL token_t __asm_lexer_next_token()
+#define yyterminate() return ((token_t) { .type = token_none })
+
+#define YY_NO_INPUT
+#define YY_NO_UNPUT
+
+#define YY_INPUT(buf, result, maxsize) { \
+    if (bytes_remaining == 0) { \
+        result = YY_NULL; \
+    } else { \
+        int count = bh_min(maxsize, bytes_remaining); \
+        memcpy(buf, file_data, count); \
+        bytes_remaining -= count; \
+        file_data += count; \
+        result = count; \
+    } \
+}
+
+
+#define PUSH_TOKEN(t) return ((token_t) { .type = t, .text = bh_strdup(bh_heap_allocator(), yytext), .line = yylineno });
+
+%}
+
+ident  [a-zA-Z][a-zA-Z.0-9_]* 
+
+%option noyywrap
+%option yylineno
+
+%%
+
+\n                     PUSH_TOKEN(token_newline)
+\.{ident}              PUSH_TOKEN(token_command)
+{ident}                PUSH_TOKEN(token_symbol)
+\%[0-9]+               PUSH_TOKEN(token_register)
+[0-9]+                 PUSH_TOKEN(token_integer)
+:{ident}               PUSH_TOKEN(token_label)
+","                    PUSH_TOKEN(token_comma)
+
+.
+
+%%
+
+token_t asm_lexer_peek_token() {
+    if (peeked_token.type != token_none) {
+        return peeked_token;
+    }
+
+    token_t token = __asm_lexer_next_token();
+    peeked_token = token;
+    return token;
+}
+
+token_t asm_lexer_next_token() {
+    if (peeked_token.type != token_none) {
+        token_t ret = peeked_token;
+        peeked_token.type = token_none;
+        return ret;
+    }
+
+    return __asm_lexer_next_token();
+}
+
+void asm_lexer_input(char *data, int size) {
+    file_data = data;
+    bytes_remaining = size;
+}
+
diff --git a/src/tools/assembler.c b/src/tools/assembler.c
new file mode 100644 (file)
index 0000000..7a2d76a
--- /dev/null
@@ -0,0 +1,469 @@
+//
+// Standalone Assembler
+// Veryyy hacked together.
+// 
+
+#define BH_DEFINE
+
+#include "vm.h"
+#include "assembler.h"
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*a))
+
+#define UNEXPECTED_TOKEN(t) do { \
+    fprintf(stderr, "Unexpected token '%s' on line %d.\n", t.text, t.line); \
+    exit(1); \
+    } while (0);
+
+#define EXPECT_TOKEN(t, ttype) do { \
+    if (t.type != ttype) { \
+        fprintf(stderr, "Expected token '%s', got '%s', on line %d.\n", token_names[ttype], token_names[t.type], t.line); \
+        exit(1); \
+    } \
+    } while (0);
+
+
+//
+// Things to output to the binary
+static bh_arr(ovm_instr_t) instrs;
+static bh_arr(ovm_func_t) funcs;
+static bh_arr(ovm_native_func_t) native_funcs;
+
+
+// 
+// Things to fix during patching phase
+
+typedef struct patch_t {
+    u32 instr_offset;
+    u32 instr;
+    char *name;
+} patch_t;
+
+typedef struct active_label_t {
+    u32 instr_offset;
+    char *name;
+} active_label_t;
+
+static i32 maximum_value_number = 0;
+static bh_arr(patch_t) call_patches;
+static bh_arr(patch_t) label_patches;
+static bh_arr(active_label_t) active_labels;
+
+
+typedef enum operand_type_t {
+    op_none, op_reg, op_imm, op_sym
+} operand_type_t;
+
+struct instruction_mapping_t {
+    char *name;
+    u32 instr;
+
+    // At most 3 operands per instruction.
+    operand_type_t r_op;
+    operand_type_t a_op;
+    operand_type_t b_op;
+};
+
+static struct instruction_mapping_t instr_map[] = {
+    { "nop",    OVMI_NOP },
+
+    { "imm.i8", OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I8)  , op_reg, op_imm },
+    { "imm.i16", OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I16), op_reg, op_imm },
+    { "imm.i32", OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I32), op_reg, op_imm },
+    { "imm.i64", OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_I64), op_reg, op_imm },
+    { "imm.f32", OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_F32), op_reg, op_imm },
+    { "imm.f64", OVM_TYPED_INSTR(OVMI_IMM, OVM_TYPE_F64), op_reg, op_imm },
+
+    { "add.i8", OVM_TYPED_INSTR(OVMI_ADD, OVM_TYPE_I8)  , op_reg, op_reg, op_reg },
+    { "add.i16", OVM_TYPED_INSTR(OVMI_ADD, OVM_TYPE_I16), op_reg, op_reg, op_reg },
+    { "add.i32", OVM_TYPED_INSTR(OVMI_ADD, OVM_TYPE_I32), op_reg, op_reg, op_reg },
+    { "add.i64", OVM_TYPED_INSTR(OVMI_ADD, OVM_TYPE_I64), op_reg, op_reg, op_reg },
+    { "add.f32", OVM_TYPED_INSTR(OVMI_ADD, OVM_TYPE_F32), op_reg, op_reg, op_reg },
+    { "add.f64", OVM_TYPED_INSTR(OVMI_ADD, OVM_TYPE_F64), op_reg, op_reg, op_reg },
+
+    { "sub.i8", OVM_TYPED_INSTR(OVMI_SUB, OVM_TYPE_I8)  , op_reg, op_reg, op_reg },
+    { "sub.i16", OVM_TYPED_INSTR(OVMI_SUB, OVM_TYPE_I16), op_reg, op_reg, op_reg },
+    { "sub.i32", OVM_TYPED_INSTR(OVMI_SUB, OVM_TYPE_I32), op_reg, op_reg, op_reg },
+    { "sub.i64", OVM_TYPED_INSTR(OVMI_SUB, OVM_TYPE_I64), op_reg, op_reg, op_reg },
+    { "sub.f32", OVM_TYPED_INSTR(OVMI_SUB, OVM_TYPE_F32), op_reg, op_reg, op_reg },
+    { "sub.f64", OVM_TYPED_INSTR(OVMI_SUB, OVM_TYPE_F64), op_reg, op_reg, op_reg },
+
+    { "mul.i8", OVM_TYPED_INSTR(OVMI_MUL, OVM_TYPE_I8)  , op_reg, op_reg, op_reg },
+    { "mul.i16", OVM_TYPED_INSTR(OVMI_MUL, OVM_TYPE_I16), op_reg, op_reg, op_reg },
+    { "mul.i32", OVM_TYPED_INSTR(OVMI_MUL, OVM_TYPE_I32), op_reg, op_reg, op_reg },
+    { "mul.i64", OVM_TYPED_INSTR(OVMI_MUL, OVM_TYPE_I64), op_reg, op_reg, op_reg },
+    { "mul.f32", OVM_TYPED_INSTR(OVMI_MUL, OVM_TYPE_F32), op_reg, op_reg, op_reg },
+    { "mul.f64", OVM_TYPED_INSTR(OVMI_MUL, OVM_TYPE_F64), op_reg, op_reg, op_reg },
+
+    { "div.i8", OVM_TYPED_INSTR(OVMI_DIV, OVM_TYPE_I8)  , op_reg, op_reg, op_reg },
+    { "div.i16", OVM_TYPED_INSTR(OVMI_DIV, OVM_TYPE_I16), op_reg, op_reg, op_reg },
+    { "div.i32", OVM_TYPED_INSTR(OVMI_DIV, OVM_TYPE_I32), op_reg, op_reg, op_reg },
+    { "div.i64", OVM_TYPED_INSTR(OVMI_DIV, OVM_TYPE_I64), op_reg, op_reg, op_reg },
+    { "div.f32", OVM_TYPED_INSTR(OVMI_DIV, OVM_TYPE_F32), op_reg, op_reg, op_reg },
+    { "div.f64", OVM_TYPED_INSTR(OVMI_DIV, OVM_TYPE_F64), op_reg, op_reg, op_reg },
+
+    { "rem.i8", OVM_TYPED_INSTR(OVMI_REM, OVM_TYPE_I8)  , op_reg, op_imm },
+    { "rem.i16", OVM_TYPED_INSTR(OVMI_REM, OVM_TYPE_I16), op_reg, op_imm },
+    { "rem.i32", OVM_TYPED_INSTR(OVMI_REM, OVM_TYPE_I32), op_reg, op_imm },
+    { "rem.i64", OVM_TYPED_INSTR(OVMI_REM, OVM_TYPE_I64), op_reg, op_imm },
+
+    // More operands to do...
+
+    { "param",  OVMI_PARAM,  op_none, op_reg },
+    { "br",     OVMI_BR,     op_none, op_sym },
+    { "bri",    OVMI_BRI,    op_none, op_reg },
+    { "br_nz",  OVMI_BR_NZ,  op_none, op_sym, op_reg },
+    { "bri_nz", OVMI_BRI_NZ, op_none, op_reg, op_reg },
+
+    { "return",     OVMI_RETURN },
+    { "return.i8",  OVMI_RETURN, op_none, op_reg },
+    { "return.i16", OVMI_RETURN, op_none, op_reg },
+    { "return.i32", OVMI_RETURN, op_none, op_reg },
+    { "return.i64", OVMI_RETURN, op_none, op_reg },
+    { "return.f32", OVMI_RETURN, op_none, op_reg },
+    { "return.f64", OVMI_RETURN, op_none, op_reg },
+
+    { "call",      OVMI_CALL,   op_none, op_sym },
+    { "call.i8",   OVMI_CALL,   op_reg, op_sym },
+    { "call.i16",  OVMI_CALL,   op_reg, op_sym },
+    { "call.i32",  OVMI_CALL,   op_reg, op_sym },
+    { "call.i64",  OVMI_CALL,   op_reg, op_sym },
+    { "call.f32",  OVMI_CALL,   op_reg, op_sym },
+    { "call.f64",  OVMI_CALL,   op_reg, op_sym },
+
+    { "calli",     OVMI_CALLI,  op_reg, op_reg },
+    { "calli.i8",   OVMI_CALLI,   op_reg, op_reg },
+    { "calli.i16",  OVMI_CALLI,   op_reg, op_reg },
+    { "calli.i32",  OVMI_CALLI,   op_reg, op_reg },
+    { "calli.i64",  OVMI_CALLI,   op_reg, op_reg },
+    { "calli.f32",  OVMI_CALLI,   op_reg, op_reg },
+    { "calli.f64",  OVMI_CALLI,   op_reg, op_reg },
+
+    { "native_call",      OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_NONE), op_none, op_sym },
+    { "native_call.i8",   OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_I8),   op_reg , op_sym },
+    { "native_call.i16",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_I16),  op_reg , op_sym },
+    { "native_call.i32",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_I32),  op_reg , op_sym },
+    { "native_call.i64",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_I64),  op_reg , op_sym },
+    { "native_call.f32",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_F32),  op_reg , op_sym },
+    { "native_call.f64",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_F64),  op_reg , op_sym },
+
+    { "native_calli",      OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_NONE), op_none, op_reg },
+    { "native_calli.i8",   OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_I8),   op_reg , op_reg },
+    { "native_calli.i16",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_I16),  op_reg , op_reg },
+    { "native_calli.i32",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_I32),  op_reg , op_reg },
+    { "native_calli.i64",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_I64),  op_reg , op_reg },
+    { "native_calli.f32",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_F32),  op_reg , op_reg },
+    { "native_calli.f64",  OVM_TYPED_INSTR(OVMI_NATIVE_CALL, OVM_TYPE_F64),  op_reg , op_reg },
+};
+
+void parse_register(i32 *dest) {
+    token_t token = asm_lexer_next_token();
+    EXPECT_TOKEN(token, token_register);
+
+    i32 reg = atoi(token.text + 1);
+    *dest = reg;
+
+    maximum_value_number = bh_max(reg, maximum_value_number);
+}
+
+void parse_immediate(ovm_instr_t *instr) {
+    token_t token = asm_lexer_next_token();
+    //
+    // Only integer immediates are supported right now.
+    EXPECT_TOKEN(token, token_integer);
+
+    if (OVM_INSTR_TYPE(*instr) == OVM_TYPE_I32) instr->i = atoi(token.text);
+    if (OVM_INSTR_TYPE(*instr) == OVM_TYPE_I64) instr->l = atol(token.text);
+}
+
+void parse_symbol(u32 instr_offset, ovm_instr_t *instr) {
+    token_t token = asm_lexer_next_token();
+    EXPECT_TOKEN(token, token_symbol);
+
+    patch_t patch;
+    patch.instr_offset = instr_offset;
+    patch.instr = OVM_INSTR_INSTR(*instr);
+    patch.name = token.text;
+
+    switch (patch.instr) {
+        case OVMI_BR:
+        case OVMI_BR_NZ:
+            bh_arr_push(label_patches, patch);
+            break;
+
+        case OVMI_CALL:
+        case OVMI_NATIVE_CALL:
+            bh_arr_push(call_patches, patch);
+            break;
+
+        default: assert(("BAD CASE", 0));
+    }
+}
+
+void parse_instruction() {
+    token_t token = asm_lexer_next_token();
+    EXPECT_TOKEN(token, token_symbol);
+
+    struct instruction_mapping_t map = { NULL };
+    fori (i, 0, (i32) ARRAY_SIZE(instr_map)) {
+        if (!strcmp(instr_map[i].name, token.text)) {
+            map = instr_map[i];
+            break;
+        }
+    }
+
+    if (map.name == NULL) {
+        fprintf(stderr, "Invalid instruction, %s.\n", token.text);
+        exit(1);
+    }
+
+    ovm_instr_t instr = {0};
+    instr.full_instr = map.instr;
+
+    token = asm_lexer_peek_token();
+
+#define PARSE_OP(reg) \
+ \
+    switch (map. reg ## _op) { \
+        case op_none: break; \
+ \
+        case op_reg: \
+            parse_register(&instr.reg); \
+            token = asm_lexer_peek_token(); \
+            break; \
+ \
+        case op_imm: \
+            parse_immediate(&instr); \
+            token = asm_lexer_peek_token(); \
+            break; \
+ \
+        case op_sym: \
+            parse_symbol(bh_arr_length(instrs), &instr); \
+            token = asm_lexer_peek_token(); \
+            break; \
+    }
+
+    PARSE_OP(r)
+    if (token.type == token_comma) {
+        asm_lexer_next_token();
+        token = asm_lexer_peek_token();
+    }
+
+    PARSE_OP(a)
+    if (token.type == token_comma) {
+        asm_lexer_next_token();
+        token = asm_lexer_peek_token();
+    }
+
+    PARSE_OP(b)
+
+    bh_arr_push(instrs, instr);
+}
+
+void parse_label() {
+    token_t token = asm_lexer_next_token();
+    EXPECT_TOKEN(token, token_label);
+    
+    active_label_t label;
+    label.instr_offset = bh_arr_length(instrs);
+    label.name = token.text + 1;
+    bh_arr_push(active_labels, label);
+}
+
+void finalize_current_function() {
+    //
+    // For the previous function, compute the maximum value number used
+    // and store that as the value number count.
+    ovm_func_t *func = &bh_arr_last(funcs);
+    func->value_number_count = maximum_value_number;
+
+    bh_arr_each(patch_t, patch, label_patches) {
+        ovm_instr_t *instr = &instrs[patch->instr_offset];
+
+        i32 label_location = -1;
+        bh_arr_each(active_label_t, label, active_labels) {
+            if (!strcmp(label->name, patch->name)) {
+                label_location = label->instr_offset;
+                break;
+            }
+        }
+
+        assert(label_location != -1);
+        assert(instr->a == 0);
+        instr->a = label_location - patch->instr_offset - 1; // This might be off by one
+    }
+
+    maximum_value_number = 0;
+    bh_arr_clear(active_labels);
+    bh_arr_clear(label_patches);
+}
+
+void parse_command() {
+    token_t token = asm_lexer_next_token();
+    assert(token.type == token_command);
+
+    if (!strcmp(token.text, ".func")) {
+        if (bh_arr_length(funcs) > 0) {
+            finalize_current_function();
+        }
+
+        token_t name_token = asm_lexer_next_token();
+        EXPECT_TOKEN(name_token, token_symbol);
+
+        token_t param_token = asm_lexer_next_token();
+        EXPECT_TOKEN(param_token, token_integer);
+
+        ovm_func_t f;
+        f.start_instr = bh_arr_length(instrs);
+        f.name = name_token.text;
+        f.param_count = atoi(param_token.text);
+        bh_arr_push(funcs, f);
+        return;
+    }
+
+    if (!strcmp(token.text, ".native_func")) {
+        token_t name_token = asm_lexer_next_token();
+        EXPECT_TOKEN(name_token, token_symbol);
+
+        token_t param_token = asm_lexer_next_token();
+        EXPECT_TOKEN(param_token, token_integer);
+
+        ovm_native_func_t f;
+        f.name = name_token.text;
+        f.param_count = atoi(param_token.text);
+        bh_arr_push(native_funcs, f);
+        return;
+    }
+
+    UNEXPECTED_TOKEN(token);
+}
+
+
+void parse(char *input_file) {
+    bh_file file;
+    bh_file_error error = bh_file_open(&file, input_file);
+    if (error != BH_FILE_ERROR_NONE) {
+        fprintf(stderr, "Failed to open '%s' for reading.\n", input_file);
+    }
+
+    bh_file_contents contents = bh_file_read_contents(bh_heap_allocator(), &file);
+    
+    asm_lexer_input(contents.data, contents.length);
+    token_t curr_token = { token_newline };
+    while (curr_token.type != token_none) {
+        curr_token = asm_lexer_peek_token();
+        // printf("%d: %s (%s)\n", curr_token.line, token_names[curr_token.type], curr_token.text);
+
+        switch (curr_token.type) {
+            case token_none: break;
+
+            case token_newline: asm_lexer_next_token(); break;
+            case token_command: parse_command(); break;
+            case token_symbol: parse_instruction(); break;
+            case token_label: parse_label(); break;
+
+            default: UNEXPECTED_TOKEN(curr_token);
+        }
+    }
+
+    finalize_current_function();
+    bh_file_close(&file);
+}
+
+void patch_calls() {
+    bh_arr_each(patch_t, patch, call_patches) {
+        ovm_instr_t *instr = &instrs[patch->instr_offset];
+
+        i32 func_idx = -1;
+        if (patch->instr == OVMI_CALL) {
+            bh_arr_each(ovm_func_t, func, funcs) {
+                if (!strcmp(func->name, patch->name)) {
+                    func_idx = func - funcs;
+                    break;
+                }
+            }
+        } else if (patch->instr == OVMI_NATIVE_CALL) {
+            bh_arr_each(ovm_native_func_t, func, native_funcs) {
+                if (!strcmp(func->name, patch->name)) {
+                    func_idx = func - native_funcs;
+                    break;
+                }
+            }
+        }
+
+        assert(func_idx != -1);
+        assert(instr->a == 0);
+        instr->a = func_idx;
+    }
+
+}
+
+void write_file(char *output_file) {
+    ovm_raw_print_instructions(bh_arr_length(instrs), instrs);
+
+    bh_file file;
+    bh_file_error error = bh_file_open_mode(&file, BH_FILE_MODE_WRITE, output_file);
+    if (error != BH_FILE_ERROR_NONE) {
+        fprintf(stderr, "Failed to open '%s' for writing.\n", output_file);
+        exit(1);
+    }
+
+    bh_file_write(&file, "OVMI", 4);
+    bh_file_write(&file, "\x00\x00\x00\x01", 4);
+
+    i32 instr_count = bh_arr_length(instrs);
+    bh_file_write(&file, &instr_count, 4); // Endian-dependent
+    bh_file_write(&file, instrs, sizeof(ovm_instr_t) * instr_count);
+
+    i32 data_count = 0;
+    bh_file_write(&file, &data_count, 4); // Endian-dependent
+
+    i32 func_count = bh_arr_length(funcs);
+    bh_file_write(&file, &func_count, 4); // Endian-dependent
+    bh_arr_each(ovm_func_t, func, funcs) {
+        bh_file_write(&file, &func->start_instr, 4); // Endian-dependent
+        bh_file_write(&file, &func->param_count, 4); // Endian-dependent
+        bh_file_write(&file, &func->value_number_count, 4); // Endian-dependent
+    }
+
+    i32 native_func_count = bh_arr_length(native_funcs);
+    bh_file_write(&file, &native_func_count, 4); // Endian-dependent
+    bh_arr_each(ovm_native_func_t, func, native_funcs) {
+        bh_file_write(&file, &func->param_count, 4); // Endian-dependent
+
+        i32 name_length = strlen(func->name) + 1; // Including null-terminator
+        bh_file_write(&file, &name_length, 4); // Endian-dependent 
+        bh_file_write(&file, func->name, name_length);
+    }
+
+    bh_file_close(&file);
+}
+
+int main(int argc, char *argv[]) {
+    if (argc < 3) {
+        fprintf(stderr, "Expected 2 arguments: input file and output file.\n");
+        return 1;
+    }
+
+    char *input_file = argv[1];
+    char *output_file = argv[2];
+
+    parse(input_file);
+    patch_calls();
+    write_file(output_file);
+}
+
+
+
+#define T(t) [t] = #t
+char *token_names[] = {
+    T(token_none),
+    T(token_newline),
+    T(token_integer),
+    T(token_command),
+    T(token_symbol),
+    T(token_register),
+    T(token_label),
+    T(token_comma),
+};
+#undef T
diff --git a/src/tools/lex.yy.c b/src/tools/lex.yy.c
new file mode 100644 (file)
index 0000000..8e91a3a
--- /dev/null
@@ -0,0 +1,1890 @@
+#line 2 "src/tools/lex.yy.c"
+
+#line 4 "src/tools/lex.yy.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 4
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+/* begin standard C++ headers. */
+
+/* TODO: this is always defined, so inline it */
+#define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
+#else
+#define yynoreturn
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an
+ *   integer in range [0..255] for use as an array index.
+ */
+#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE yyrestart( yyin  )
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern int yyleng;
+
+extern FILE *yyin, *yyout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+    
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE yylex.
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-yylineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < yyleng; ++yyl )\
+                    if ( yytext[yyl] == '\n' )\
+                        --yylineno;\
+            }while(0)
+    #define YY_LINENO_REWIND_TO(dst) \
+            do {\
+                const char *p;\
+                for ( p = yy_cp-1; p >= (dst); --p)\
+                    if ( *p == '\n' )\
+                        --yylineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+       do \
+               { \
+               /* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+               *yy_cp = (yy_hold_char); \
+               YY_RESTORE_YY_MORE_OFFSET \
+               (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+               YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+               } \
+       while ( 0 )
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+       {
+       FILE *yy_input_file;
+
+       char *yy_ch_buf;                /* input buffer */
+       char *yy_buf_pos;               /* current position in input buffer */
+
+       /* Size of input buffer in bytes, not including room for EOB
+        * characters.
+        */
+       int yy_buf_size;
+
+       /* Number of characters read into yy_ch_buf, not including EOB
+        * characters.
+        */
+       int yy_n_chars;
+
+       /* Whether we "own" the buffer - i.e., we know we created it,
+        * and can realloc() it to grow it, and should free() it to
+        * delete it.
+        */
+       int yy_is_our_buffer;
+
+       /* Whether this is an "interactive" input source; if so, and
+        * if we're using stdio for input, then we want to use getc()
+        * instead of fread(), to make sure we stop fetching input after
+        * each newline.
+        */
+       int yy_is_interactive;
+
+       /* Whether we're considered to be at the beginning of a line.
+        * If so, '^' rules will be active on the next match, otherwise
+        * not.
+        */
+       int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+
+       /* Whether to try to fill the input buffer when we reach the
+        * end of it.
+        */
+       int yy_fill_buffer;
+
+       int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+       /* When an EOF's been seen but there's still some text to process
+        * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+        * shouldn't try reading from the input source any more.  We might
+        * still have a bunch of tokens to match, though, because of
+        * possible backing-up.
+        *
+        * When we actually see the EOF, we change the status to "new"
+        * (via yyrestart()), so that the user can continue scanning by
+        * just pointing yyin at a new input file.
+        */
+#define YY_BUFFER_EOF_PENDING 2
+
+       };
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when yytext is formed. */
+static char yy_hold_char;
+static int yy_n_chars;         /* number of characters read into yy_ch_buf */
+int yyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = NULL;
+static int yy_init = 0;                /* whether we need to initialize */
+static int yy_start = 0;       /* start state number */
+
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void yyrestart ( FILE *input_file  );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
+void yy_delete_buffer ( YY_BUFFER_STATE b  );
+void yy_flush_buffer ( YY_BUFFER_STATE b  );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state ( void );
+
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
+static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
+#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
+
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
+
+#define yy_new_buffer yy_create_buffer
+#define yy_set_interactive(is_interactive) \
+       { \
+       if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+               YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
+       } \
+       YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+       }
+#define yy_set_bol(at_bol) \
+       { \
+       if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+               YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
+       } \
+       YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+       }
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define yywrap() (/*CONSTCOND*/1)
+#define YY_SKIP_YYWRAP
+typedef flex_uint8_t YY_CHAR;
+
+FILE *yyin = NULL, *yyout = NULL;
+
+typedef int yy_state_type;
+
+extern int yylineno;
+int yylineno = 1;
+
+extern char *yytext;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
+#define yytext_ptr yytext
+
+static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
+static int yy_get_next_buffer ( void );
+static void yynoreturn yy_fatal_error ( const char* msg  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+       (yytext_ptr) = yy_bp; \
+       yyleng = (int) (yy_cp - yy_bp); \
+       (yy_hold_char) = *yy_cp; \
+       *yy_cp = '\0'; \
+       (yy_c_buf_p) = yy_cp;
+#define YY_NUM_RULES 9
+#define YY_END_OF_BUFFER 10
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+       {
+       flex_int32_t yy_verify;
+       flex_int32_t yy_nxt;
+       };
+static const flex_int16_t yy_accept[20] =
+    {   0,
+        0,    0,   10,    8,    1,    8,    7,    8,    5,    8,
+        3,    4,    2,    5,    6,    3,    2,    6,    0
+    } ;
+
+static const YY_CHAR yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    3,    1,    1,    1,
+        1,    1,    1,    4,    1,    5,    1,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    7,    1,    1,
+        1,    1,    1,    1,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
+        1,    1,    1,    1,    9,    1,    8,    8,    8,    8,
+
+        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static const YY_CHAR yy_meta[10] =
+    {   0,
+        1,    1,    1,    1,    2,    2,    1,    2,    2
+    } ;
+
+static const flex_int16_t yy_base[23] =
+    {   0,
+        0,    0,   19,   20,   20,   12,   20,    9,   10,    7,
+        0,    8,    0,    7,    0,    0,    0,    0,   20,   10,
+        9,    8
+    } ;
+
+static const flex_int16_t yy_def[23] =
+    {   0,
+       19,    1,   19,   19,   19,   19,   19,   19,   19,   19,
+       20,   19,   21,   19,   22,   20,   21,   22,    0,   19,
+       19,   19
+    } ;
+
+static const flex_int16_t yy_nxt[30] =
+    {   0,
+        4,    5,    6,    7,    8,    9,   10,   11,    4,   18,
+       17,   16,   14,   12,   15,   14,   13,   12,   19,    3,
+       19,   19,   19,   19,   19,   19,   19,   19,   19
+    } ;
+
+static const flex_int16_t yy_chk[30] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,   22,
+       21,   20,   14,   12,   10,    9,    8,    6,    3,   19,
+       19,   19,   19,   19,   19,   19,   19,   19,   19
+    } ;
+
+/* Table of booleans, true if rule could match eol. */
+static const flex_int32_t yy_rule_can_match_eol[10] =
+    {   0,
+1, 0, 0, 0, 0, 0, 0, 0, 0,     };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *yytext;
+#line 1 "src/tools/asm.l"
+#line 3 "src/tools/asm.l"
+    #include "bh.h"
+    #include "assembler.h"
+
+    static char *file_data;
+    static int   bytes_remaining;
+
+    static token_t peeked_token;
+
+    token_t asm_lexer_next_token();
+    token_t asm_lexer_peek_token();
+    void asm_lexer_input(char *data, int size);
+
+#define YY_DECL token_t __asm_lexer_next_token()
+#define yyterminate() return ((token_t) { .type = token_none })
+
+#define YY_NO_INPUT
+#define YY_NO_UNPUT
+
+#define YY_INPUT(buf, result, maxsize) { \
+    if (bytes_remaining == 0) { \
+        result = YY_NULL; \
+    } else { \
+        int count = bh_min(maxsize, bytes_remaining); \
+        memcpy(buf, file_data, count); \
+        bytes_remaining -= count; \
+        file_data += count; \
+        result = count; \
+    } \
+}
+
+
+#define PUSH_TOKEN(t) return ((token_t) { .type = t, .text = bh_strdup(bh_heap_allocator(), yytext), .line = yylineno });
+
+#line 512 "src/tools/lex.yy.c"
+#line 513 "src/tools/lex.yy.c"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals ( void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy ( void );
+
+int yyget_debug ( void );
+
+void yyset_debug ( int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra ( void );
+
+void yyset_extra ( YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in ( void );
+
+void yyset_in  ( FILE * _in_str  );
+
+FILE *yyget_out ( void );
+
+void yyset_out  ( FILE * _out_str  );
+
+                       int yyget_leng ( void );
+
+char *yyget_text ( void );
+
+int yyget_lineno ( void );
+
+void yyset_lineno ( int _line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yywrap ( void );
+#else
+extern int yywrap ( void );
+#endif
+#endif
+
+#ifndef YY_NO_UNPUT
+    
+    static void yyunput ( int c, char *buf_ptr  );
+    
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy ( char *, const char *, int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen ( const char * );
+#endif
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+static int yyinput ( void );
+#else
+static int input ( void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+       if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+               { \
+               int c = '*'; \
+               int n; \
+               for ( n = 0; n < max_size && \
+                            (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+                       buf[n] = (char) c; \
+               if ( c == '\n' ) \
+                       buf[n++] = (char) c; \
+               if ( c == EOF && ferror( yyin ) ) \
+                       YY_FATAL_ERROR( "input in flex scanner failed" ); \
+               result = n; \
+               } \
+       else \
+               { \
+               errno=0; \
+               while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
+                       { \
+                       if( errno != EINTR) \
+                               { \
+                               YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                               break; \
+                               } \
+                       errno=0; \
+                       clearerr(yyin); \
+                       } \
+               }\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK /*LINTED*/break;
+#endif
+
+#define YY_RULE_SETUP \
+       YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+       yy_state_type yy_current_state;
+       char *yy_cp, *yy_bp;
+       int yy_act;
+    
+       if ( !(yy_init) )
+               {
+               (yy_init) = 1;
+
+#ifdef YY_USER_INIT
+               YY_USER_INIT;
+#endif
+
+               if ( ! (yy_start) )
+                       (yy_start) = 1; /* first start state */
+
+               if ( ! yyin )
+                       yyin = stdin;
+
+               if ( ! yyout )
+                       yyout = stdout;
+
+               if ( ! YY_CURRENT_BUFFER ) {
+                       yyensure_buffer_stack ();
+                       YY_CURRENT_BUFFER_LVALUE =
+                               yy_create_buffer( yyin, YY_BUF_SIZE );
+               }
+
+               yy_load_buffer_state(  );
+               }
+
+       {
+#line 43 "src/tools/asm.l"
+
+
+#line 733 "src/tools/lex.yy.c"
+
+       while ( /*CONSTCOND*/1 )                /* loops until end-of-file is reached */
+               {
+               yy_cp = (yy_c_buf_p);
+
+               /* Support of yytext. */
+               *yy_cp = (yy_hold_char);
+
+               /* yy_bp points to the position in yy_ch_buf of the start of
+                * the current run.
+                */
+               yy_bp = yy_cp;
+
+               yy_current_state = (yy_start);
+yy_match:
+               do
+                       {
+                       YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+                       if ( yy_accept[yy_current_state] )
+                               {
+                               (yy_last_accepting_state) = yy_current_state;
+                               (yy_last_accepting_cpos) = yy_cp;
+                               }
+                       while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+                               {
+                               yy_current_state = (int) yy_def[yy_current_state];
+                               if ( yy_current_state >= 20 )
+                                       yy_c = yy_meta[yy_c];
+                               }
+                       yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+                       ++yy_cp;
+                       }
+               while ( yy_base[yy_current_state] != 20 );
+
+yy_find_action:
+               yy_act = yy_accept[yy_current_state];
+               if ( yy_act == 0 )
+                       { /* have to back up */
+                       yy_cp = (yy_last_accepting_cpos);
+                       yy_current_state = (yy_last_accepting_state);
+                       yy_act = yy_accept[yy_current_state];
+                       }
+
+               YY_DO_BEFORE_ACTION;
+
+               if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+                       {
+                       int yyl;
+                       for ( yyl = 0; yyl < yyleng; ++yyl )
+                               if ( yytext[yyl] == '\n' )
+                                       
+    yylineno++;
+;
+                       }
+
+do_action:     /* This label is used only to access EOF actions. */
+
+               switch ( yy_act )
+       { /* beginning of action switch */
+                       case 0: /* must back up */
+                       /* undo the effects of YY_DO_BEFORE_ACTION */
+                       *yy_cp = (yy_hold_char);
+                       yy_cp = (yy_last_accepting_cpos);
+                       yy_current_state = (yy_last_accepting_state);
+                       goto yy_find_action;
+
+case 1:
+/* rule 1 can match eol */
+YY_RULE_SETUP
+#line 45 "src/tools/asm.l"
+PUSH_TOKEN(token_newline)
+       YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 46 "src/tools/asm.l"
+PUSH_TOKEN(token_command)
+       YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 47 "src/tools/asm.l"
+PUSH_TOKEN(token_symbol)
+       YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 48 "src/tools/asm.l"
+PUSH_TOKEN(token_register)
+       YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 49 "src/tools/asm.l"
+PUSH_TOKEN(token_integer)
+       YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 50 "src/tools/asm.l"
+PUSH_TOKEN(token_label)
+       YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 51 "src/tools/asm.l"
+PUSH_TOKEN(token_comma)
+       YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 53 "src/tools/asm.l"
+
+       YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 55 "src/tools/asm.l"
+ECHO;
+       YY_BREAK
+#line 846 "src/tools/lex.yy.c"
+case YY_STATE_EOF(INITIAL):
+       yyterminate();
+
+       case YY_END_OF_BUFFER:
+               {
+               /* Amount of text matched not including the EOB char. */
+               int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+               /* Undo the effects of YY_DO_BEFORE_ACTION. */
+               *yy_cp = (yy_hold_char);
+               YY_RESTORE_YY_MORE_OFFSET
+
+               if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+                       {
+                       /* We're scanning a new file or input source.  It's
+                        * possible that this happened because the user
+                        * just pointed yyin at a new source and called
+                        * yylex().  If so, then we have to assure
+                        * consistency between YY_CURRENT_BUFFER and our
+                        * globals.  Here is the right place to do so, because
+                        * this is the first action (other than possibly a
+                        * back-up) that will match for the new input source.
+                        */
+                       (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+                       YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+                       YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+                       }
+
+               /* Note that here we test for yy_c_buf_p "<=" to the position
+                * of the first EOB in the buffer, since yy_c_buf_p will
+                * already have been incremented past the NUL character
+                * (since all states make transitions on EOB to the
+                * end-of-buffer state).  Contrast this with the test
+                * in input().
+                */
+               if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+                       { /* This was really a NUL. */
+                       yy_state_type yy_next_state;
+
+                       (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+                       yy_current_state = yy_get_previous_state(  );
+
+                       /* Okay, we're now positioned to make the NUL
+                        * transition.  We couldn't have
+                        * yy_get_previous_state() go ahead and do it
+                        * for us because it doesn't know how to deal
+                        * with the possibility of jamming (and we don't
+                        * want to build jamming into it because then it
+                        * will run more slowly).
+                        */
+
+                       yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+                       yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+                       if ( yy_next_state )
+                               {
+                               /* Consume the NUL. */
+                               yy_cp = ++(yy_c_buf_p);
+                               yy_current_state = yy_next_state;
+                               goto yy_match;
+                               }
+
+                       else
+                               {
+                               yy_cp = (yy_c_buf_p);
+                               goto yy_find_action;
+                               }
+                       }
+
+               else switch ( yy_get_next_buffer(  ) )
+                       {
+                       case EOB_ACT_END_OF_FILE:
+                               {
+                               (yy_did_buffer_switch_on_eof) = 0;
+
+                               if ( yywrap(  ) )
+                                       {
+                                       /* Note: because we've taken care in
+                                        * yy_get_next_buffer() to have set up
+                                        * yytext, we can now set up
+                                        * yy_c_buf_p so that if some total
+                                        * hoser (like flex itself) wants to
+                                        * call the scanner after we return the
+                                        * YY_NULL, it'll still work - another
+                                        * YY_NULL will get returned.
+                                        */
+                                       (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+                                       yy_act = YY_STATE_EOF(YY_START);
+                                       goto do_action;
+                                       }
+
+                               else
+                                       {
+                                       if ( ! (yy_did_buffer_switch_on_eof) )
+                                               YY_NEW_FILE;
+                                       }
+                               break;
+                               }
+
+                       case EOB_ACT_CONTINUE_SCAN:
+                               (yy_c_buf_p) =
+                                       (yytext_ptr) + yy_amount_of_matched_text;
+
+                               yy_current_state = yy_get_previous_state(  );
+
+                               yy_cp = (yy_c_buf_p);
+                               yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                               goto yy_match;
+
+                       case EOB_ACT_LAST_MATCH:
+                               (yy_c_buf_p) =
+                               &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+                               yy_current_state = yy_get_previous_state(  );
+
+                               yy_cp = (yy_c_buf_p);
+                               yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                               goto yy_find_action;
+                       }
+               break;
+               }
+
+       default:
+               YY_FATAL_ERROR(
+                       "fatal flex scanner internal error--no action found" );
+       } /* end of action switch */
+               } /* end of scanning one token */
+       } /* end of user's declarations */
+} /* end of yylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *     EOB_ACT_LAST_MATCH -
+ *     EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *     EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+       char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+       char *source = (yytext_ptr);
+       int number_to_move, i;
+       int ret_val;
+
+       if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+               YY_FATAL_ERROR(
+               "fatal flex scanner internal error--end of buffer missed" );
+
+       if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+               { /* Don't try to fill the buffer, so this is an EOF. */
+               if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+                       {
+                       /* We matched a single character, the EOB, so
+                        * treat this as a final EOF.
+                        */
+                       return EOB_ACT_END_OF_FILE;
+                       }
+
+               else
+                       {
+                       /* We matched some text prior to the EOB, first
+                        * process it.
+                        */
+                       return EOB_ACT_LAST_MATCH;
+                       }
+               }
+
+       /* Try to read more data. */
+
+       /* First move last chars to start of buffer. */
+       number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
+
+       for ( i = 0; i < number_to_move; ++i )
+               *(dest++) = *(source++);
+
+       if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+               /* don't do the read, it's not guaranteed to return an EOF,
+                * just force an EOF
+                */
+               YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+       else
+               {
+                       int num_to_read =
+                       YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+               while ( num_to_read <= 0 )
+                       { /* Not enough room in the buffer - grow it. */
+
+                       /* just a shorter name for the current buffer */
+                       YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+                       int yy_c_buf_p_offset =
+                               (int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+                       if ( b->yy_is_our_buffer )
+                               {
+                               int new_size = b->yy_buf_size * 2;
+
+                               if ( new_size <= 0 )
+                                       b->yy_buf_size += b->yy_buf_size / 8;
+                               else
+                                       b->yy_buf_size *= 2;
+
+                               b->yy_ch_buf = (char *)
+                                       /* Include room in for 2 EOB chars. */
+                                       yyrealloc( (void *) b->yy_ch_buf,
+                                                        (yy_size_t) (b->yy_buf_size + 2)  );
+                               }
+                       else
+                               /* Can't grow it, we don't own it. */
+                               b->yy_ch_buf = NULL;
+
+                       if ( ! b->yy_ch_buf )
+                               YY_FATAL_ERROR(
+                               "fatal error - scanner input buffer overflow" );
+
+                       (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+                       num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+                                               number_to_move - 1;
+
+                       }
+
+               if ( num_to_read > YY_READ_BUF_SIZE )
+                       num_to_read = YY_READ_BUF_SIZE;
+
+               /* Read in more data. */
+               YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+                       (yy_n_chars), num_to_read );
+
+               YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+               }
+
+       if ( (yy_n_chars) == 0 )
+               {
+               if ( number_to_move == YY_MORE_ADJ )
+                       {
+                       ret_val = EOB_ACT_END_OF_FILE;
+                       yyrestart( yyin  );
+                       }
+
+               else
+                       {
+                       ret_val = EOB_ACT_LAST_MATCH;
+                       YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+                               YY_BUFFER_EOF_PENDING;
+                       }
+               }
+
+       else
+               ret_val = EOB_ACT_CONTINUE_SCAN;
+
+       if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+               /* Extend the array by 50%, plus the number we really need. */
+               int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+               YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
+                       (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size  );
+               if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+                       YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+               /* "- 2" to take care of EOB's */
+               YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
+       }
+
+       (yy_n_chars) += number_to_move;
+       YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+       YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+       (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+       return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+       yy_state_type yy_current_state;
+       char *yy_cp;
+    
+       yy_current_state = (yy_start);
+
+       for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+               {
+               YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+               if ( yy_accept[yy_current_state] )
+                       {
+                       (yy_last_accepting_state) = yy_current_state;
+                       (yy_last_accepting_cpos) = yy_cp;
+                       }
+               while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+                       {
+                       yy_current_state = (int) yy_def[yy_current_state];
+                       if ( yy_current_state >= 20 )
+                               yy_c = yy_meta[yy_c];
+                       }
+               yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+               }
+
+       return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *     next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+       int yy_is_jam;
+       char *yy_cp = (yy_c_buf_p);
+
+       YY_CHAR yy_c = 1;
+       if ( yy_accept[yy_current_state] )
+               {
+               (yy_last_accepting_state) = yy_current_state;
+               (yy_last_accepting_cpos) = yy_cp;
+               }
+       while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+               {
+               yy_current_state = (int) yy_def[yy_current_state];
+               if ( yy_current_state >= 20 )
+                       yy_c = yy_meta[yy_c];
+               }
+       yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+       yy_is_jam = (yy_current_state == 19);
+
+               return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_UNPUT
+
+    static void yyunput (int c, char * yy_bp )
+{
+       char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+       /* undo effects of setting up yytext */
+       *yy_cp = (yy_hold_char);
+
+       if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+               { /* need to shift things up to make room */
+               /* +2 for EOB chars. */
+               int number_to_move = (yy_n_chars) + 2;
+               char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+                                       YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+               char *source =
+                               &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+               while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+                       *--dest = *--source;
+
+               yy_cp += (int) (dest - source);
+               yy_bp += (int) (dest - source);
+               YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+                       (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+               if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+                       YY_FATAL_ERROR( "flex scanner push-back overflow" );
+               }
+
+       *--yy_cp = (char) c;
+
+    if ( c == '\n' ){
+        --yylineno;
+    }
+
+       (yytext_ptr) = yy_bp;
+       (yy_hold_char) = *yy_cp;
+       (yy_c_buf_p) = yy_cp;
+}
+
+#endif
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+       int c;
+    
+       *(yy_c_buf_p) = (yy_hold_char);
+
+       if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+               {
+               /* yy_c_buf_p now points to the character we want to return.
+                * If this occurs *before* the EOB characters, then it's a
+                * valid NUL; if not, then we've hit the end of the buffer.
+                */
+               if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+                       /* This was really a NUL. */
+                       *(yy_c_buf_p) = '\0';
+
+               else
+                       { /* need more input */
+                       int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
+                       ++(yy_c_buf_p);
+
+                       switch ( yy_get_next_buffer(  ) )
+                               {
+                               case EOB_ACT_LAST_MATCH:
+                                       /* This happens because yy_g_n_b()
+                                        * sees that we've accumulated a
+                                        * token and flags that we need to
+                                        * try matching the token before
+                                        * proceeding.  But for input(),
+                                        * there's no matching to consider.
+                                        * So convert the EOB_ACT_LAST_MATCH
+                                        * to EOB_ACT_END_OF_FILE.
+                                        */
+
+                                       /* Reset buffer status. */
+                                       yyrestart( yyin );
+
+                                       /*FALLTHROUGH*/
+
+                               case EOB_ACT_END_OF_FILE:
+                                       {
+                                       if ( yywrap(  ) )
+                                               return 0;
+
+                                       if ( ! (yy_did_buffer_switch_on_eof) )
+                                               YY_NEW_FILE;
+#ifdef __cplusplus
+                                       return yyinput();
+#else
+                                       return input();
+#endif
+                                       }
+
+                               case EOB_ACT_CONTINUE_SCAN:
+                                       (yy_c_buf_p) = (yytext_ptr) + offset;
+                                       break;
+                               }
+                       }
+               }
+
+       c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
+       *(yy_c_buf_p) = '\0';   /* preserve yytext */
+       (yy_hold_char) = *++(yy_c_buf_p);
+
+       if ( c == '\n' )
+               
+    yylineno++;
+;
+
+       return c;
+}
+#endif /* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+       if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+               YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer( yyin, YY_BUF_SIZE );
+       }
+
+       yy_init_buffer( YY_CURRENT_BUFFER, input_file );
+       yy_load_buffer_state(  );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+       /* TODO. We should be able to replace this entire function body
+        * with
+        *              yypop_buffer_state();
+        *              yypush_buffer_state(new_buffer);
+     */
+       yyensure_buffer_stack ();
+       if ( YY_CURRENT_BUFFER == new_buffer )
+               return;
+
+       if ( YY_CURRENT_BUFFER )
+               {
+               /* Flush out information for old buffer. */
+               *(yy_c_buf_p) = (yy_hold_char);
+               YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+               YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+               }
+
+       YY_CURRENT_BUFFER_LVALUE = new_buffer;
+       yy_load_buffer_state(  );
+
+       /* We don't actually know whether we did this switch during
+        * EOF (yywrap()) processing, but the only time this flag
+        * is looked at is after yywrap() is called, so it's safe
+        * to go ahead and always set it.
+        */
+       (yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void yy_load_buffer_state  (void)
+{
+       (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+       (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+       yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+       (yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
+       YY_BUFFER_STATE b;
+    
+       b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
+       if ( ! b )
+               YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+       b->yy_buf_size = size;
+
+       /* yy_ch_buf has to be 2 characters longer than the size given because
+        * we need to put in 2 end-of-buffer characters.
+        */
+       b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2)  );
+       if ( ! b->yy_ch_buf )
+               YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+       b->yy_is_our_buffer = 1;
+
+       yy_init_buffer( b, file );
+
+       return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+       if ( ! b )
+               return;
+
+       if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+               YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+       if ( b->yy_is_our_buffer )
+               yyfree( (void *) b->yy_ch_buf  );
+
+       yyfree( (void *) b  );
+}
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+       int oerrno = errno;
+    
+       yy_flush_buffer( b );
+
+       b->yy_input_file = file;
+       b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+       errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+       if ( ! b )
+               return;
+
+       b->yy_n_chars = 0;
+
+       /* We always need two end-of-buffer characters.  The first causes
+        * a transition to the end-of-buffer state.  The second causes
+        * a jam in that state.
+        */
+       b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+       b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+       b->yy_buf_pos = &b->yy_ch_buf[0];
+
+       b->yy_at_bol = 1;
+       b->yy_buffer_status = YY_BUFFER_NEW;
+
+       if ( b == YY_CURRENT_BUFFER )
+               yy_load_buffer_state(  );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+       if (new_buffer == NULL)
+               return;
+
+       yyensure_buffer_stack();
+
+       /* This block is copied from yy_switch_to_buffer. */
+       if ( YY_CURRENT_BUFFER )
+               {
+               /* Flush out information for old buffer. */
+               *(yy_c_buf_p) = (yy_hold_char);
+               YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+               YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+               }
+
+       /* Only push if top exists. Otherwise, replace top. */
+       if (YY_CURRENT_BUFFER)
+               (yy_buffer_stack_top)++;
+       YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+       /* copied from yy_switch_to_buffer. */
+       yy_load_buffer_state(  );
+       (yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+       if (!YY_CURRENT_BUFFER)
+               return;
+
+       yy_delete_buffer(YY_CURRENT_BUFFER );
+       YY_CURRENT_BUFFER_LVALUE = NULL;
+       if ((yy_buffer_stack_top) > 0)
+               --(yy_buffer_stack_top);
+
+       if (YY_CURRENT_BUFFER) {
+               yy_load_buffer_state(  );
+               (yy_did_buffer_switch_on_eof) = 1;
+       }
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+       yy_size_t num_to_alloc;
+    
+       if (!(yy_buffer_stack)) {
+
+               /* First allocation is just for 2 elements, since we don't know if this
+                * scanner will even need a stack. We use 2 instead of 1 to avoid an
+                * immediate realloc on the next call.
+         */
+      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+               (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+                                                               (num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                               );
+               if ( ! (yy_buffer_stack) )
+                       YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
+               memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+
+               (yy_buffer_stack_max) = num_to_alloc;
+               (yy_buffer_stack_top) = 0;
+               return;
+       }
+
+       if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+               /* Increase the buffer to prepare for a possible push. */
+               yy_size_t grow_size = 8 /* arbitrary grow size */;
+
+               num_to_alloc = (yy_buffer_stack_max) + grow_size;
+               (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+                                                               ((yy_buffer_stack),
+                                                               num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                               );
+               if ( ! (yy_buffer_stack) )
+                       YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
+               /* zero only the new slots.*/
+               memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+               (yy_buffer_stack_max) = num_to_alloc;
+       }
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+       YY_BUFFER_STATE b;
+    
+       if ( size < 2 ||
+            base[size-2] != YY_END_OF_BUFFER_CHAR ||
+            base[size-1] != YY_END_OF_BUFFER_CHAR )
+               /* They forgot to leave room for the EOB's. */
+               return NULL;
+
+       b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
+       if ( ! b )
+               YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+
+       b->yy_buf_size = (int) (size - 2);      /* "- 2" to take care of EOB's */
+       b->yy_buf_pos = b->yy_ch_buf = base;
+       b->yy_is_our_buffer = 0;
+       b->yy_input_file = NULL;
+       b->yy_n_chars = b->yy_buf_size;
+       b->yy_is_interactive = 0;
+       b->yy_at_bol = 1;
+       b->yy_fill_buffer = 0;
+       b->yy_buffer_status = YY_BUFFER_NEW;
+
+       yy_switch_to_buffer( b  );
+
+       return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (const char * yystr )
+{
+    
+       return yy_scan_bytes( yystr, (int) strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
+{
+       YY_BUFFER_STATE b;
+       char *buf;
+       yy_size_t n;
+       int i;
+    
+       /* Get memory for full buffer, including space for trailing EOB's. */
+       n = (yy_size_t) (_yybytes_len + 2);
+       buf = (char *) yyalloc( n  );
+       if ( ! buf )
+               YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+
+       for ( i = 0; i < _yybytes_len; ++i )
+               buf[i] = yybytes[i];
+
+       buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+       b = yy_scan_buffer( buf, n );
+       if ( ! b )
+               YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+
+       /* It's okay to grow etc. this buffer, and we should throw it
+        * away when we're done.
+        */
+       b->yy_is_our_buffer = 1;
+
+       return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yynoreturn yy_fatal_error (const char* msg )
+{
+                       fprintf( stderr, "%s\n", msg );
+       exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+       do \
+               { \
+               /* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+               yytext[yyleng] = (yy_hold_char); \
+               (yy_c_buf_p) = yytext + yyless_macro_arg; \
+               (yy_hold_char) = *(yy_c_buf_p); \
+               *(yy_c_buf_p) = '\0'; \
+               yyleng = yyless_macro_arg; \
+               } \
+       while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+    
+    return yylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int yyget_leng  (void)
+{
+        return yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *yyget_text  (void)
+{
+        return yytext;
+}
+
+/** Set the current line number.
+ * @param _line_number line number
+ * 
+ */
+void yyset_lineno (int  _line_number )
+{
+    
+    yylineno = _line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param _in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  _in_str )
+{
+        yyin = _in_str ;
+}
+
+void yyset_out (FILE *  _out_str )
+{
+        yyout = _out_str ;
+}
+
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+
+void yyset_debug (int  _bdebug )
+{
+        yy_flex_debug = _bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+
+    /* We do not touch yylineno unless the option is enabled. */
+    yylineno =  1;
+    
+    (yy_buffer_stack) = NULL;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = NULL;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = NULL;
+    yyout = NULL;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+       while(YY_CURRENT_BUFFER){
+               yy_delete_buffer( YY_CURRENT_BUFFER  );
+               YY_CURRENT_BUFFER_LVALUE = NULL;
+               yypop_buffer_state();
+       }
+
+       /* Destroy the stack itself. */
+       yyfree((yy_buffer_stack) );
+       (yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, const char * s2, int n )
+{
+               
+       int i;
+       for ( i = 0; i < n; ++i )
+               s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (const char * s )
+{
+       int n;
+       for ( n = 0; s[n]; ++n )
+               ;
+
+       return n;
+}
+#endif
+
+void *yyalloc (yy_size_t  size )
+{
+                       return malloc(size);
+}
+
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
+               
+       /* The cast to (char *) in the following accommodates both
+        * implementations that use char* generic pointers, and those
+        * that use void* generic pointers.  It works with the latter
+        * because both ANSI C and C++ allow castless assignment from
+        * any pointer type to void*, and deal with argument conversions
+        * as though doing an assignment.
+        */
+       return realloc(ptr, size);
+}
+
+void yyfree (void * ptr )
+{
+                       free( (char *) ptr );   /* see yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 55 "src/tools/asm.l"
+
+
+token_t asm_lexer_peek_token() {
+    if (peeked_token.type != token_none) {
+        return peeked_token;
+    }
+
+    token_t token = __asm_lexer_next_token();
+    peeked_token = token;
+    return token;
+}
+
+token_t asm_lexer_next_token() {
+    if (peeked_token.type != token_none) {
+        token_t ret = peeked_token;
+        peeked_token.type = token_none;
+        return ret;
+    }
+
+    return __asm_lexer_next_token();
+}
+
+void asm_lexer_input(char *data, int size) {
+    file_data = data;
+    bytes_remaining = size;
+}
+
+
index a8996ed8314ebd19d5383f46895c70fdf46383c2..78e902e911ee9bf3ca34000b3f5f3e5761d3efa6 100644 (file)
@@ -37,7 +37,7 @@ bool ovm_program_load_from_file(ovm_program_t *program, ovm_engine_t *engine, ch
     i32 entry_count;
     bh_file_read(&file, &entry_count, sizeof(i32));
     bh_arr_insert_end(program->code, entry_count);
-    bh_file_read(&file, &bh_arr_last(program->code), entry_count * sizeof(ovm_instr_t));
+    bh_file_read(&file, program->code, entry_count * sizeof(ovm_instr_t));
 
     //
     // Data section
@@ -94,9 +94,15 @@ void ovm_program_link_native_funcs(ovm_program_t *program, ovm_native_func_t *fu
             if (!strcmp(nf->name, func->name) && nf->param_count == func->param_count) {
                 nf->native_func = func->native_func;
                 nf->userdata    = func->userdata;
+                break;
             }
 
             func++;
         }
+
+        if (!nf->native_func) {
+            fprintf(stderr, "Failed to link to native function '%s'.\n", nf->name);
+            exit(1);
+        }
     }
 }
index bb8bf6d0da5a52621f94ee333cebbe4e8e909fdf..a004d49e6186a68367799bf46d3ca424280a4163 100644 (file)
@@ -297,7 +297,12 @@ void ovm_program_print_instructions(ovm_program_t *program, i32 start_instr, i32
     }
 }
 
-
+void ovm_raw_print_instructions(i32 instr_count, ovm_instr_t *instrs) {
+    fori (i, 0, instr_count) {
+        ovm_instr_t instr = instrs[i];
+        printf("%48s | r=%02d a=%02d b=%02d  i=%d f=%f l=%ld d=%lf\n", ovm_instr_name(instr.full_instr), instr.r, instr.a, instr.b, instr.i, instr.f, instr.l, instr.d);
+    }
+}
 
 //
 // Engine
@@ -656,7 +661,9 @@ void ovm_run_code(ovm_engine_t *engine, ovm_state_t *state, ovm_program_t *progr
                 bh_arr_fastdeleten(state->numbered_values, frame.value_number_count);
 
                 state->value_number_offset = bh_arr_last(state->stack_frames).value_number_base;
-                VAL(frame.return_number_value) = val;
+                if (frame.return_number_value >= 0) {
+                    VAL(frame.return_number_value) = val;
+                }
 
                 state->pc = frame.return_address;
                 break;
@@ -695,7 +702,7 @@ void ovm_run_code(ovm_engine_t *engine, ovm_state_t *state, ovm_program_t *progr
             native_func.native_func(native_func.userdata, state->params, &result); \
             bh_arr_set_length(state->params, 0); \
  \
-            if (instr.type != OVM_TYPE_NONE) { \
+            if (OVM_INSTR_TYPE(instr) != OVM_TYPE_NONE) { \
                 VAL(instr.r) = result; \
             }
 
diff --git a/test.asm b/test.asm
new file mode 100644 (file)
index 0000000..d4b2e34
--- /dev/null
+++ b/test.asm
@@ -0,0 +1,39 @@
+
+.native_func dummy 0
+.native_func print_int 1
+
+.func add 2
+    add.i32 %2, %0, %1
+    return.i32 %2
+
+.func count 1
+    imm.i32 %1, 1
+
+  :loop
+    param %0
+    native_call print_int
+    sub.i32 %0, %0, %1
+    br_nz loop, %0
+
+    br skip
+    imm.i32 %1, 123
+    param %1
+    native_call print_int
+  :skip
+    return
+
+.func main 0
+    imm.i32 %0, 1
+    imm.i32 %1, 2
+    param %0
+    param %1
+    call.i32 %2, add
+    param %2
+    native_call print_int
+
+    imm.i32 %3, 10
+    param %3
+    call count
+
+    return
+