Added correct relational mapping of jumps

Author: adalfarus

best_example.rasm

@@ -2,12 +2,14 @@ start:
 .lda #a
 .lda #idx
 .call add
+.jmp -1
 .stp
 
 
 add:
 .add #10, #12
 .sta d2 ; d1 is used by call and ret and d0 by some variations of add, div, ... . Also keep in mind that using call again will overwrite the return address.
+.jze -2
 .ret
 
 100 a

out_best_example.asm

@@ -1,19 +1,21 @@
 0 lda #97
 1 lda #1
 2 lda #2
-3 sta 16
+3 sta 18
 4 lda #6
-5 add 16
-6 sta 16
-7 jmp 9
-8 stp 
-9 lda #12
-10 sta 15
-11 lda #10
-12 add 15
-13 sta 17
-14 jmp (16)
-15 0
-16 0
+5 add 18
+6 sta 18
+7 jmp 10
+8 jmp 2
+9 stp 
+10 lda #12
+11 sta 17
+12 lda #10
+13 add 17
+14 sta 19
+15 jze 10
+16 jmp (18)
 17 0
+18 0
+19 0
 100 97

out_example.asm

@@ -8,7 +8,7 @@
 7 sta 1
 8 sta 1
 9 sta 1
-10 jmp 7
+10 jmp 6
 11 sta 11
 12 jze 0
 13 lda 1

out_example_big.asm

@@ -8,7 +8,7 @@
 7 sta 1
 8 sta 1
 9 sta 1
-10 jmp 7
+10 jmp 6
 11 sta 11
 12 sta 12
 13 jze 0
@@ -20,12 +20,12 @@
 19 sta 2
 20 lda 5
 21 lda 20
-22 sta 38
-23 jmp 22
-24 lda #1
-25 div 20
-26 lda #2
-27 sta 10
+22 sta 37
+23 jmp 21
+24 div #1,
+25 lda #2
+26 sta 10
+27 0
 28 0
 29 0
 30 0
@@ -36,5 +36,4 @@
 35 0
 36 0
 37 0
-38 0
 100 10

regcomp.py

@@ -293,6 +293,32 @@ def main(input: str, output: str) -> None:
     data_cell_lookup_table: dict[str, int] = {}  # We currently allocate them all in one chunk
     for label, rel_labels in labels_in_order:
         new_address = get_gap_of_size(len(rel_labels) + 1, reserved, max_address)
+
+        for i, rlabel in enumerate(rel_labels.copy()):  # Do not modify a list you're iterating over
+            if isinstance(rlabel, list):
+                continue
+            inst, data, *_ = rlabel.split(" ", maxsplit=1) + [""]
+            if inst in ("jmp", "jnz", "jze", "jle") and data.lstrip('+-').isnumeric():
+                reljump = int(data)
+                position = i
+                last_position = position + reljump
+                while position != last_position:
+                    if reljump > 0:
+                        position += 1
+                        if position >= len(rel_labels):
+                            raise IndexError("Traversal went out of bounds")
+                        if isinstance(rel_labels[position], list):
+                            reljump -= 1
+                            reljump += len(rel_labels[position])
+                    elif reljump < 0:
+                        position -= 1
+                        if position < 0:
+                            raise IndexError("Traversal went out of bounds")
+                        if isinstance(rel_labels[position], list):
+                            reljump += 1
+                            reljump -= len(rel_labels[position])
+                rel_labels[i] = f"{inst} {reljump}"
+
         rel_labels = unnest_iterable(rel_labels)  # Means flattening the list
 
         if new_address == -1:
@@ -336,7 +362,7 @@ def main(input: str, output: str) -> None:
         dat = replace_placeholders_with_whitespace_condition(dat, all_placeholders, lookup_table)
         if inst in ("jmp", "jnz", "jze", "jle"):
             if dat.startswith("-") or dat.startswith("+"):
-                cool_reserved[idx] = f"{i} {inst} {i + int(dat) + 1}\n"
+                cool_reserved[idx] = f"{i} {inst} {i + int(dat)}\n"
                 i += 1
                 continue
         cool_reserved[idx] = f"{i} {inst} {dat}\n"