Move the bootstrap code up one level

Author: mmastrac

README.md

@@ -82,7 +82,7 @@
 # Create the include list
 	%call :_ll_init
 	mov @ll, @ret
-	%call :_ll_create_node_int, &"bootstrap/bootstrap5"
+	%call :_ll_create_node_int, &"bootstrap5"
 	mov @node, @ret
 	%call :_ll_insert_head, @ll, @node
 

bootstrap/README.md

@@ -136,7 +136,7 @@
 	dd 0
 
 :_lex_test_tokens
-	%call :__lex_confirm_file, &"bootstrap/bootstrap5/lex/tests/c/test.c", :__lex_test_tokens_expected
+	%call :__lex_confirm_file, &"bootstrap5/lex/tests/c/test.c", :__lex_test_tokens_expected
 	%ret
 
 :__lex_test_tokens_define_expected
@@ -149,7 +149,7 @@
 	dd 0
 
 :_lex_test_tokens_define
-	%call :__lex_confirm_file, &"bootstrap/bootstrap5/lex/tests/c/test_define.c", :__lex_test_tokens_define_expected
+	%call :__lex_confirm_file, &"bootstrap5/lex/tests/c/test_define.c", :__lex_test_tokens_define_expected
 	%ret
 
 :__lex_test_tokens_include_expected
@@ -162,5 +162,5 @@
 	dd 0
 
 :_lex_test_tokens_include
-	%call :__lex_confirm_file, &"bootstrap/bootstrap5/lex/tests/c/test_include.c", :__lex_test_tokens_include_expected
+	%call :__lex_confirm_file, &"bootstrap5/lex/tests/c/test_include.c", :__lex_test_tokens_include_expected
 	%ret

bootstrap/bootstrap5/compiler0/main.s

@@ -12,7 +12,7 @@
 	# Create the include list
 	%call :_ll_init
 	mov @ll, @ret
-	%call :_ll_create_node_int, &"bootstrap/bootstrap5/lex/tests/c"
+	%call :_ll_create_node_int, &"bootstrap5/lex/tests/c"
 	mov @node, @ret
 	%call :_ll_insert_head, @ll, @node
 

bootstrap/bootstrap5/lex/tests/lex_test.s

