diff --git a/README.md b/README.md index 3994f11..246da9d 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Windows/MinGW: ``` usage: c2d [-vh?] - c2d [-m] [-s start address override] input[.mon],[load_address] output.dsk + c2d [-m] [-t filename] [-s start address override] input[.mon],[load_address] output.dsk -h|? this help -m jump to monitor after booting @@ -112,7 +112,7 @@ Yes. No input checking. Big Endian untested. ### The Ugly Stuff -c2d, Code to Disk, Version 0.4, Sun Apr 9 03:16:22 UTC 2017 +c2d, Code to Disk, Version 0.42, Sun Apr 9 03:16:22 UTC 2017 (c) 2012,2017 All Rights Reserved, Egan Ford (egan@sense.net) diff --git a/asm/loader.s b/asm/loader.s index 9769a19..bcb507d 100644 --- a/asm/loader.s +++ b/asm/loader.s @@ -12,11 +12,12 @@ hipage = $B500 rwtsprm = $B7E8 ; looked at dos 3.3 disk, not using $3E3 to find rwts = $B7B5 preg = $48 ; mon p reg -;trkcnt = $00 ; track counter -;segcnt = $01 ; loop var -;buffer = $02 ; MSB of RWTS buffer -;secnum = $03 ; loop var -;trknum = $04 ; loop var +;;;run time +trkcnt = $00 ; track counter +segcnt = $01 ; loop var +buffer = $02 ; MSB of RWTS buffer +secnum = $03 ; loop var +trknum = $04 ; loop var start: @@ -63,7 +64,7 @@ trkloop: lda trkcnt bne fulltrack lda lastsector - jmp subtrack + bpl subtrack fulltrack: lda #$F subtrack: @@ -114,13 +115,14 @@ loadpage: .org *+1 nextjump: .org *+2 -trkcnt: - .org *+1 -segcnt: - .org *+1 -buffer: - .org *+1 -secnum: - .org *+1 -trknum: - .org *+1 +;;; used for debug +;trkcnt: +; .org *+1 +;segcnt: +; .org *+1 +;buffer: +; .org *+1 +;secnum: +; .org *+1 +;trknum: +; .org *+1 diff --git a/bin/c2d b/bin/c2d index 70da0d9..5b2d478 100755 Binary files a/bin/c2d and b/bin/c2d differ diff --git a/bin/c2d.exe b/bin/c2d.exe index 619fc5a..9c1a4c5 100755 Binary files a/bin/c2d.exe and b/bin/c2d.exe differ diff --git a/c2d.c b/c2d.c index e0b438c..3bfa41b 100644 --- a/c2d.c +++ b/c2d.c @@ -1,6 +1,6 @@ /* -c2d, Code to Disk, Version 0.4, Sun Apr 9 03:16:22 UTC 2017 +c2d, Code to Disk, Version 0.42, Sun Apr 9 03:16:22 UTC 2017 (c) 2012,2017 All Rights Reserved, Egan Ford (egan@sense.net) @@ -53,7 +53,7 @@ Based on work by: #include #include "c2d.h" -#define VERSION "Version 0.4" +#define VERSION "Version 0.42" #define INFILE argv[argc-2] #define OUTFILE argv[argc-1] #define BINARY 0 diff --git a/c2d.h.0 b/c2d.h.0 index 6e4f1d8..4c9ddc6 100644 --- a/c2d.h.0 +++ b/c2d.h.0 @@ -13,7 +13,7 @@ typedef struct d { const char *usagetext="\n\ usage: c2d [-vh?]\n\ - c2d [-m] [-s start address override] input[.mon],[load_address] output.dsk\n\ + c2d [-m] [-t filename] [-s start address override] input[.mon],[load_address] output.dsk\n\ \n\ -h|? this help\n\ -m jump to monitor after booting\n\ diff --git a/test.sh b/test.sh index fb1f1c7..5fb4d50 100755 --- a/test.sh +++ b/test.sh @@ -37,7 +37,7 @@ else exit 1 fi -SUM=f27ea2a4fcc7c85ac25c3eacba24e958 +SUM=1e6d9243c1dd78e6cb289aafaf5437a1 rm -f ${BIN}.dsk echo