Move bootstrap4 runtime to rt/

mmastrac · Apr 29, 2022 · ee3c625 · ee3c625
1 parent 50c4cad
commit ee3c625
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 8 deletions.
diff --git a/bootstrap/bootstrap4/crt0.s → bootstrap/bootstrap4/rt/crt0.s b/bootstrap/bootstrap4/crt0.s → bootstrap/bootstrap4/rt/crt0.s
diff --git a/bootstrap/bootstrap4/dprintf.s → bootstrap/bootstrap4/rt/dprintf.s b/bootstrap/bootstrap4/dprintf.s → bootstrap/bootstrap4/rt/dprintf.s
diff --git a/bootstrap/bootstrap4/hash_table.s → bootstrap/bootstrap4/rt/hash_table.s b/bootstrap/bootstrap4/hash_table.s → bootstrap/bootstrap4/rt/hash_table.s
diff --git a/bootstrap/bootstrap4/io.s → bootstrap/bootstrap4/rt/io.s b/bootstrap/bootstrap4/io.s → bootstrap/bootstrap4/rt/io.s
diff --git a/bootstrap/bootstrap4/linked_list.s → bootstrap/bootstrap4/rt/linked_list.s b/bootstrap/bootstrap4/linked_list.s → bootstrap/bootstrap4/rt/linked_list.s
diff --git a/bootstrap/bootstrap4/linker.s → bootstrap/bootstrap4/rt/linker.s b/bootstrap/bootstrap4/linker.s → bootstrap/bootstrap4/rt/linker.s
diff --git a/bootstrap/bootstrap4/memory.s → bootstrap/bootstrap4/rt/memory.s b/bootstrap/bootstrap4/memory.s → bootstrap/bootstrap4/rt/memory.s
diff --git a/bootstrap/bootstrap4/string.s → bootstrap/bootstrap4/rt/string.s b/bootstrap/bootstrap4/string.s → bootstrap/bootstrap4/rt/string.s
diff --git a/bootstrap/bootstrap4/sys.s → bootstrap/bootstrap4/rt/sys.s b/bootstrap/bootstrap4/sys.s → bootstrap/bootstrap4/rt/sys.s
diff --git a/bootstrap/bootstrap4/test.s → bootstrap/bootstrap4/rt/test.s b/bootstrap/bootstrap4/test.s → bootstrap/bootstrap4/rt/test.s
diff --git a/test.sh b/test.sh
@@ -77,25 +77,25 @@ echo Error 3
 ./vm /tmp/b3.bin $TEST/bootstrap3/error/error1.s /tmp/out.bin && exit 1
 
 echo Test 4
-./vm /tmp/b3.bin -l -I $ROOT/include $TEST/bootstrap4/test1.s $ROOT/bootstrap4/crt0.s bootstrap/bootstrap4/memory.s bootstrap/bootstrap4/string.s bootstrap/bootstrap4/sys.s /tmp/t4.bin
+./vm /tmp/b3.bin -l -I $ROOT/include $TEST/bootstrap4/test1.s $ROOT/bootstrap4/rt/crt0.s $ROOT/bootstrap4/rt/memory.s $ROOT/bootstrap4/rt/string.s $ROOT/bootstrap4/rt/sys.s /tmp/t4.bin
 ./vm /tmp/t4.bin
 echo Test 4
-./vm /tmp/b3.bin -l -I $ROOT/include $TEST/bootstrap4/test2.s $ROOT/bootstrap4/crt0.s bootstrap/bootstrap4/memory.s bootstrap/bootstrap4/string.s bootstrap/bootstrap4/sys.s bootstrap/bootstrap4/string.s bootstrap/bootstrap4/dprintf.s /tmp/t4.bin
+./vm /tmp/b3.bin -l -I $ROOT/include $TEST/bootstrap4/test2.s $ROOT/bootstrap4/rt/crt0.s $ROOT/bootstrap4/rt/memory.s $ROOT/bootstrap4/rt/string.s $ROOT/bootstrap4/rt/sys.s $ROOT/bootstrap4/rt/dprintf.s /tmp/t4.bin
 ./vm /tmp/t4.bin
 echo Test 4
