From 12d66b37d3cd9e93c7bcfd31a570ed0b7f67b718 Mon Sep 17 00:00:00 2001 From: starcells Date: Sun, 31 May 2026 16:07:45 +0800 Subject: [PATCH] Fixed copy_to_buffer. --- asm/asm.r8asm | 4 ++-- asm/lib.r8asm | 41 ++++++++++++++++++++++++++++++----------- src/r8asm_asm.cc | 6 ++---- src/r8asm_core.cc | 2 +- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/asm/asm.r8asm b/asm/asm.r8asm index 00cd466..d769aac 100644 --- a/asm/asm.r8asm +++ b/asm/asm.r8asm @@ -1,5 +1,5 @@ .xor 13 -copy_to_buffer 1 +copy_to_buffer 3 out stp -out +out \ No newline at end of file diff --git a/asm/lib.r8asm b/asm/lib.r8asm index 5bbe367..a416c11 100644 --- a/asm/lib.r8asm +++ b/asm/lib.r8asm @@ -1,31 +1,33 @@ ;lib.r8asm + + %macro step 1 stp %1 stp %1 %endmacro - - %macro back 1 btp %1 btp %1 %endmacro - - %macro set_0 0 biz flb rnz %endmacro - - %macro set_1 0 set_0 flb %endmacro +%macro erase 0 +%repeat _UNIT_SIZE +set_0 +ror +%endrepeat +%endmacro ; Macro copy_to_buffer. @@ -35,8 +37,12 @@ flb ;TODO %macro copy_to_buffer 1 - .anchor before_copy_to_buffer +stp +erase +.tp %1 +erase +.tp before_copy_to_buffer %repeat _UNIT_SIZE biz stp @@ -46,6 +52,13 @@ biz .tp before_copy_to_buffer flb rnz +.tp before_copy_to_buffer +ror +stp +ror +.tp %1 +ror +.tp before_copy_to_buffer %endrepeat .tp %1 @@ -56,6 +69,11 @@ biz .tp %1 flb rnz +.tp before_copy_to_buffer +ror +.tp %1 +ror +.tp %1 %endrepeat .tp before_copy_to_buffer @@ -63,13 +81,14 @@ rnz -; Macro and + +; Macro unsafe_and ; %1: arg1 ; %2: arg2 ; %3: ans ;TODO -%macro and 3 -.anchor before_and +%macro unsafe_and 3 +.anchor before_unsafe_and %repeat _UNIT_SIZE .tp %1 @@ -92,7 +111,7 @@ rnz .tp %3 ror %endrepeat -.tp before_and +.tp before_unsafe_and %endmacro diff --git a/src/r8asm_asm.cc b/src/r8asm_asm.cc index 63f7174..d2d19ac 100644 --- a/src/r8asm_asm.cc +++ b/src/r8asm_asm.cc @@ -63,6 +63,7 @@ void expand_anchor(std::vector &tape, R8Operand arg) { datas.insert({std::to_string(*name), dataptr}); } +/* void expand_erase(std::vector &tape, R8Operand arg) { std::vector tmp = {rot8_bytecode::BIZ, rot8_bytecode::FLB, rot8_bytecode::RNZ, @@ -70,7 +71,7 @@ void expand_erase(std::vector &tape, R8Operand arg) { for (unit_size_type i = 0; i < UNIT_SIZE; i++) tape.insert(tape.end(), tmp.begin(), tmp.end()); return; -} +}*/ void expand_bytecode(std::vector &tape, R8Operand arg, rot8_bytecode op, bool count_offset = true) { @@ -108,9 +109,6 @@ std::vector r8asm_tape_out(std::span ops) { break; case r8asm_builtin::ANCHOR: expand_anchor(tape, it.formal_para); - case r8asm_builtin::ERASE: - break; - expand_erase(tape, it.formal_para); break; default:; } diff --git a/src/r8asm_core.cc b/src/r8asm_core.cc index c974e82..840d7a8 100644 --- a/src/r8asm_core.cc +++ b/src/r8asm_core.cc @@ -14,5 +14,5 @@ std::map r8asm_insmap = { {"out", rot8_bytecode::OUT}, {"inp", rot8_bytecode::INP}, {".loop", r8asm_builtin::LOOP}, {".endloop", r8asm_builtin::ENDLOOP}, {".anchor", r8asm_builtin::ANCHOR}, {".tp", r8asm_builtin::TP}, - {".xor", r8asm_builtin::XOR}, {".erase", r8asm_builtin::ERASE}, + {".xor", r8asm_builtin::XOR}, };