Merge pull request #248 from davidgiven/c64

Add a CMD FD-2000 Vic20 port.

Author: davidgiven

.github/workflows/ccpp.yml

@@ -11,7 +11,7 @@ jobs:
         repository: 'davidgiven/cpm65'
 
     - name: apt
-      run: sudo apt update && sudo apt install cc1541 cpmtools libfmt-dev fp-compiler moreutils mame srecord 64tass libreadline-dev libelf-dev
+      run: sudo apt update && sudo apt install cpmtools libfmt-dev fp-compiler moreutils mame srecord 64tass libreadline-dev libelf-dev vice
 
     - name: install llvm-mos
       run: |
@@ -70,6 +70,7 @@ jobs:
           images/pet8096.d64
           images/snes.smc
           images/x16.zip
-          images/vic20_iec.d64
-          images/vic20_yload.d64
+          images/vic20_iec_1541.d64
+          images/vic20_iec_fd2000.d64
+          images/vic20_yload_1541.d64
 

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
         path: 'cpm65'
 
     - name: apt
-      run: sudo apt update && sudo apt install cc1541 cpmtools libfmt-dev fp-compiler moreutils srecord 64tass libreadline-dev libelf-dev
+      run: sudo apt update && sudo apt install cpmtools libfmt-dev fp-compiler moreutils srecord 64tass libreadline-dev libelf-dev vice
 
     - name: install llvm-mos
       run: |
@@ -81,8 +81,9 @@ jobs:
           pet8032.d64
           pet8096.d64
           snes.smc
-          vic20_iec.d64
-          vic20_yload.d64
+          vic20_iec_1541.d64
+          vic20_iec_fd2000.d64
+          vic20_yload_1541.d64
           x16.zip
         fail-if-no-assets: false
 
@@ -126,8 +127,9 @@ jobs:
           cpm65/images/pet8032.d64
           cpm65/images/pet8096.d64
           cpm65/images/snes.smc
-          cpm65/images/vic20_iec.d64
-          cpm65/images/vic20_yload.d64
+          cpm65/images/vic20_iec_1541.d64
+          cpm65/images/vic20_iec_fd2000.d64
+          cpm65/images/vic20_yload_1541.d64
           cpm65/images/x16.zip
         tag_name: dev
       env:

README.md

@@ -185,9 +185,13 @@ the same time.
   - See the Commodore 64 above. There are several versions available (built with
     different options):
 
