aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cpcout.c130
-rw-r--r--src/example/cpc.asm8
-rw-r--r--src/example/dump.c87
3 files changed, 148 insertions, 77 deletions
diff --git a/src/cpcout.c b/src/cpcout.c
index 27d5d82..e3e871d 100644
--- a/src/cpcout.c
+++ b/src/cpcout.c
@@ -19,7 +19,7 @@
-------------------------------------------------------------------------
- Commodore CPC tape output handler.
+ Amstrad CPC tape output handler.
*/
#include <stdlib.h>
@@ -57,50 +57,41 @@ static Options options = {-1};
/* ---------------------------------------- PRIVATE FUNCTIONS
*/
-static void WriteByte(FILE *fp, Byte b)
+static Byte WriteByte(FILE *fp, Byte b, Byte chk)
{
+ chk ^= b;
putc(b, fp);
+ return chk;
}
-static void WriteWord(FILE *fp, int w)
+static Byte WriteWord(FILE *fp, int w, Byte chk)
{
- WriteByte(fp, w & 0xff);
- WriteByte(fp, (w & 0xff00) >> 8);
+ chk = WriteByte(fp, w & 0xff, chk);
+ chk = WriteByte(fp, (w & 0xff00) >> 8, chk);
+ return chk;
}
-static void Write3(FILE *fp, unsigned long l)
+static Byte Write3Word(FILE *fp, int w, Byte chk)
{
- int f;
-
- for(f = 0; f < 3; f++)
- {
- WriteByte(fp, l & 0xff);
- l >>= 8u;
- }
-}
-
-
-static void WriteLong(FILE *fp, unsigned long l)
-{
- int f;
-
- for(f = 0; f < 4; f++)
- {
- WriteByte(fp, l & 0xff);
- l >>= 8u;
- }
+ chk = WriteByte(fp, w & 0xff, chk);
+ chk = WriteByte(fp, (w & 0xff00) >> 8, chk);
+ chk = WriteByte(fp, (w & 0xff0000) >> 16, chk);
+ return chk;
}
-static void WriteString(FILE *fp, const char *p, int len,
- Byte fill, Codepage cp)
+static Byte WriteString(FILE *fp, const char *p, int len,
+ Byte fill, Codepage cp, Byte chk)
{
while(len--)
{
- WriteByte(fp, *p ? CodeFromNative(cp, *p++) : CodeFromNative(cp, fill));
+ chk = WriteByte(fp, *p ? CodeFromNative(cp, *p++) :
+ CodeFromNative(cp, fill), chk);
}
+
+ return chk;
}
@@ -152,10 +143,10 @@ int CPCOutput(const char *filename, const char *filename_bank,
/* Output the binary files
*/
- WriteString(fp, "ZXTape!", 7, 0, CP_ASCII);
- WriteByte(fp, 0x1a);
- WriteByte(fp, 1);
- WriteByte(fp, 13);
+ WriteString(fp, "ZXTape!", 7, 0, CP_ASCII, 0);
+ WriteByte(fp, 0x1a, 0);
+ WriteByte(fp, 1, 0);
+ WriteByte(fp, 13, 0);
for(f = 0; f < count; f++)
{
@@ -177,36 +168,39 @@ int CPCOutput(const char *filename, const char *filename_bank,
for(block = 0; block <= blocks; block++)
{
+ Byte chk;
int first, last;
first = 0;
last = 0;
- WriteByte(fp, 0x11); /* Block type */
+ WriteByte(fp, 0x11, 0); /* Block type */
+
+ WriteWord(fp, 0x626, 0); /* PILOT */
+ WriteWord(fp, 0x34f, 0); /* SYNC1 */
+ WriteWord(fp, 0x302, 0); /* SYNC2 */
+ WriteWord(fp, 0x33a, 0); /* ZERO */
+ WriteWord(fp, 0x673, 0); /* ONE */
+ WriteWord(fp, 0xffe, 0); /* PILOT LEN */
+ WriteByte(fp, 8, 0); /* USED BITS */
+ WriteWord(fp, 0x10, 0); /* PAUSE */
+ Write3Word(fp, 0x0041, 0); /* LEN */
- WriteWord(fp, 0x09cc); /* PILOT */
- WriteWord(fp, 0x0585); /* SYNC1 */
- WriteWord(fp, 0x04aa); /* SYNC2 */
- WriteWord(fp, 0x0505); /* ZERO */
- WriteWord(fp, 0x0a09); /* ONE */
- WriteWord(fp, 0x1000); /* PILOT LEN */
- WriteByte(fp, 0x08); /* NUM BITS IN LAST BYTE */
- WriteWord(fp, 0x07d0); /* PAUSE */
- Write3(fp, 0x0040); /* LEN */
+ chk = 0;
if (f == 0)
{
- WriteString(fp, filename, 16, 0, CP_ASCII);
+ chk = WriteString(fp, filename, 16, 0, CP_ASCII, chk);
}
else
{
char fn[16];
snprintf(fn, sizeof fn, filename_bank, bank[f]->number);
- WriteString(fp, fn, 16, 0, CP_ASCII);
+ chk = WriteString(fp, fn, 16, 0, CP_ASCII, chk);
}
- WriteByte(fp, block+1);
+ chk = WriteByte(fp, block+1, chk);
if (block == 0)
{
@@ -228,36 +222,42 @@ int CPCOutput(const char *filename, const char *filename_bank,
blocklen = len % BLOCK_SIZE;
}
- WriteByte(fp, last);
- WriteByte(fp, 2);
- WriteWord(fp, blocklen);
- WriteWord(fp, addr);
- WriteByte(fp, first);
- WriteWord(fp, len);
- WriteWord(fp, options.start_addr);
- WriteString(fp, "", 64 - 28, 0, CP_ASCII);
+ chk = WriteByte(fp, last, chk);
+ chk = WriteByte(fp, 2, chk);
+ chk = WriteWord(fp, blocklen, chk);
+ chk = WriteWord(fp, addr, chk);
+ chk = WriteByte(fp, first, chk);
+ chk = WriteWord(fp, len, chk);
+ chk = WriteWord(fp, options.start_addr, chk);
+ chk = WriteString(fp, "", 64 - 28, 0, CP_ASCII, chk);
+
+ WriteByte(fp, chk, 0);
addr += blocklen;
/* Output file data
*/
- WriteByte(fp, 0x11); /* Block type */
-
- WriteWord(fp, 0x09cc); /* PILOT */
- WriteWord(fp, 0x0585); /* SYNC1 */
- WriteWord(fp, 0x04aa); /* SYNC2 */
- WriteWord(fp, 0x0505); /* ZERO */
- WriteWord(fp, 0x0a09); /* ONE */
- WriteWord(fp, 0x1000); /* PILOT LEN */
- WriteByte(fp, 0x08); /* NUM BITS IN LAST BYTE */
- WriteWord(fp, 0x07d0); /* PAUSE */
- Write3(fp, blocklen); /* LEN */
+ WriteByte(fp, 0x11, 0); /* Block type */
+
+ WriteWord(fp, 0x626, 0); /* PILOT */
+ WriteWord(fp, 0x34f, 0); /* SYNC1 */
+ WriteWord(fp, 0x302, 0); /* SYNC2 */
+ WriteWord(fp, 0x33a, 0); /* ZERO */
+ WriteWord(fp, 0x673, 0); /* ONE */
+ WriteWord(fp, 0xffe, 0); /* PILOT LEN */
+ WriteByte(fp, 8, 0); /* USED BITS */
+ WriteWord(fp, 0x10, 0); /* PAUSE */
+ Write3Word(fp, blocklen + 1, 0); /* LEN */
+
+ chk = 0;
while(min < addr)
{
- WriteByte(fp, mem[min]);
+ chk = WriteByte(fp, mem[min], chk);
min++;
}
+
+ WriteByte(fp, chk, 0);
}
}
diff --git a/src/example/cpc.asm b/src/example/cpc.asm
index 1a368f2..0c9ff5e 100644
--- a/src/example/cpc.asm
+++ b/src/example/cpc.asm
@@ -8,7 +8,7 @@
option output-format,cpc
option cpc-start,start
-start: org $8000
+start: org $8000
ld hl,msg
loop:
@@ -16,7 +16,7 @@ loop:
ret z
call $bb5a
inc hl
- jr loop
+ jr loop
-msg: org $8800
- defb "Hello World",0
+ org $8800
+msg: defb "Hello World",0
diff --git a/src/example/dump.c b/src/example/dump.c
index 71d153a..231e495 100644
--- a/src/example/dump.c
+++ b/src/example/dump.c
@@ -2,6 +2,7 @@
#include <unistd.h>
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
typedef struct
{
@@ -9,6 +10,45 @@ typedef struct
unsigned char *addr;
} Block;
+static void HexDump(const unsigned char *p, int len)
+{
+ int o = 0;
+ int f;
+ char buff[17] = {0};
+
+ while(o < len)
+ {
+ strcpy(buff, " ");
+
+ printf("%4.4X: ", o);
+
+ for(f = 0; f < 16; f++)
+ {
+ if (o < len)
+ {
+ printf(" %2.2X", p[o]);
+ }
+ else
+ {
+ printf(" **");
+ }
+
+ if (isprint(p[o]))
+ {
+ buff[f] = p[o];
+ }
+ else
+ {
+ buff[f] = '.';
+ }
+
+ o++;
+ }
+
+ printf(" %s\n", buff);
+ }
+}
+
static int Word(FILE *fp)
{
int i0;
@@ -35,23 +75,51 @@ static int Triplet(FILE *fp)
static Block *DumpBlock(FILE *fp)
{
+ static int first = 1;
Block *block;
- Word(fp); /* PILOT */
- Word(fp); /* SYNC1 */
- Word(fp); /* SYNC2 */
- Word(fp); /* ZERO */
- Word(fp); /* ONE */
- Word(fp); /* PILOT LEN */
- getc(fp); /* USED BITS */
- Word(fp); /* PAUSE */
+ if (first)
+ {
+ printf("PILOT=%4.4x\n", Word(fp)); /* PILOT */
+ printf("SYNC1=%4.4x\n", Word(fp)); /* SYNC1 */
+ printf("SYNC2=%4.4x\n", Word(fp)); /* SYNC2 */
+ printf("ZERO=%4.4x\n", Word(fp)); /* ZERO */
+ printf("ONE=%4.4x\n", Word(fp)); /* ONE */
+ printf("PILOT LEN=%4.4x\n", Word(fp)); /* PILOT LEN */
+ printf("USED BITS=%2.2x\n", getc(fp)); /* USED BITS */
+ printf("PAUSE=%4.4x\n", Word(fp)); /* PAUSE */
+ }
+ else
+ {
+ Word(fp); /* PILOT */
+ Word(fp); /* SYNC1 */
+ Word(fp); /* SYNC2 */
+ Word(fp); /* ZERO */
+ Word(fp); /* ONE */
+ Word(fp); /* PILOT LEN */
+ getc(fp); /* USED BITS */
+ Word(fp); /* PAUSE */
+ }
block = malloc(sizeof *block);
block->len = Triplet(fp); /* LEN */
+
+ if (first)
+ {
+ printf("LEN=%6.6x\n", block->len);
+ }
+
block->addr = malloc(block->len);
fread(block->addr, 1, block->len, fp);
+ if (first)
+ {
+ HexDump(block->addr, block->len);
+ }
+
+ first = 1;
+
return block;
}
@@ -114,6 +182,9 @@ int main(int argc, char *argv[])
int count;
int f;
Block *block[256] = {0};
+ char buff[9];
+
+ fread(buff, 1, sizeof buff, stdin);
ch = getc(stdin);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 19:47:30 +0000