diff --git a/asm/raw_and.r8asm b/asm/raw_and.r8asm index 31806db..a216499 100644 --- a/asm/raw_and.r8asm +++ b/asm/raw_and.r8asm @@ -52,8 +52,8 @@ rnz ; %2: CellBit arg2 ; %3: CellBit ans ; %4: CellBit tmp -%macro bit_and 4 -.anchor before_bit_and +%macro bit_raw_and 4 +.anchor before_bit_raw_and .tp %3 biz flb @@ -103,7 +103,7 @@ biz .tp %4 flb rnz -.tp before_bit_and +.tp before_bit_raw_and %endmacro @@ -114,10 +114,10 @@ rnz ; %3: Cell ans ; %4: CellBit tmp %macro raw_and 4 -.anchor before_and +.anchor before_raw_and %rep _CELL_SIZE - bit_and %1 %2 %3 %4 + bit_raw_and %1 %2 %3 %4 .tp %1 ror .tp %2 @@ -125,5 +125,5 @@ rnz .tp %3 ror %endrep -.tp before_and +.tp before_raw_and %endmacro \ No newline at end of file diff --git a/asm/raw_inc.r8asm b/asm/raw_inc.r8asm index c3c1164..8cf4103 100644 --- a/asm/raw_inc.r8asm +++ b/asm/raw_inc.r8asm @@ -9,49 +9,63 @@ %macro bit_raw_inc 5 .anchor before_bit_raw_inc - -.tp %2 +.tp %3 biz - .tp %1 - flb - .tp %4 - flb - .tp %2 - flb -rnz - -.tp %1 -biz - .tp %3 - set_1 - .tp %5 - set_1 - .tp %1 - flb + flb rnz .tp %4 biz - .tp %1 - set_1 - .tp %2 - set_1 - .tp %3 - set_1 - .tp %4 - flb + flb rnz .tp %5 biz - .tp %1 - flb - .tp %3 - flb - .tp %4 - flb - .tp %5 - flb + flb +rnz + +.tp %2 +biz + .tp %1 + flb + .tp %3 + flb + .tp %2 + flb +rnz + +.tp %1 +biz + .tp %4 + set_1 + .tp %5 + set_1 + .tp %1 + flb +rnz + +.tp %3 +biz + .tp %1 + set_1 + .tp %2 + set_1 + .tp %4 + set_1 + .tp %3 + flb +rnz + +.tp %5 +biz + .tp %1 + flb + .tp %3 + flb + .tp %4 + flb + .tp %5 + flb rnz .tp before_bit_raw_inc diff --git a/asm/raw_xor.r8asm b/asm/raw_xor.r8asm index 09d97ae..f729e0e 100644 --- a/asm/raw_xor.r8asm +++ b/asm/raw_xor.r8asm @@ -49,7 +49,7 @@ rnz -; Macro bit_xor +; Macro bit_raw_xor ; %1: CellBit arg1 ; %2: CellBit arg2 ; %3: CellBit ans diff --git a/asm/test.r8asm b/asm/test.r8asm index 6f3d1bb..4ae6181 100644 --- a/asm/test.r8asm +++ b/asm/test.r8asm @@ -13,7 +13,7 @@ .var tmp 1 .tp A -.xor 126 +.xor 127 .tp B .xor 11 .tp Ci