Apple-2-Tools
/
c2d
mirror of https://github.com/datajerk/c2d.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

splash screen support

This commit is contained in:
Egan Ford 2017-04-08 18:41:29 -06:00
parent accf8e5e5a
commit e1f98db29c
6 changed files with 265 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -7,6 +7,9 @@ windows: bin/c2d.exe
dist: all windows
c2d.h: c2d.h.0 asm/loader.s makeheader
./makeheader
bin/c2d: c2d.c c2d.h
gcc -Wall -Wno-missing-braces -I. -O3 -o bin/c2d c2d.c -lm

27
asm/Makefile Normal file
View File

@ -0,0 +1,27 @@
CL = cl65
CL_FLAGS = -t none --listing --list-bytes 100
#CL_FLAGS = -t apple1 -C apple1-16k.cfg --listing --list-bytes 100
CC = cl65
CC_FLAGS = --static-locals -t apple1 -C apple1-16k.cfg
C2T = c2t
ASRC = $(shell echo *.s)
AOBJ = $(ASRC:%.s=%.o)
ALST = $(ASRC:%.s=%.lst)
AMON = $(ASRC:%.s=%.mon)
ABIN = $(ASRC:%.s=%)
all: $(ABIN)
clean:
-rm -f $(ABIN) $(AOBJ) $(ALST) $(AMON)
%: %.s
$(CL) $(CL_FLAGS) $<
%: %.c
$(CC) $(CC_FLAGS) $<
%.mon: %
$(C2T) $< $@

126
asm/loader.s Normal file
View File

@ -0,0 +1,126 @@
;diskload2.s
; apple vectors
warm = $FF69 ; back to monitor
bell = $FBDD ; ding
; vars
lopage = $0800
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
start:
.org lopage
ldx #0 ; move code to hi memory
move:
lda moved,x
sta loader,x
inx
bne move ; move 256 bytes
jmp loader
moved:
.org hipage
loader:
lda #1 ; read(1)/write(2) command
ldy #$0C ; offset in RWTS
sta rwtsprm,y ; write it to RWTS
lda #0 ; buffer LSB
ldy #8 ; offset in RWTS
sta rwtsprm,y ; write it to RWTS
lda #2
sta trknum ; start with track 2
lda loadpage ; where to dump the tracks
sta buffer
ldx lasttrack
dex ; because data starts at track 2
dex
stx trkcnt ; number of complete and partial tracks
;;;begin track loop
trkloop:
lda trknum ; track number
ldy #4 ; offset in RWTS
sta rwtsprm,y ; write it to RWTS
;;;begin sector loop (16), backwards is faster, much faster
lda trkcnt
bne fulltrack
lda lastsector
jmp subtrack
fulltrack:
lda #$F
subtrack:
sta secnum
secloop:
lda secnum ; sector number
ldy #5 ; offset in RWTS
sta rwtsprm,y ; write it to RWTS
lda buffer ; buffer MSB
clc
adc secnum
ldy #9 ; offset in RWTS
sta rwtsprm,y ; write it to RWTS
ldy #<rwtsprm ; load rwts paramlist B7E8
lda #>rwtsprm
jsr rwts ; do it!
bcs diskerror
lda #0
sta preg ; fix p reg so mon is happy
dec secnum
bpl secloop
;;;end sector loop
lda buffer ; buffer += $10
clc
adc #$10
sta buffer
inc trknum ; next track
dec trkcnt ;
bpl trkloop ; 0, all done with tracks
;;;end track loop
done:
jmp (nextjump)
diskerror:
jmp warm
lasttrack:
.org *+1
lastsector:
.org *+1
loadpage:
.org *+1
nextjump:
.org *+2
trkcnt:
.org *+1
segcnt:
.org *+1
buffer:
.org *+1
secnum:
.org *+1
trknum:
.org *+1

BIN
bin/c2d
View File

Binary file not shown.

137
c2d.c
View File

