Modify 6502 asm as required by latest llvm-mos

Looks like now it uses the "0x" prefix instead of "$" to indicate hex numbers
Javier-varez · Jan 14, 2024 · b5ec1be · b5ec1be
1 parent f981d2d
commit b5ec1be
Show file tree

Hide file tree

Showing 64 changed files with 206 additions and 206 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -14,7 +14,7 @@ struct Memory {
 }
 
 impl Memory {
-    const WOZ_MONITOR: &[u8; 256] = include_bytes!("../woz_monitor/build/woz_monitor.bin");
+    const WOZ_MONITOR: &'static [u8; 256] = include_bytes!("../woz_monitor/build/woz_monitor.bin");
 
     const WOZ_MONITOR_OFFSET: TargetAddress = 0xFF00;
     const PIA_OFFSET: TargetAddress = 0xD010;

diff --git a/tests/data/add/main.s b/tests/data/add/main.s
@@ -1,6 +1,6 @@
-.org $800
+.org 0x800
 
 main:
-   lda #$1
-   adc #$7f
-   .byte $02
+   lda #0x1
+   adc #0x7f
+   .byte 0x02
diff --git a/tests/data/add_flags/main.s b/tests/data/add_flags/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    adc 0
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/and/main.s b/tests/data/and/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   and $0f
-   .byte $02
+   and 0x0f
+   .byte 0x02
diff --git a/tests/data/asl_accumulator/main.s b/tests/data/asl_accumulator/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    asl a
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/asl_memory/main.s b/tests/data/asl_memory/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   asl $ff
-   .byte $02
+   asl 0xff
+   .byte 0x02
diff --git a/tests/data/bit/main.s b/tests/data/bit/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   bit $10
-   .byte $02
+   bit 0x10
+   .byte 0x02
diff --git a/tests/data/bpl/main.s b/tests/data/bpl/main.s
@@ -1,10 +1,10 @@
-.org $800
+.org 0x800
 
 main:
-    lda #$10
-    ldx #$4
+    lda #0x10
+    ldx #0x4
 loop:
-    adc $20,x
+    adc 0x20,x
     dex
     bpl loop
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/clc/main.s b/tests/data/clc/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    clc
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/clv/main.s b/tests/data/clv/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    clv
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/cmp/main.s b/tests/data/cmp/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   cmp $00
-   .byte $02
+   cmp 0x00
+   .byte 0x02
diff --git a/tests/data/cpx/main.s b/tests/data/cpx/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   cpx $00
-   .byte $02
+   cpx 0x00
+   .byte 0x02
diff --git a/tests/data/cpy/main.s b/tests/data/cpy/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   cpy $00
-   .byte $02
+   cpy 0x00
+   .byte 0x02
diff --git a/tests/data/dec/main.s b/tests/data/dec/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   dec $f2
-   .byte $02
+   dec 0xf2
+   .byte 0x02
diff --git a/tests/data/dex/main.s b/tests/data/dex/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    dex
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/dey/main.s b/tests/data/dey/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    dey
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/eor/main.s b/tests/data/eor/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   eor $f
-   .byte $02
+   eor 0xf
+   .byte 0x02
diff --git a/tests/data/inc/main.s b/tests/data/inc/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   inc $f2
-   .byte $02
+   inc 0xf2
+   .byte 0x02
diff --git a/tests/data/inx/main.s b/tests/data/inx/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    inx
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/iny/main.s b/tests/data/iny/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    iny
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/jmp/main.s b/tests/data/jmp/main.s
@@ -1,4 +1,4 @@
-.org $800
+.org 0x800
 
 main:
    jmp add
@@ -7,6 +7,6 @@ main:
    nop
 
 add:
-   lda #$1
-   adc #$7f
-   .byte $02
+   lda #0x1
+   adc #0x7f
+   .byte 0x02
diff --git a/tests/data/jsr/main.s b/tests/data/jsr/main.s
@@ -1,9 +1,9 @@
-.org $800
+.org 0x800
 
 main:
    jsr test
    brk
 
 test:
    // End test
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/lda_absolute/main.s b/tests/data/lda_absolute/main.s
@@ -1,6 +1,6 @@
-.org $800
+.org 0x800
 
 main:
     // Load memory addr 0
-    lda $1234
-    .byte $02
+    lda 0x1234
+    .byte 0x02
diff --git a/tests/data/lda_absolute_x_indexed/main.s b/tests/data/lda_absolute_x_indexed/main.s
@@ -1,6 +1,6 @@
-.org $800
+.org 0x800
 
 main:
     // Load memory addr 0x1234 + x
-    lda $1234,x
-    .byte $02
+    lda 0x1234,x
+    .byte 0x02
diff --git a/tests/data/lda_absolute_y_indexed/main.s b/tests/data/lda_absolute_y_indexed/main.s
@@ -1,6 +1,6 @@
-.org $800
+.org 0x800
 
 main:
     // Load memory addr 0x1234 + y
-    lda $1234,y
-    .byte $02
+    lda 0x1234,y
+    .byte 0x02
diff --git a/tests/data/lda_indirect_x_indexed/main.s b/tests/data/lda_indirect_x_indexed/main.s
@@ -1,6 +1,6 @@
-.org $800
+.org 0x800
 
 main:
     // A = ((5 + x))
-    lda ($5,x)
-    .byte $02
+    lda (0x5,x)
+    .byte 0x02
diff --git a/tests/data/lda_indirect_y_indexed/main.s b/tests/data/lda_indirect_y_indexed/main.s
@@ -1,6 +1,6 @@
-.org $800
+.org 0x800
 
 main:
     // A = ((5) + y)
-    lda ($5),y
-    .byte $02
+    lda (0x5),y
+    .byte 0x02
diff --git a/tests/data/lda_zeropage/main.s b/tests/data/lda_zeropage/main.s
@@ -1,6 +1,6 @@
-.org $800
+.org 0x800
 
 main:
     // Load memory addr 0
-    lda $0
-    .byte $02
+    lda 0x0
+    .byte 0x02
diff --git a/tests/data/lda_zeropage_x_indexed/main.s b/tests/data/lda_zeropage_x_indexed/main.s
@@ -1,6 +1,6 @@
-.org $800
+.org 0x800
 
 main:
     // Load memory addr x + 5
-    lda $5,x
-    .byte $02
+    lda 0x5,x
+    .byte 0x02
diff --git a/tests/data/lsr_accumulator/main.s b/tests/data/lsr_accumulator/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    lsr a
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/lsr_memory/main.s b/tests/data/lsr_memory/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   lsr $ff
-   .byte $02
+   lsr 0xff
+   .byte 0x02
diff --git a/tests/data/nop/main.s b/tests/data/nop/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    nop
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/ora/main.s b/tests/data/ora/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   ora $f
-   .byte $02
+   ora 0xf
+   .byte 0x02
diff --git a/tests/data/pha/main.s b/tests/data/pha/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    pha
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/php/main.s b/tests/data/php/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    php
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/pla/main.s b/tests/data/pla/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    pla
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/plp/main.s b/tests/data/plp/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    plp
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/rol_accumulator/main.s b/tests/data/rol_accumulator/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    rol a
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/rol_memory/main.s b/tests/data/rol_memory/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   rol $ff
-   .byte $02
+   rol 0xff
+   .byte 0x02
diff --git a/tests/data/ror_accumulator/main.s b/tests/data/ror_accumulator/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
    ror a
-   .byte $02
+   .byte 0x02
diff --git a/tests/data/ror_memory/main.s b/tests/data/ror_memory/main.s
@@ -1,5 +1,5 @@
-.org $800
+.org 0x800
 
 main:
-   ror $ff
-   .byte $02
+   ror 0xff
+   .byte 0x02
diff --git a/tests/data/rts/main.s b/tests/data/rts/main.s
@@ -1,4 +1,4 @@
-.org $800
+.org 0x800
 
 main:
    rts
@@ -7,6 +7,6 @@ main:
    brk
 
    // Addr 0x804
-   .byte $02
+   .byte 0x02
    brk
    brk