Merge branch 'davidgiven:master' into more

Author: venomix666

.github/workflows/ccpp.yml

@@ -71,6 +71,8 @@ jobs:
           images/snes.smc
           images/x16.zip
           images/vic20_iec_1541.d64
+          images/vic20_jiffy_1541.d64
           images/vic20_iec_fd2000.d64
+          images/vic20_jiffy_fd2000.d64
           images/vic20_yload_1541.d64
 

.github/workflows/release.yml

@@ -82,7 +82,8 @@ jobs:
           pet8096.d64
           snes.smc
           vic20_iec_1541.d64
-          vic20_iec_fd2000.d64
+          vic20_jiffy_1541.d64
+          vic20_jiffy_fd2000.d2m
           vic20_yload_1541.d64
           x16.zip
         fail-if-no-assets: false
@@ -128,7 +129,8 @@ jobs:
           cpm65/images/pet8096.d64
           cpm65/images/snes.smc
           cpm65/images/vic20_iec_1541.d64
-          cpm65/images/vic20_iec_fd2000.d64
+          cpm65/images/vic20_jiffy_fd2000.d2m
+          cpm65/images/vic20_jiffy_1541.d64
           cpm65/images/vic20_yload_1541.d64
           cpm65/images/x16.zip
         tag_name: dev

README.md

@@ -187,11 +187,14 @@ the same time.
 
     - `vic20_yload_1541.d64`: 1541 format, with the fastloader. Only works on a
       1541 (or compatible).
+    - `vic20_jiffy_1541.d64`: 1541 format with JiffyDOS. Only works on a 1541
+      (or compatible) with the JiffyDOS ROM installed. This _should_ also work on
+      an SD2IEC, although this is untested. You do *not* need the JiffyDOS kernal
+      ROM in the VIC-20 itself.
     - `vic20_iec_1541.d64`: 1541 format, uses old-fashioned IEC code. Should
       work anywhere which supports `d64` images, although very, very slowly.
-    - `vic20_iec_fd2000.d2m`: CMD FD-2000 format, uses old-fashioned IEC code.
-      Faster that the `d64` IEC version, but still pretty slow. But you do
-      get lots of disk space.
+    - `vic20_jiffy_fd2000.d2m`: CMD FD-2000 format, with JiffyDOS. The FD-2000
+      has JiffyDOS support built in. You get over a megabyte of free space.
 
   - You need a fully expanded VIC-20 with all memory banks populated, for the
     full 35kB.

build.py

@@ -47,9 +47,10 @@
         "images/pet8032.d64": "src/arch/commodore+pet8032_diskimage",
         "images/pet8096.d64": "src/arch/commodore+pet8096_diskimage",
         "images/snes.smc": "src/arch/snes+snes_cartridge",
+        "images/vic20_jiffy_1541.d64": "src/arch/commodore+vic20_jiffy_1541_diskimage",
         "images/vic20_yload_1541.d64": "src/arch/commodore+vic20_yload_1541_diskimage",
         "images/vic20_iec_1541.d64": "src/arch/commodore+vic20_iec_1541_diskimage",
-        "images/vic20_iec_fd2000.d2m": "src/arch/commodore+vic20_iec_fd2000_diskimage",
+        "images/vic20_jiffy_fd2000.d2m": "src/arch/commodore+vic20_jiffy_fd2000_diskimage",
         "images/x16.zip": "src/arch/x16+diskimage",
         "images/sorbus.zip": "src/arch/sorbus+diskimage",
         "images/nano6502.img": "src/arch/nano6502+diskimage",

diskdefs

@@ -32,7 +32,7 @@ end
 
 diskdef fd2000
 	seclen 128
-	tracks 157 # Skips the last two tracks which contain the partition table
+	tracks 155 # Skips the first three and last two tracks
 	sectrk 80
 	blocksize 4096
 	maxdir 128

include/wait.inc

@@ -30,32 +30,38 @@
 .endm
 
 .macro WAIT8
-    cmp (0, x) ; 6
-    nop        ; 2
+    WAIT6
+    WAIT2
 .endm
 
 .macro WAIT9
-    pha        ; 3
-    pla        ; 4
-    nop        ; 2
+    WAIT6
+    WAIT3
 .endm
 
 .macro WAIT10
-    pha        ; 3
-    pla        ; 4
-    cmp 0      ; 3
+    WAIT7
+    WAIT3
 .endm
     
 .macro WAIT11