@@ -0,0 +1,210 @@
+# Stage 0 compiler: we want to get enough C that we can move out of assembly land
+
+#include "regs.h"
+#include "../lex/lex.h"
+
+#define BUFFER_SIZE 256
+
+# Track global identifiers
+:_global_symbols
+	dd 0
+
+:_track_global
+	%arg global
+	%arg size
+	%local ht
+	ld.d @ht, [:_global_symbols]
+	# Make a copy and insert it into the globals hash table
+	%call :_stralloc, @global
+	mov @global, @ret
+	%call :_ht_insert, @ht, @global, @size
+	%ret
+
+:_is_global
+	%arg global
+	%local ht
+	ld.d @ht, [:_global_symbols]
+	%call :_ht_lookup, @ht, @global
+	%ret
+
+# Track local identifiers
+:_local_symbols
+	dd 0
+
+:_track_local
+	%arg local
+	%arg size
+	%local ht
+	ld.d @ht, [:_local_symbols]
+	# Make a copy and insert it into the locals hash table
+	%call :_stralloc, @local
+	mov @local, @ret
+	%call :_ht_insert, @ht, @local, @size
+	%ret
+
+:_is_local
+	%arg local
+	%local ht
+	ld.d @ht, [:_local_symbols]
+	%call :_ht_lookup, @ht, @local
+	%ret
+
+:_teardown_locals
+	# Leaks locals because we don't have a proper heap yet
+	mov @tmp0, 0
+	st.d [:_local_symbols], @tmp0
+	%ret
+
+:_main
+	%arg argc
+	%arg argv
+	%local buf1
+	%local buf2
+	%local token
+	%local ll
+	%local node
+	%local lex
+	%local file
+	%local args
+	%local output
+	%local size
+
+# Allocate a 256-byte buffer
+	%call :_malloc, @BUFFER_SIZE
+	mov @buf1, @ret
+	%call :_malloc, @BUFFER_SIZE
+	mov @buf2, @ret
+
+# Create the globals hash table
+	%call :_ht_init, :__lex_hash_table_test_key_hash, :__lex_hash_table_test_key_compare
+	st.d [:_global_symbols], @ret
+
+# Create the include list
+	%call :_ll_init
+	mov @ll, @ret
+	%call :_ll_create_node_int, &"bootstrap5"
+	mov @node, @ret
+	%call :_ll_insert_head, @ll, @node
+
+# Create the lex environment
+	%call :__lex_create, @ll
+	mov @lex, @ret
+
+# Open a file
+	mov @args, @argv
+
+	# Get argv[1] - the file the open
+	add @args, 4
+	ld.d @file, [@args]
+
+	# Get argv[2] - the output file
+	add @args, 4
+	ld.d @output, [@args]
+	%call :_compiler_out_open, @output
+
+	%call :_compiler_out, &"# %s\n", @file
+	%call :_compiler_out, &"#include \"regs.h\"\n"
+	%call :__lex_open, @lex, @file
+	mov @file, @ret
+
+.loop
+	%call :_lex_peek, @file, @buf1, @BUFFER_SIZE
+	mov @token, @ret
+
+	eq @token, @TOKEN_EOF
+	jump? .done
+
+	eq @token, @TOKEN_EXTERN
+	jump? .extern
+
+	# We only support int functions for this basic parser
+	%call :_compile_function_type, @file, @buf1, @BUFFER_SIZE
+	mov @size, @ret
+
+	%call :_lex, @file, @buf1, @BUFFER_SIZE
+	mov @token, @ret
+	eq @token, @TOKEN_IDENTIFIER
+	jump^ .error
+
+	%call :_compiler_out, &"# global %s\n:_%s\n", @buf1, @buf1
+
+	%call :_lex_peek, @file, 0, 0
+	eq @ret, '('
+	jump? .fn
+
+	eq @ret, '='
+	jump? .inited
+	eq @ret, '['
+	jump? .equal
+
+	%call :_track_global, @buf1, @size
+	%call :_compiler_out, &"    dd 0\n"
+    %call :_compiler_read_expect, @file, @buf1, @BUFFER_SIZE, ';'
+	jump .loop
+
+.equal
+	mov @size, 4
+    %call :_compiler_read_expect, @file, 0, 0, '['
+    %call :_compiler_read_expect, @file, 0, 0, ']'
+
+.inited
+	%call :_track_global, @buf1, @size
+    %call :_compiler_read_expect, @file, 0, 0, '='
+	%call :_compile_constant, @file, @buf1, @BUFFER_SIZE, @size
+    %call :_compiler_read_expect, @file, @buf1, @BUFFER_SIZE, ';'
+	jump .loop
+
+.extern
+	# extern (type) (identifier);
+    %call :_compiler_read_expect, @file, @buf1, @BUFFER_SIZE, @TOKEN_EXTERN
+	%call :_compile_function_type, @file, @buf1, @BUFFER_SIZE
+	mov @size, @ret
+	%call :_lex, @file, @buf1, @BUFFER_SIZE
+	%call :_track_global, @buf1, @size
+    %call :_compiler_read_expect, @file, @buf1, @BUFFER_SIZE, ';'
+	jump .loop
+
+.fn
+	%call :_track_global, @buf1, @size
+	%call :_ht_init, :__lex_hash_table_test_key_hash, :__lex_hash_table_test_key_compare
+	st.d [:_local_symbols], @ret
+	%call :_compile_function_args, @file, @buf1, @BUFFER_SIZE
+	%call :_lex_peek, @file, 0, 0
+	# Abort on forward declarations
+	eq @ret, ';'
+	jump? .fn_forward
+	%call :_compiler_out, &"    %%local _carg0\n"
+	%call :_compiler_out, &"    %%local _carg1\n"
+	%call :_compiler_out, &"    %%local _carg2\n"
+	%call :_compiler_out, &"    %%local _carg3\n"
+	%call :_compiler_out, &"    %%local _carg4\n"
+	%call :_compiler_out, &"    %%local _carg5\n"
+	%call :_compiler_out, &"    %%local _carg6\n"
+	%call :_compiler_out, &"    %%local _carg7\n"
+	mov @tmp0, 0
+	st.d [:_function_has_saved_stack], @tmp0
+	%call :_compile_block, @file, @buf1, @BUFFER_SIZE
+	ld.d @tmp0, [:_function_has_saved_stack]
+	eq @tmp0, 0
+	jump? .fn_no_stack
+	%call :_compiler_out, &"    pop @tmp0\n"
+	%call :_compiler_out, &"    mov @sp, @tmp0\n"
+.fn_no_stack
+	%call :_compiler_out, &"    %%ret\n"
+	%call :_teardown_locals
+	jump .loop
+.fn_forward
+    %call :_compiler_read_expect, @file, @buf1, @BUFFER_SIZE, ';'
+	%call :_compiler_out, &"# forward\n"
+	jump .loop
+
+.done
+	%call :_compiler_out, &"# EOF\n"
+	mov @ret, 0
+	%ret
+
+
+.error
+	%call :_compiler_out, &"# Error\n"
+	mov @ret, 1
+	%ret

bootstrap/bootstrap5/lex/tests/tests.s

@@ -13,7 +13,7 @@ int* lex_tokens;
 // we may need to compute an expression's value before we store it to the local.
 void lex_init(const char* file) {
     void* ll = _ll_init();
-    void* ll_node = _ll_create_node_int("bootstrap/bootstrap4");
+    void* ll_node = _ll_create_node_int("bootstrap4");
     int i;
     _ll_insert_head(ll, ll_node);
     lex_lexer = __lex_open(__lex_create(ll), file);

bootstrap/tests/bootstrap4/test6.s

@@ -16,7 +16,7 @@
 	mov @lex, @ret
 
 	# Open a file
-	%call :__lex_open, @lex, &"bootstrap/bootstrap5/lex/tests/c/test.c"
+	%call :__lex_open, @lex, &"bootstrap5/lex/tests/c/test.c"
 	mov @file, @ret
 
 	%call :__lex_read, @file
@@ -36,7 +36,7 @@
 	# Create the include list
 	%call :_ll_init
 	mov @ll, @ret
-	%call :_ll_create_node_int, &"bootstrap/bootstrap5/lex/tests"
+	%call :_ll_create_node_int, &"bootstrap5/lex/tests"
 	mov @node, @ret
 	%call :_ll_insert_head, @ll, @node
 
@@ -45,7 +45,7 @@
 	mov @lex, @ret
 
 	# Open a file
-	%call :__lex_open, @lex, &"bootstrap/bootstrap5/lex/tests/c/test.c"
+	%call :__lex_open, @lex, &"bootstrap5/lex/tests/c/test.c"
 	mov @file, @ret
 
 	%call :_lex_check_read, @file, &"int "