-./vm /tmp/b3.bin -l -I $ROOT/include $TEST/bootstrap4/test3.s $ROOT/bootstrap4/crt0.s bootstrap/bootstrap4/memory.s bootstrap/bootstrap4/string.s bootstrap/bootstrap4/sys.s bootstrap/bootstrap4/string.s bootstrap/bootstrap4/dprintf.s /tmp/t4.bin
+./vm /tmp/b3.bin -l -I $ROOT/include $TEST/bootstrap4/test3.s $ROOT/bootstrap4/rt/crt0.s $ROOT/bootstrap4/rt/memory.s $ROOT/bootstrap4/rt/string.s $ROOT/bootstrap4/rt/sys.s $ROOT/bootstrap4/rt/dprintf.s /tmp/t4.bin
 ./vm /tmp/t4.bin
 echo Test 4
-./vm /tmp/b3.bin -l -I $ROOT/include $TEST/bootstrap4/test4.s $ROOT/bootstrap4/crt0.s bootstrap/bootstrap4/memory.s bootstrap/bootstrap4/string.s bootstrap/bootstrap4/sys.s bootstrap/bootstrap4/dprintf.s /tmp/t4.bin
+./vm /tmp/b3.bin -l -I $ROOT/include $TEST/bootstrap4/test4.s $ROOT/bootstrap4/rt/crt0.s $ROOT/bootstrap4/rt/memory.s $ROOT/bootstrap4/rt/string.s $ROOT/bootstrap4/rt/sys.s $ROOT/bootstrap4/rt/dprintf.s /tmp/t4.bin
 ./vm /tmp/t4.bin
 echo Test 4
-./vm /tmp/b3.bin -l -I $ROOT/include $ROOT/bootstrap4/crt0.s bootstrap/bootstrap4/memory.s bootstrap/bootstrap4/string.s bootstrap/bootstrap4/sys.s bootstrap/bootstrap4/dprintf.s bootstrap/bootstrap4/linked_list.s bootstrap/bootstrap4/hash_table.s bootstrap/bootstrap4/test.s bootstrap/bootstrap4/tests/*.s /tmp/t4.bin
+./vm /tmp/b3.bin -l -I $ROOT/include $ROOT/bootstrap4/rt/*.s $ROOT/bootstrap4/tests/*.s /tmp/t4.bin
 ./vm /tmp/t4.bin
 echo Test 4
-./vm /tmp/b3.bin -l -I $ROOT/include $ROOT/bootstrap4/*.s $ROOT/bootstrap4/lex/lex.s $ROOT/bootstrap4/lex/lex_io.s $ROOT/bootstrap4/lex/tests/*.s /tmp/t4.bin
+./vm /tmp/b3.bin -l -I $ROOT/include $ROOT/bootstrap4/rt/*.s $ROOT/bootstrap4/lex/lex.s $ROOT/bootstrap4/lex/lex_io.s $ROOT/bootstrap4/lex/tests/*.s /tmp/t4.bin
 ./vm /tmp/t4.bin
 echo Compile 4
-./vm /tmp/b3.bin -l -I $ROOT/include $ROOT/bootstrap4/*.s $ROOT/bootstrap4/lex/*.s $ROOT/bootstrap4/compiler0/*.s /tmp/t4.bin
+./vm /tmp/b3.bin -l -I $ROOT/include $ROOT/bootstrap4/rt/*.s $ROOT/bootstrap4/lex/*.s $ROOT/bootstrap4/compiler0/*.s /tmp/t4.bin
 echo Compile 4
 ./vm /tmp/t4.bin $ROOT/bootstrap4/compiler0/tests/test_basic.c /tmp/test_basic.s
 echo Compile 4
@@ -107,7 +107,7 @@ echo Compile 4
 echo Compile 4
 ./vm /tmp/t4.bin $ROOT/bootstrap4/compiler0/tests/test_local.c /tmp/test_local.s
 echo Compile 4
-./vm /tmp/b3.bin -l -I $ROOT/include $ROOT/bootstrap4/*.s $ROOT/bootstrap4/compiler0/tests/*.s /tmp/test_basic.s /tmp/test_binary.s /tmp/test_fib.s /tmp/test_function.s /tmp/test_local.s /tmp/t4_0.bin
+./vm /tmp/b3.bin -l -I $ROOT/include $ROOT/bootstrap4/rt/*.s $ROOT/bootstrap4/compiler0/tests/*.s /tmp/test_basic.s /tmp/test_binary.s /tmp/test_fib.s /tmp/test_function.s /tmp/test_local.s /tmp/t4_0.bin
 ./vm /tmp/t4_0.bin
 
 echo Done