From ac0efecc5558687b1215264896b436b33353c7ec Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Mon, 29 Apr 2024 22:38:21 +0300 Subject: Make @include idempotent --- atk16_asm/asm_pass0.py | 39 ++++++++++++++++------ .../sample_py/sample_py_src.py | 36 ++++++++++++++++++++ .../sample_py/test_py_src.py | 36 -------------------- test/e2e/include_idempotency/p1.atk16 | 4 +++ test/e2e/include_idempotency/p2.atk16 | 6 ++++ .../include_idempotency/test_include_idempotent.py | 14 ++++++++ 6 files changed, 88 insertions(+), 47 deletions(-) create mode 100644 atk16_ast_walking_compiler/sample_py/sample_py_src.py delete mode 100644 atk16_ast_walking_compiler/sample_py/test_py_src.py create mode 100644 test/e2e/include_idempotency/p1.atk16 create mode 100644 test/e2e/include_idempotency/p2.atk16 create mode 100644 test/e2e/include_idempotency/test_include_idempotent.py diff --git a/atk16_asm/asm_pass0.py b/atk16_asm/asm_pass0.py index bda16a4..35bfff2 100644 --- a/atk16_asm/asm_pass0.py +++ b/atk16_asm/asm_pass0.py @@ -16,10 +16,15 @@ class Result0: lines: list[Result0Line] InsertAtDataSegment = Callable[[str, list[str], str, int], None] +IncludeModule = Callable[[str], None] + +def pass_0(lines: list[str], file_name: str, + insert_at_data_segment: InsertAtDataSegment | None = None, + include_module: IncludeModule | None = None) -> Result0: -def pass_0(lines: list[str], file_name: str, insert_at_data_segment: InsertAtDataSegment | None = None) -> Result0: file_name = file_name if file_name.endswith(".atk16") else file_name + ".atk16" result_lines: list[Result0Line] = [] + included_module_abs_paths: list[str] = [] if not insert_at_data_segment: def _insert_at_data_segment(label: str, values: list[str], context_file_name: str, context_line_num: int): @@ -71,6 +76,26 @@ def pass_0(lines: list[str], file_name: str, insert_at_data_segment: InsertAtDat insert_at_data_segment = _insert_at_data_segment + if not include_module: + def _include_module(module_abs_path: str): + if module_abs_path in included_module_abs_paths: + return + + with open(module_abs_path, "r") as f: + incl_lines = f.readlines() + + incl_result0 = pass_0(incl_lines, asm_file_name, insert_at_data_segment) + for incl_line in incl_result0.lines: + result_lines.append(Result0Line( + src_file=incl_line.src_file, + line_num=incl_line.line_num, + line=incl_line.line + )) + + included_module_abs_paths.append(module_abs_path) + + include_module = _include_module + for (line_num, line) in enumerate(lines): line_num += 1 # line numbers are 1-based @@ -106,16 +131,8 @@ def pass_0(lines: list[str], file_name: str, insert_at_data_segment: InsertAtDat path = asm_file_name else: path = os.path.join(os.path.dirname(file_name), asm_file_name) - with open(path, "r") as f: - incl_lines = f.readlines() - - incl_result0 = pass_0(incl_lines, asm_file_name, insert_at_data_segment) - for incl_line in incl_result0.lines: - result_lines.append(Result0Line( - src_file=incl_line.src_file, - line_num=incl_line.line_num, - line=incl_line.line - )) + + include_module(path) case _: result_lines.append(Result0Line( diff --git a/atk16_ast_walking_compiler/sample_py/sample_py_src.py b/atk16_ast_walking_compiler/sample_py/sample_py_src.py new file mode 100644 index 0000000..619d22e --- /dev/null +++ b/atk16_ast_walking_compiler/sample_py/sample_py_src.py @@ -0,0 +1,36 @@ +# TODO: actual imports, not just `import atk16` +from atk16 import * + +GRAPHICS_NO_MODE: ConstWord16 = 0 +GRAPHICS_TEXT_MODE: ConstWord16 = 1 +GRAPHICS_SPRITE_MODE: ConstWord16 = 2 + +GRAPHICS_MODE_PP: ConstWord16 = 0x17 +TEXT_MEM_PP: ConstWord16 = 0x19 + +TEXT_MEM_PP: ConstWord16 = 0x19 + +# asm( +# "@label keyboard_isr" +# " spu RA" + +# " spo RA" +# ) + +# set_isr(0, "keyboard_isr") + +graphics_mode_p = load(GRAPHICS_MODE_PP) +text_mem_p = load(TEXT_MEM_PP) + +store(graphics_mode_p, GRAPHICS_TEXT_MODE) + +def nth_letter(n: int) -> int: + return ord('A') + n + +i = 0 +while i < 26: + store(text_mem_p + i, nth_letter(i)) + i += 1 + +while True: + pass diff --git a/atk16_ast_walking_compiler/sample_py/test_py_src.py b/atk16_ast_walking_compiler/sample_py/test_py_src.py deleted file mode 100644 index 619d22e..0000000 --- a/atk16_ast_walking_compiler/sample_py/test_py_src.py +++ /dev/null @@ -1,36 +0,0 @@ -# TODO: actual imports, not just `import atk16` -from atk16 import * - -GRAPHICS_NO_MODE: ConstWord16 = 0 -GRAPHICS_TEXT_MODE: ConstWord16 = 1 -GRAPHICS_SPRITE_MODE: ConstWord16 = 2 - -GRAPHICS_MODE_PP: ConstWord16 = 0x17 -TEXT_MEM_PP: ConstWord16 = 0x19 - -TEXT_MEM_PP: ConstWord16 = 0x19 - -# asm( -# "@label keyboard_isr" -# " spu RA" - -# " spo RA" -# ) - -# set_isr(0, "keyboard_isr") - -graphics_mode_p = load(GRAPHICS_MODE_PP) -text_mem_p = load(TEXT_MEM_PP) - -store(graphics_mode_p, GRAPHICS_TEXT_MODE) - -def nth_letter(n: int) -> int: - return ord('A') + n - -i = 0 -while i < 26: - store(text_mem_p + i, nth_letter(i)) - i += 1 - -while True: - pass diff --git a/test/e2e/include_idempotency/p1.atk16 b/test/e2e/include_idempotency/p1.atk16 new file mode 100644 index 0000000..f9f6363 --- /dev/null +++ b/test/e2e/include_idempotency/p1.atk16 @@ -0,0 +1,4 @@ +@include %bootstrap + +@label main + hlt diff --git a/test/e2e/include_idempotency/p2.atk16 b/test/e2e/include_idempotency/p2.atk16 new file mode 100644 index 0000000..c6d46b9 --- /dev/null +++ b/test/e2e/include_idempotency/p2.atk16 @@ -0,0 +1,6 @@ +@include %bootstrap +@include %bootstrap +@include %bootstrap + +@label main + hlt diff --git a/test/e2e/include_idempotency/test_include_idempotent.py b/test/e2e/include_idempotency/test_include_idempotent.py new file mode 100644 index 0000000..e7b4fc8 --- /dev/null +++ b/test/e2e/include_idempotency/test_include_idempotent.py @@ -0,0 +1,14 @@ +import os.path +from test.utils import assemble_and_run_until_halted + +def test_include_idempotent(): + machine1 = assemble_and_run_until_halted( + os.path.join(os.path.dirname(__file__), "p1.atk16") + ) + + machine2 = assemble_and_run_until_halted( + os.path.join(os.path.dirname(__file__), "p2.atk16") + ) + + for i in range(len(machine1.rom.memory)): + assert machine1.rom.memory[i] == machine2.rom.memory[i] -- cgit v1.3