Fix off by 1 in o65 option decoding

2023-10-29 21:38:04 -07:00
parent c6bf29649a
commit 876ae08cf3
2 changed files with 6 additions and 3 deletions
--- a/sw/bios/boot2.s
+++ b/sw/bios/boot2.s
@@ -263,7 +263,6 @@ _start:
        clc
        adc olen
        dec
-        dec
        pha
        bra @opt_len

--- a/sw/script/o65dump.py
+++ b/sw/script/o65dump.py
@@ -88,10 +88,14 @@ def main() -> None:
    print(filename)
    o65 = O65(filename)
    for item, value in o65.header.items():
-        print(f"{item}:\t{value:x}")
+        print(f"{item}:\t{value:#x}")
    
+    total_olen = 0
    for option in o65.options:
-        print(f"Type: {option[1]}, Data: {option[2]}")
+        print(f"Length: {option[0]:#x} Type: {option[1]:#x}, Data: {option[2]}")
+        total_olen += option[0]
+
+    print(f"Total option length: {total_olen:#x}")

    print(f"Text size: {len(o65.text)}")
    print(f"Data size: {len(o65.data)}")