52 files changed, 15 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index df72879..cc2267b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,31 +8,35 @@ start-digital:
 
 # make assemble asm=src/program.atk16 out=out/program.bin
 assemble:
-	$(py) src/assembler.py $(asm) $(out)
+	$(py) atk16-asm/assembler.py $(asm) $(out)
 
 # make gen-ucode out=out/ucode.bin
 gen-ucode:
-	$(py) src/ucode.py $(out)
+	$(py) atk16-utils/ucode.py $(out)
 
 # make gen-charmem out=out/charmem.bin
 gen-charmem:
-	$(py) src/charmem.py $(out)
+	$(py) atk16-utils/charmem.py $(out)
 
 # make convert-ttf in=font.ttf out=charset.txt
 convert-ttf:
-	$(py) src/convert_ttf.py $(in) $(out)
+	$(py) atk16-utils/convert_ttf.py $(in) $(out)
 
 # make dig-install bin=out/program.bin dig=digital/atk16_mem.dig label=MEM_ROM
 dig-install:
-	$(py) src/dig_install.py $(bin) $(dig) $(label)
+	$(py) atk16-utils/dig_install.py $(bin) $(dig) $(label)
 
-# make compile-py-to-atk16 in=asm/test_py_src.py out=asm/test_py_src.atk16
-compile-py-to-atk16:
-	$(py) src/ast_compiler.py $(in) $(out)
+# make ast-compile in=asm/test_py_src.py out=asm/test_py_src.atk16
+ast-compile:
+	$(py) atk16-ast-walking-compiler/compiler.py $(in) $(out)
+
+# make bytecode-compile in=asm/test_py_src.py out=asm/test_py_src.atk16
+bytecode-compile:
+	$(py) atk16-bytecode-compiler/compiler.py $(in) $(out)
 
 # make test
 test:
-	$(py) src/test_alu.py digital/atk16_alu.dig
+	$(py) atk16-asm/test_alu.py digital-diagrams/atk16_alu.dig
 
 run-single-test:
 	java -cp $(digital_path) CLI test -verbose -circ $(circ) -tests $(tests)
diff --git a/src/asm_eval.py b/atk16-asm/asm_eval.py
index c05fc03..c05fc03 100644
--- a/src/asm_eval.py
+++ b/atk16-asm/asm_eval.py
diff --git a/src/asm_ops.py b/atk16-asm/asm_ops.py
index 885c275..885c275 100644
--- a/src/asm_ops.py
+++ b/atk16-asm/asm_ops.py
diff --git a/src/asm_pass0.py b/atk16-asm/asm_pass0.py
index f5b6b0b..f5b6b0b 100644
--- a/src/asm_pass0.py
+++ b/atk16-asm/asm_pass0.py
diff --git a/src/asm_pass1.py b/atk16-asm/asm_pass1.py
index 0b06738..0b06738 100644
--- a/src/asm_pass1.py
+++ b/atk16-asm/asm_pass1.py
diff --git a/src/asm_pass2.py b/atk16-asm/asm_pass2.py
index e2ad4ec..e2ad4ec 100644
--- a/src/asm_pass2.py
+++ b/atk16-asm/asm_pass2.py
diff --git a/src/asm_pass3.py b/atk16-asm/asm_pass3.py
index 9c8cb34..9c8cb34 100644
--- a/src/asm_pass3.py
+++ b/atk16-asm/asm_pass3.py
diff --git a/src/asm_pass4.py b/atk16-asm/asm_pass4.py
index 2fff870..2fff870 100644
--- a/src/asm_pass4.py
+++ b/atk16-asm/asm_pass4.py
diff --git a/src/assembler.py b/atk16-asm/assembler.py
index c678ba0..c678ba0 100755
--- a/src/assembler.py
+++ b/atk16-asm/assembler.py
diff --git a/src/optimizer.py b/atk16-asm/optimizer.py
index 0ee2837..0ee2837 100644
--- a/src/optimizer.py
+++ b/atk16-asm/optimizer.py
diff --git a/src/tokenizer.py b/atk16-asm/tokenizer.py
index cf31b56..cf31b56 100644
--- a/src/tokenizer.py
+++ b/atk16-asm/tokenizer.py
diff --git a/src/ast_compiler.py b/atk16-ast-walking-compiler/compiler.py
index fe6f5a6..1634bed 100644
--- a/src/ast_compiler.py
+++ b/atk16-ast-walking-compiler/compiler.py
@@ -10,7 +10,7 @@ from collections import OrderedDict
 
 
 if len(sys.argv) != 3:
-  print("usage: ast_compiler.py <infile.py> <outfile.atk16>")
+  print("usage: compiler.py <infile.py> <outfile.atk16>")
   sys.exit(1)
 
 infile_path = sys.argv[1]