-    - `vic20_yload.d64`: uses the fastloader. Only works on a 1541 (or compatible).
-    - `vic20_iec.d64`: uses old-fashioned IEC code. Should work anywhere which
-       supports `d64` images, although very, very slowly.
+    - `vic20_yload_1541.d64`: 1541 format, with the fastloader. Only works on a
+      1541 (or compatible).
+    - `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.
 
   - You need a fully expanded VIC-20 with all memory banks populated, for the
     full 35kB.

build.py

@@ -47,8 +47,9 @@
         "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_yload.d64": "src/arch/commodore+vic20_yload_diskimage",
-        "images/vic20_iec.d64": "src/arch/commodore+vic20_iec_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/x16.zip": "src/arch/x16+diskimage",
         "images/sorbus.zip": "src/arch/sorbus+diskimage",
         "images/nano6502.img": "src/arch/nano6502+diskimage",

diskdefs

@@ -28,6 +28,18 @@ diskdef c1541
 	os 2.2
 end
 
+# The CMD FD-2000 for the Commodore ecosystem.
+
+diskdef fd2000
+	seclen 128
+	tracks 157 # Skips the last two tracks which contain the partition table
+	sectrk 80
+	blocksize 4096
+	maxdir 128
+	boottrk 3
+	os 2.2
+end
+
 # This produces .po files, so there's implicit soft sector skewing intended to
 # be done in the backend. Note that the boot are read in physical sector order
 # and so need to be specially skewed so that one they're ProDOS skewed each

extras/README.md

@@ -0,0 +1,5 @@
+Making blank D2M images seems to be pretty hard --- VICE can do it through the
+GUI, but c1541 can't (even though c1541 is part of VICE? I think?).
+`empty.d2m.gz` is a compressed blank image containing an empty CBMFS filesystem
+which has been hand edited to also an empty CPMFS filesystem. It's not a true
+combifs like the D64 images.

extras/empty.d2m.gz

@@ -1,5 +1,5 @@
 from build.ab import simplerule, TargetsMap, filenameof, Rule, Target
-from tools.build import mkcpmfs, mametest
+from tools.build import mkcpmfs, mametest, mkcbmfs
 from build.llvm import llvmrawprogram, llvmclibrary
 from config import (
     MINIMAL_APPS,
@@ -21,39 +21,6 @@
 COMMODORE_ITEMS_WITH_SCREEN = COMMODORE_ITEMS | SCREEN_APPS | SCREEN_APPS_SRCS
 
 
-@Rule
-def mkcbmfs(self, name, items: TargetsMap = {}, title="CBMFS", id=None):
-    cs = ["rm -f $[outs[0]]"]
-    ins = []
-
-    cmd = "chronic cc1541 -q "
-    if id:
-        cmd += "-i %d " % id
-    cmd += '-n "%s" $[outs[0]]' % title
-    cs += [cmd]
-
-    for k, v in items.items():
-        t = "PRG"
-        if k.startswith("&"):
-            t = "USR"
-
-        cs += [
-            "chronic cc1541 -q -t -u 0 -r 18 -f '%s' -T '%s' -w '%s' $[outs[0]]"
-            % (k, t, filenameof(v))
-        ]
-        ins += [v]
-
-    cs += ["$[deps[0]] -f $[outs[0]]"]
-    simplerule(
-        replaces=self,
-        ins=ins,
-        outs=[f"={name}.img"],
-        deps=["tools+mkcombifs"],
-        commands=cs,
-        label="MKCBMFS",
-    )
-
-
 @Rule
 def mkusr(self, name, src: Target):
     simplerule(
@@ -174,7 +141,7 @@ def mkusr(self, name, src: Target):
 )
 
 llvmrawprogram(
-    name="vic20_yload_bios",
+    name="vic20_yload_1541_bios",
     srcs=[
         "./vic20/vic20.S",
         "./diskaccess/bios_1541.S",
@@ -189,11 +156,12 @@ def mkusr(self, name, src: Target):
         ".+commodore_lib",
     ],
     cflags=["-DVIC20"],
+    ldflags=["--gc-sections"],
     linkscript="./vic20/vic20.ld",
 )
 
 llvmrawprogram(
-    name="vic20_iec_bios",
+    name="vic20_iec_1541_bios",
     srcs=[
         "./vic20/vic20.S",
         "./diskaccess/bios_1541.S",
@@ -209,6 +177,28 @@ def mkusr(self, name, src: Target):
         ".+commodore_lib",
     ],
     cflags=["-DVIC20"],
+    ldflags=["--gc-sections"],
+    linkscript="./vic20/vic20.ld",
+)
+
+llvmrawprogram(
+    name="vic20_iec_fd2000_bios",
+    srcs=[
+        "./vic20/vic20.S",
+        "./diskaccess/bios_fd2000.S",
+        "./diskaccess/io_ieee488.S",
+        "./diskaccess/io_ieee488_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",
 )
 
@@ -223,21 +213,31 @@ def mkusr(self, name, src: Target):
 )
 
 mkcbmfs(
-    name="vic20_yload_cbmfs",
+    name="vic20_yload_1541_cbmfs",
     title="cp/m-65: vic20",
     items={
         "cpm": ".+vic20_yload_loader",
         "&yload1541": ".+usr_yload1541",
-        "bios": ".+vic20_yload_bios",
+        "bios": ".+vic20_yload_1541_bios",
     },
 )
 
 mkcbmfs(
-    name="vic20_iec_cbmfs",
+    name="vic20_iec_1541_cbmfs",
     title="cp/m-65: vic20",
     items={
         "cpm": ".+vic20_iec_loader",
-        "bios": ".+vic20_iec_bios",
+        "bios": ".+vic20_iec_1541_bios",
+    },
+)
+
+mkcbmfs(
+    name="vic20_iec_fd2000_cbmfs",
+    title="cp/m-65: vic20",
+    type="d2m",
+    items={
+        "cpm": ".+vic20_iec_loader",
+        "bios": ".+vic20_iec_fd2000_bios",
     },
 )
 
@@ -248,14 +248,28 @@ def mkusr(self, name, src: Target):
         items={"cpm": ".+%s_bios" % target},
     )
 
-for target in ["pet4032", "pet8032", "pet8096", "c64", "vic20_yload", "vic20_iec"]:
+for target in [
+    "pet4032",
+    "pet8032",
+    "pet8096",
+    "c64",
+    "vic20_yload_1541",
+    "vic20_iec_1541",
+]:
     mkcpmfs(
         name=target + "_diskimage",
         format="c1541",
         template=".+%s_cbmfs" % target,
         items=COMMODORE_ITEMS_WITH_SCREEN,
     )
 
+mkcpmfs(
+    name="vic20_iec_fd2000_diskimage",
+    format="fd2000",
+    template=".+vic20_iec_fd2000_cbmfs",
+    items=COMMODORE_ITEMS_WITH_SCREEN,
+)
+
 mametest(
     name="c64_mametest",
     target="c64",

src/arch/commodore/build.py

@@ -1,4 +1,13 @@
-This is extremely heavily based on MagerValp's uload3, which is BSD licensed;
-see https://www.lemon64.com/forum/viewtopic.php?t=80458. However, I have
-rewritten and modified basically every line of it so that calling it derived
-from uload3 is probably an insult to uload3. 
+rw_*: read/write layer, i.e. read_sector and write_sector.
+
+io_*: protocol layer, which does the work.
+
+In addition there's some common stuff, like io_ieee488.S which contains a
+platform-independent IEE488 layer on top of PET/C64/Vic20 etc.
+
+
+The *yload* files contain a fastloader which is extremely heavily based on
+MagerValp's uload3, which is BSD licensed; see
+https://www.lemon64.com/forum/viewtopic.php?t=80458. However, I have rewritten
+and modified basically every line of it so that calling it derived from uload3
+is probably an insult to uload3. 

src/arch/commodore/diskaccess/README.md

@@ -13,3 +13,32 @@
 .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
+    zloop
+        cpx #0
+        zif eq
+            cmp track_size_table, y
+            zif cc
+                iny     ; tracks are one-based.
+                rts
+            zendif
+        zendif
+
+        sec
+        sbc track_size_table, y
+        zif cc
+            dex
+        zendif
+        iny
+    zendloop
+
+track_size_table:
+    .fill 17, 1, 21
+    .fill 7, 1, 19
+    .fill 6, 1, 18
+    .fill 10, 1, 17
+zendproc