@ -58,6 +58,7 @@ Bugs:
#define OUTFILE argv[argc-1]
#define BINARY 0
#define MONITOR 1
#define LOADER "loader"
void usage();
char *getext(char *filename);
@ -65,14 +66,19 @@ char *getext(char *filename);
int main(int argc, char **argv)
{
FILE *ifp, *ofp;
int c, j, k, start, start_override = 0, inputtype, warm = 0, filesize = 0;
int c, j, k, start = 0, loadaddress, inputtype, warm = 0, filesize = 0;
int loaderstart, loader = 0, loadersize = 0, textpagesize = 0;
struct stat st;
char *filetypes[] = {"BINARY","MONITOR"};
char *ext, filename[256], load_address[10];
char *ext, filename[256], load_address[10], *textpage=NULL;
opterr = 1;
while((c = getopt(argc, argv, "vmh?s:")) != -1)
while((c = getopt(argc, argv, "t:vmh?s:")) != -1)
switch(c) {
case 't':
loader=1;
textpage=optarg;
break;
case 'm':
warm = 1;
break;
@ -82,7 +88,7 @@ int main(int argc, char **argv)
break;
case 's': // override rate for -1/-2 only
warm = 0;
start_override = (int)strtol(optarg, (char **)NULL, 16); // todo: input check
start = (int)strtol(optarg, (char **)NULL, 16); // todo: input check
break;
case 'h': // help
case '?':
@ -112,9 +118,9 @@ int main(int argc, char **argv)
load_address[k++]=INFILE[j];
load_address[k] = '\0';
if(k == 0)
start = -1;
loadaddress = -1;
else
start = (int)strtol(load_address, (char **)NULL, 16); // todo: input check
loadaddress = (int)strtol(load_address, (char **)NULL, 16); // todo: input check
if((ext = getext(filename)) != NULL)
if(strcmp(ext,"mon") == 0 || strcmp(ext,"MON") == 0)
@ -133,11 +139,11 @@ int main(int argc, char **argv)
stat(filename,&st);
filesize = st.st_size;
if(start == - 1) {
if(loadaddress == - 1) {
fread(&b, 1, 1, ifp);
start = b;
loadaddress = b;
fread(&b, 1, 1, ifp);
start |= b << 8;
loadaddress |= b << 8;
fread(&b, 1, 1, ifp);
filesize = b;
fread(&b, 1, 1, ifp);
@ -145,7 +151,7 @@ int main(int argc, char **argv)
}
//check for errors
fread(&blank.track[1].sector[0].byte[start & 0xFF], filesize, 1, ifp);
fread(&blank.track[1+loader].sector[0].byte[loadaddress & 0xFF], filesize, 1, ifp);
}
// todo: lots of input checking
@ -154,14 +160,14 @@ int main(int argc, char **argv)
char addrs[8], s;
unsigned char *p = NULL;
start = -1;
loadaddress = -1;
filesize = 0;
while(fscanf(ifp,"%s ",addrs) != EOF) {
naddr = (int)strtol(addrs, (char **)NULL, 16);
if(start == -1) {
start = naddr;
p = &blank.track[1].sector[0].byte[start & 0xFF];
if(loadaddress == -1) {
loadaddress = naddr;
p = &blank.track[1+loader].sector[0].byte[loadaddress & 0xFF];
}
while (fscanf(ifp, "%x%c", &byte, &s) != EOF) {
@ -176,39 +182,108 @@ int main(int argc, char **argv)
fclose(ifp);
fprintf(stderr,"%04X, length: %d\n",start,filesize);
fprintf(stderr,"%04X, length: %d\n",loadaddress,filesize);
fprintf(stderr,"\n");
blank.track[0].sector[1].byte[0xE0] = ceil((filesize + (start & 0xFF)) / 256.0);
blank.track[0].sector[1].byte[0xE7] = ((start + filesize - 1) >> 8) + 1;
blank.track[0].sector[1].byte[0x15] = ceil((filesize + (start & 0xFF))/ 4096.0);
blank.track[0].sector[1].byte[0x1A] = ceil((filesize + (start & 0xFF))/ 256.0) - 16*(ceil((filesize + (start & 0xFF)) / 4096.0) - 1) - 1;
fprintf(stderr,"Number of sectors: %d\n",(int)ceil((filesize + (start & 0xFF)) / 256.0));
fprintf(stderr,"Memory page range: $%02X - $%02X\n",start >> 8,(start + filesize - 1) >> 8);
if(!start)
start = loadaddress;
if(warm)
start = 0xFF69;
if(start_override)
start = start_override;
if(!loader) {
blank.track[0].sector[1].byte[0xE0] = ceil((filesize + (loadaddress & 0xFF)) / 256.0);
blank.track[0].sector[1].byte[0xE7] = ((loadaddress + filesize - 1) >> 8) + 1;
blank.track[0].sector[1].byte[0x15] = ceil((filesize + (loadaddress & 0xFF))/ 4096.0);
blank.track[0].sector[1].byte[0x1A] = ceil((filesize + (loadaddress & 0xFF))/ 256.0) - 16*(ceil((filesize + (loadaddress & 0xFF)) / 4096.0) - 1) - 1;
blank.track[0].sector[1].byte[0x3B] = 0x4C;
blank.track[0].sector[1].byte[0x3C] = start & 0xFF;
blank.track[0].sector[1].byte[0x3D] = start >> 8;
fprintf(stderr,"Number of sectors: %d\n",(int)ceil((filesize + (loadaddress & 0xFF)) / 256.0));
fprintf(stderr,"Memory page range: $%02X - $%02X\n",loadaddress >> 8,(loadaddress + filesize - 1) >> 8);
fprintf(stderr,"After boot, jump to: $%04X\n\n",start);
blank.track[0].sector[1].byte[0x3B] = 0x4C;
blank.track[0].sector[1].byte[0x3C] = start & 0xFF;
blank.track[0].sector[1].byte[0x3D] = start >> 8;
fprintf(stderr,"After boot, jump to: $%04X\n\n",start);
fprintf(stderr,"Writing %s to T:01/S:00 - T:%02d/S:%02d on %s\n\n",filename,blank.track[0].sector[1].byte[0x15],blank.track[0].sector[1].byte[0x1A],OUTFILE);
}
else {
if ((ifp = fopen(textpage, "rb")) == NULL) {
fprintf(stderr,"Cannot read: %s\n\n",textpage);
return 1;
}
stat(textpage,&st);
textpagesize = st.st_size;
if(textpagesize != 1024) {
fprintf(stderr,"textpage %s size %d != 1024\n\n",textpage,textpagesize);
return 1;
}
fread(&blank.track[1].sector[0].byte[0], textpagesize, 1, ifp);
fclose(ifp);
if ((ifp = fopen(LOADER, "rb")) == NULL) {
fprintf(stderr,"Cannot read: %s\n\n",LOADER);
return 1;
}
stat(LOADER,&st);
loadersize = st.st_size;
fread(&blank.track[1].sector[4].byte[0], loadersize, 1, ifp);
fclose(ifp);
// loader args
// lasttrack
blank.track[1].sector[4].byte[loadersize]=1 + (int)ceil(filesize / 4096.0);
// lastsector (unused)
blank.track[1].sector[4].byte[loadersize+1]= ceil((filesize % 4096) / 256.0) - 1;
// loadpage
blank.track[1].sector[4].byte[loadersize+2]= loadaddress >> 8;
// program start LSB
blank.track[1].sector[4].byte[loadersize+3]= start & 0xFF;
// program start MSB
blank.track[1].sector[4].byte[loadersize+4]= start >> 8;
loaderstart=0x400;
loadersize += (1024 + 5); // textpage + loader + loader args
blank.track[0].sector[1].byte[0xE0] = ceil((loadersize + (loaderstart & 0xFF)) / 256.0);
blank.track[0].sector[1].byte[0xE7] = ((loaderstart + loadersize - 1) >> 8) + 1;
blank.track[0].sector[1].byte[0x15] = ceil((loadersize + (loaderstart & 0xFF))/ 4096.0);
blank.track[0].sector[1].byte[0x1A] = ceil((loadersize + (loaderstart & 0xFF))/ 256.0) - 16*(ceil((loadersize + (loaderstart & 0xFF)) / 4096.0) - 1) - 1;
fprintf(stderr,"Loader number of sectors: %d\n",(int)ceil((loadersize + (loaderstart & 0xFF)) / 256.0));
fprintf(stderr,"Loader memory page range: $%02X - $%02X\n",loaderstart >> 8,(loaderstart + loadersize - 1) >> 8);
fprintf(stderr,"Binary Number of sectors: %d\n",(int)ceil((filesize + (loadaddress & 0xFF)) / 256.0));
fprintf(stderr,"Binary Memory page range: $%02X - $%02X\n",loadaddress >> 8,(loadaddress + filesize - 1) >> 8);
loaderstart = 0x800;
//if(warm)
// loaderstart = 0xFF69;
blank.track[0].sector[1].byte[0x3B] = 0x4C;
blank.track[0].sector[1].byte[0x3C] = loaderstart & 0xFF;
blank.track[0].sector[1].byte[0x3D] = loaderstart >> 8;
fprintf(stderr,"After boot, jump to: $%04X\n",loaderstart);
fprintf(stderr,"After loader, jump to: $%04X\n",start);
fprintf(stderr,"\n");
fprintf(stderr,"Writing %s to T:02/S:00 - T:%02d/S:%02d on %s\n\n",filename,blank.track[1].sector[4].byte[st.st_size],blank.track[1].sector[4].byte[st.st_size+1],OUTFILE);
}
if ((ofp = fopen(OUTFILE, "wb")) == NULL) {
fprintf(stderr,"Cannot write: %s\n\n",OUTFILE);
return 1;
}
fprintf(stderr,"Writing %s to T:01/S:00 - T:%02d/S:%02d on %s\n\n",filename,blank.track[0].sector[1].byte[0x15],blank.track[0].sector[1].byte[0x1A],OUTFILE);
// check for errors
fwrite(&blank, 143360, 1, ofp);
fclose(ofp);
return 0;
}

3
c2d.h → c2d.h.0
View File

@ -39,6 +39,7 @@ Examples:\n\
\n\
";
//$B600
disk blank = {
0x01,0xA5,0x27,0xC9,0x09,0xD0,0x18,0xA5,0x2B,0x4A,0x4A,0x4A,0x4A,0x09,0xC0,0x85,
0x3F,0xA9,0x5C,0x85,0x3E,0x18,0xAD,0xFE,0x08,0x6D,0xFF,0x08,0x8D,0xFE,0x08,0xAE,
@ -9001,3 +9002,5 @@ disk blank = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};