-    pha        ; 3
-    pla        ; 4
-    nop        ; 2
-    nop        ; 2
+    WAIT7
+    WAIT4
 .endm
     
 .macro WAIT12
-    cmp (0, x) ; 6
-    cmp (0, x) ; 6
+    WAIT6
+    WAIT6
+.endm
+
+.macro WAIT13
+    WAIT6
+    WAIT7
+.endm
+
+.macro WAIT14
+    WAIT7
+    WAIT7
 .endm
 
 ; vim: filetype=asm sw=4 ts=4 et

include/zif.inc

@@ -10,6 +10,20 @@
 .set zloopsp, 0
 .set zifsp, 0
 
+; Skip the next instruction byte by turning them into the argument of a BIT
+; zp instruction. Trashes flags.
+
+.macro SKIP1
+    .byte 0x24
+.endm
+
+; Skip the next two instruction bytes by turning them into the argument of a BIT
+; abs instruction. Trashes flags.
+
+.macro SKIP2
+    .byte 0x2c
+.endm
+
 .macro blt label
     bcc \label
 .endm

src/arch/commodore/build.py

@@ -119,7 +119,7 @@ def mkusr(self, name, src: Target):
 llvmrawprogram(
     name="vic20_yload_loader",
     srcs=[
-        "./vic20/vic20loader.S",
+        "./vic20/vic20loader_yload.S",
         "./diskaccess/io_yload_vic20.S",
         "./diskaccess/io_yload_common.S",
         "./vic20/vic20.inc",
@@ -129,10 +129,24 @@ def mkusr(self, name, src: Target):
     linkscript="./vic20/vic20loader.ld",
 )
 
+llvmrawprogram(
+    name="vic20_jiffy_loader",
+    srcs=[
+        "./vic20/vic20loader_ieee488.S",
+        "./diskaccess/io_jiffy_vic20.S",
+        "./vic20/vic20.inc",
+    ],
+    deps=["src/lib+bioslib", "include", ".+commodore_lib"],
+    cflags=["-DVIC20"],
+    linkscript="./vic20/vic20loader.ld",
+)
+
 llvmrawprogram(
     name="vic20_iec_loader",
     srcs=[
-        "./vic20/vic20loader_iec.S",
+        "./vic20/vic20loader_ieee488.S",
+        "./diskaccess/io_ieee488_vic20.S",
+        "./diskaccess/io_ieee488.S",
         "./vic20/vic20.inc",
     ],
     deps=["src/lib+bioslib", "include", ".+commodore_lib"],
@@ -182,12 +196,31 @@ def mkusr(self, name, src: Target):
 )
 
 llvmrawprogram(
-    name="vic20_iec_fd2000_bios",
+    name="vic20_jiffy_1541_bios",
+    srcs=[
+        "./vic20/vic20.S",
+        "./diskaccess/bios_1541.S",
+        "./diskaccess/io_jiffy_vic20.S",
+        "./diskaccess/rw_ieee488.S",
+        "./vic20/vic20.inc",
+    ],
+    deps=[
+        "include",
+        "src/lib+bioslib",
+        "third_party/tomsfonts+4x8",
+        ".+commodore_lib",
+    ],
+    cflags=["-DVIC20"],
+    ldflags=["--gc-sections"],
+    linkscript="./vic20/vic20.ld",
+)
+
+llvmrawprogram(
+    name="vic20_jiffy_fd2000_bios",
     srcs=[
         "./vic20/vic20.S",
         "./diskaccess/bios_fd2000.S",
-        "./diskaccess/io_ieee488.S",
-        "./diskaccess/io_ieee488_vic20.S",
+        "./diskaccess/io_jiffy_vic20.S",
         "./diskaccess/rw_ieee488.S",
         "./vic20/vic20.inc",
     ],
@@ -207,8 +240,8 @@ def mkusr(self, name, src: Target):
     title="cp/m-65: c64",
     items={
         "cpm": ".+c64_loader",
-        "&yload1541": ".+usr_yload1541",
-        "bios": ".+c64_bios",
+        "yload1541,u": ".+usr_yload1541",
+        "bios,s": ".+c64_bios",
     },
 )
 
@@ -217,8 +250,8 @@ def mkusr(self, name, src: Target):
     title="cp/m-65: vic20",
     items={
         "cpm": ".+vic20_yload_loader",
-        "&yload1541": ".+usr_yload1541",
-        "bios": ".+vic20_yload_1541_bios",
+        "yload1541,u": ".+usr_yload1541",
+        "bios,s": ".+vic20_yload_1541_bios",
     },
 )
 