diff --git a/src/bytecode_compiler.py b/atk16-bytecode-compiler/bytecode_compiler.py
index 0492ddb..42cf8dc 100644
--- a/src/bytecode_compiler.py
+++ b/atk16-bytecode-compiler/bytecode_compiler.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Generate .atk16 assembly from a subset of Python
+# Generate .atk16 assembly from Python bytecode
 
 import sys
 import dis
diff --git a/src/charmem.py b/atk16-utils/charmem.py
index aaac122..aaac122 100644
--- a/src/charmem.py
+++ b/atk16-utils/charmem.py
diff --git a/src/convert_ttf.py b/atk16-utils/convert_ttf.py
index c1135cb..c1135cb 100644
--- a/src/convert_ttf.py
+++ b/atk16-utils/convert_ttf.py
diff --git a/src/dig_install.py b/atk16-utils/dig_install.py
index c32229b..c32229b 100644
--- a/src/dig_install.py
+++ b/atk16-utils/dig_install.py
diff --git a/src/ucode.py b/atk16-utils/ucode.py
index 07d0554..07d0554 100755
--- a/src/ucode.py
+++ b/atk16-utils/ucode.py
diff --git a/digital/atk16.dig b/digital-diagrams/atk16.dig
index 87f7ddb..87f7ddb 100644
--- a/digital/atk16.dig
+++ b/digital-diagrams/atk16.dig
diff --git a/digital/atk16_alu.dig b/digital-diagrams/atk16_alu.dig
index 0f40f94..0f40f94 100644
--- a/digital/atk16_alu.dig
+++ b/digital-diagrams/atk16_alu.dig
diff --git a/digital/atk16_alu_carryfix.dig b/digital-diagrams/atk16_alu_carryfix.dig
index 1c22602..1c22602 100644
--- a/digital/atk16_alu_carryfix.dig
+++ b/digital-diagrams/atk16_alu_carryfix.dig
diff --git a/digital/atk16_alu_fo.dig b/digital-diagrams/atk16_alu_fo.dig
index ecf0021..ecf0021 100644
--- a/digital/atk16_alu_fo.dig
+++ b/digital-diagrams/atk16_alu_fo.dig
diff --git a/digital/atk16_alu_fz.dig b/digital-diagrams/atk16_alu_fz.dig
index 2da652a..2da652a 100644
--- a/digital/atk16_alu_fz.dig
+++ b/digital-diagrams/atk16_alu_fz.dig
diff --git a/digital/atk16_alu_inputs.dig b/digital-diagrams/atk16_alu_inputs.dig
index 310bafb..310bafb 100644
--- a/digital/atk16_alu_inputs.dig
+++ b/digital-diagrams/atk16_alu_inputs.dig
diff --git a/digital/atk16_decoder.dig b/digital-diagrams/atk16_decoder.dig
index b8eb088..b8eb088 100644
--- a/digital/atk16_decoder.dig
+++ b/digital-diagrams/atk16_decoder.dig
diff --git a/digital/atk16_graphics_mode.dig b/digital-diagrams/atk16_graphics_mode.dig
index 2d05dd6..2d05dd6 100644
--- a/digital/atk16_graphics_mode.dig
+++ b/digital-diagrams/atk16_graphics_mode.dig
diff --git a/digital/atk16_irc.dig b/digital-diagrams/atk16_irc.dig
index 0037fa0..0037fa0 100644
--- a/digital/atk16_irc.dig
+++ b/digital-diagrams/atk16_irc.dig
diff --git a/digital/atk16_jump_unit.dig b/digital-diagrams/atk16_jump_unit.dig
index 4ccd266..4ccd266 100644
--- a/digital/atk16_jump_unit.dig
+++ b/digital-diagrams/atk16_jump_unit.dig
diff --git a/digital/atk16_mem.dig b/digital-diagrams/atk16_mem.dig
index 6ff9810..6ff9810 100644
--- a/digital/atk16_mem.dig
+++ b/digital-diagrams/atk16_mem.dig
diff --git a/digital/atk16_mem_mux.dig b/digital-diagrams/atk16_mem_mux.dig
index d4be584..d4be584 100644
--- a/digital/atk16_mem_mux.dig
+++ b/digital-diagrams/atk16_mem_mux.dig
diff --git a/digital/atk16_peripherals.dig b/digital-diagrams/atk16_peripherals.dig
index c8eb7b5..c8eb7b5 100644
--- a/digital/atk16_peripherals.dig
+++ b/digital-diagrams/atk16_peripherals.dig
diff --git a/digital/atk16_ppu.dig b/digital-diagrams/atk16_ppu.dig
index e6e7608..e6e7608 100644
--- a/digital/atk16_ppu.dig
+++ b/digital-diagrams/atk16_ppu.dig
diff --git a/digital/atk16_ppu_palette.dig b/digital-diagrams/atk16_ppu_palette.dig
index 40101b7..40101b7 100644
--- a/digital/atk16_ppu_palette.dig
+++ b/digital-diagrams/atk16_ppu_palette.dig
diff --git a/digital/atk16_ppu_sprite_eval.dig b/digital-diagrams/atk16_ppu_sprite_eval.dig
index c765847..c765847 100644
--- a/digital/atk16_ppu_sprite_eval.dig
+++ b/digital-diagrams/atk16_ppu_sprite_eval.dig
diff --git a/digital/atk16_regbank.dig b/digital-diagrams/atk16_regbank.dig
index 5af841b..5af841b 100644
--- a/digital/atk16_regbank.dig
+++ b/digital-diagrams/atk16_regbank.dig
diff --git a/digital/atk16_tpu.dig b/digital-diagrams/atk16_tpu.dig
index f6b6398..f6b6398 100644
--- a/digital/atk16_tpu.dig
+++ b/digital-diagrams/atk16_tpu.dig
diff --git a/digital/atk16_ucode_addr.dig b/digital-diagrams/atk16_ucode_addr.dig
index 682c90e..682c90e 100644
--- a/digital/atk16_ucode_addr.dig
+++ b/digital-diagrams/atk16_ucode_addr.dig
diff --git a/digital/atk16_vga_sync.dig b/digital-diagrams/atk16_vga_sync.dig
index 7d42dea..7d42dea 100644
--- a/digital/atk16_vga_sync.dig
+++ b/digital-diagrams/atk16_vga_sync.dig
diff --git a/asm/aoc23_1a.atk16 b/resources/asm/aoc23_1a.atk16
index 78c4622..78c4622 100644
--- a/asm/aoc23_1a.atk16
+++ b/resources/asm/aoc23_1a.atk16
diff --git a/asm/aoc23_1a.py b/resources/asm/aoc23_1a.py
index 12e3953..12e3953 100644
--- a/asm/aoc23_1a.py
+++ b/resources/asm/aoc23_1a.py
diff --git a/asm/ast_compiler_bootstrap.atk16 b/resources/asm/ast_compiler_bootstrap.atk16
index 2e112eb..2e112eb 100644
--- a/asm/ast_compiler_bootstrap.atk16
+++ b/resources/asm/ast_compiler_bootstrap.atk16
diff --git a/asm/bootstrap.atk16 b/resources/asm/bootstrap.atk16
index 4e5cd24..4e5cd24 100644
--- a/asm/bootstrap.atk16
+++ b/resources/asm/bootstrap.atk16
diff --git a/asm/ext_std.py b/resources/asm/ext_std.py
index 247e605..247e605 100644
--- a/asm/ext_std.py
+++ b/resources/asm/ext_std.py
diff --git a/asm/ext_string_io.py b/resources/asm/ext_string_io.py
index 519077d..519077d 100644
--- a/asm/ext_string_io.py
+++ b/resources/asm/ext_string_io.py
diff --git a/asm/fibo.atk16 b/resources/asm/fibo.atk16
index 34999a9..34999a9 100644
--- a/asm/fibo.atk16
+++ b/resources/asm/fibo.atk16
diff --git a/asm/idle_loop.atk16 b/resources/asm/idle_loop.atk16
index dd7d879..dd7d879 100644
--- a/asm/idle_loop.atk16
+++ b/resources/asm/idle_loop.atk16
diff --git a/asm/sum.atk16 b/resources/asm/sum.atk16
index 1bc3277..1bc3277 100644
--- a/asm/sum.atk16
+++ b/resources/asm/sum.atk16
diff --git a/asm/test_py_src.atk16 b/resources/asm/test_py_src.atk16
index c38d1ca..c38d1ca 100644
--- a/asm/test_py_src.atk16
+++ b/resources/asm/test_py_src.atk16
diff --git a/asm/text_mode.atk16 b/resources/asm/text_mode.atk16
index f20eac9..f20eac9 100644
--- a/asm/text_mode.atk16
+++ b/resources/asm/text_mode.atk16
diff --git a/charset.txt b/resources/charset.txt
index bee1e3d..bee1e3d 100644
--- a/charset.txt
+++ b/resources/charset.txt
diff --git a/ibm_cga_8x8.ttf b/resources/ibm_cga_8x8.ttf
index 9f29ec5..9f29ec5 100644
--- a/ibm_cga_8x8.ttf
+++ b/resources/ibm_cga_8x8.ttf
diff --git a/asm/atk16.py b/resources/py/atk16.py
index 9aa3c55..9aa3c55 100644
--- a/asm/atk16.py
+++ b/resources/py/atk16.py
diff --git a/asm/test_py_src.py b/resources/py/test_py_src.py
index 619d22e..619d22e 100644
--- a/asm/test_py_src.py
+++ b/resources/py/test_py_src.py