@@ -227,17 +260,26 @@ def mkusr(self, name, src: Target):
     title="cp/m-65: vic20",
     items={
         "cpm": ".+vic20_iec_loader",
-        "bios": ".+vic20_iec_1541_bios",
+        "bios,s": ".+vic20_iec_1541_bios",
     },
 )
 
 mkcbmfs(
-    name="vic20_iec_fd2000_cbmfs",
+    name="vic20_jiffy_1541_cbmfs",
+    title="cp/m-65: vic20",
+    items={
+        "cpm": ".+vic20_jiffy_loader",
+        "bios,s": ".+vic20_jiffy_1541_bios",
+    },
+)
+
+mkcbmfs(
+    name="vic20_jiffy_fd2000_cbmfs",
     title="cp/m-65: vic20",
     type="d2m",
     items={
-        "cpm": ".+vic20_iec_loader",
-        "bios": ".+vic20_iec_fd2000_bios",
+        "cpm": ".+vic20_jiffy_loader",
+        "bios,s": ".+vic20_jiffy_fd2000_bios",
     },
 )
 
@@ -255,6 +297,7 @@ def mkusr(self, name, src: Target):
     "c64",
     "vic20_yload_1541",
     "vic20_iec_1541",
+    "vic20_jiffy_1541",
 ]:
     mkcpmfs(
         name=target + "_diskimage",
@@ -263,12 +306,13 @@ def mkusr(self, name, src: Target):
         items=COMMODORE_ITEMS_WITH_SCREEN,
     )
 
-mkcpmfs(
-    name="vic20_iec_fd2000_diskimage",
-    format="fd2000",
-    template=".+vic20_iec_fd2000_cbmfs",
-    items=COMMODORE_ITEMS_WITH_SCREEN,
-)
+for target in ["vic20_jiffy_fd2000"]:
+    mkcpmfs(
+        name=f"{target}_diskimage",
+        format="fd2000",
+        template=f".+{target}_cbmfs",
+        items=COMMODORE_ITEMS_WITH_SCREEN,
+    )
 
 mametest(
     name="c64_mametest",

src/arch/commodore/diskaccess/bios_1541.S

@@ -10,35 +10,56 @@
 .global dph
 .global dpb_1541
 
+NUM_ZONES = 4
+
+.zeropage ptr
+
 .data
 define_dpb dpb_1541, 136*10, 1024, 64, 0
 define_dph dph, dpb_1541
 
 ; Converts an LBA sector number in XA to track/sector in Y, A.
 
 zproc convert_to_ts, .text.tsconvert, weak
-    ldy #0
+    ldy #0              ; zone number
+    sta ptr+1           ; low byte of sector number
+    sty ptr+0           ; track number
     zloop
         cpx #0
         zif eq
-            cmp track_size_table, y
-            zif cc
-                iny     ; tracks are one-based.
+            lda ptr+1
+            cmp zone_size_table, y
+            zif lt      ; does this sector fit in this track?
+                ldy ptr+0 ; yes
+                iny     ; ...but tracks are one-based.
                 rts
             zendif
         zendif
 
+        ; Move to the next track, advancing the zone if necessary.
+
+        inc ptr+0
+        lda ptr+0
+        cmp zone_boundary_table, y
+        zif ge          ; need to move to the next zone?
+            iny
+            cpy #NUM_ZONES
+            zif eq
+                dey
+            zendif
+        zendif
+
         sec
-        sbc track_size_table, y
+        lda ptr+1
+        sbc zone_size_table, y
         zif cc
             dex
         zendif
-        iny
+        sta ptr+1
     zendloop
 
-track_size_table:
-    .fill 17, 1, 21
-    .fill 7, 1, 19
-    .fill 6, 1, 18
-    .fill 10, 1, 17
-zendproc
+zone_boundary_table:
+    .byte 18, 25, 31, 36 ; highest track number +1
+zone_size_table:
+    .byte 21, 19, 18, 17 ; number of sectors in each zone
+zendproc

src/arch/commodore/diskaccess/bios_fd2000.S

@@ -10,7 +10,7 @@
 .global dph
 
 .data
-define_dpb dpb_fd2000, 157*80, 4096, 128, 3*80
+define_dpb dpb_fd2000, 155*80, 4096, 128, 3*80
 define_dph dph, dpb_fd2000
 
 ; Converts an LBA sector number in XA to track/sector in Y, A.