Apple-2-Tools/c2d
1
0
Fork 0
mirror of https://github.com/datajerk/c2d.git synced 2024-06-13 06:29:30 +00:00
Code Issues Projects Releases Wiki Activity

minor c2d.c cleanup, ran indent -kr -ts4, unwrapped lines

Browse Source
This commit is contained in:
Egan Ford 2017-04-12 17:44:02 -06:00
parent 617d504af5
commit 368161abc7
2 changed files with 97 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/c2d.exe
View File

Binary file not shown.

201
c2d.c
View File

@ -69,77 +69,78 @@ int main(int argc, char **argv)
int c, i, j, k, start = 0, loadaddress, inputtype, warm = 0, filesize = 0; int c, i, j, k, start = 0, loadaddress, inputtype, warm = 0, filesize = 0;
int loaderstart, loader = 0, loadersize = 0, textpagesize = 0; int loaderstart, loader = 0, loadersize = 0, textpagesize = 0;
struct stat st; struct stat st;
char *filetypes[] = {"BINARY","MONITOR"}; char *filetypes[] = { "BINARY", "MONITOR" };
char *ext, filename[256], load_address[10], *textpage=NULL; char *ext, filename[256], load_address[10], *textpage = NULL;
opterr = 1; opterr = 1;
while((c = getopt(argc, argv, "t:vmh?s:")) != -1) while ((c = getopt(argc, argv, "t:vmh?s:")) != -1)
switch(c) { switch (c) {
case 't': case 't':
loader=1; loader = 1;
textpage=optarg; textpage = optarg;
break; break;
case 'm': case 'm':
warm = 1; warm = 1;
break; break;
case 'v': // version case 'v': // version
fprintf(stderr,"\n%s\n\n",VERSION); fprintf(stderr, "\n%s\n\n", VERSION);
return 1; return 1;
break; break;
case 's': // override rate for -1/-2 only case 's': // override rate for -1/-2 only
warm = 0; warm = 0;
start = (int)strtol(optarg, (char **)NULL, 16); // todo: input check start = (int) strtol(optarg, (char **) NULL, 16); // todo: input check
break; break;
case 'h': // help case 'h': // help
case '?': case '?':
usage(); usage();
return 1; return 1;
} }
if(argc - optind < 2) { if (argc - optind < 2) {
usage(); usage();
return 1; return 1;
} }
fprintf(stderr,"\n"); fprintf(stderr, "\n");
inputtype=BINARY; inputtype = BINARY;
k=0; k = 0;
for(j=0;j<strlen(INFILE);j++) { for (j = 0; j < strlen(INFILE); j++) {
if(INFILE[j] == ',') if (INFILE[j] == ',')
break; break;
filename[k++]=INFILE[j]; filename[k++] = INFILE[j];
} }
filename[k] = '\0'; filename[k] = '\0';
k=0;j++; k = 0;
for(;j<strlen(INFILE);j++) j++;
load_address[k++]=INFILE[j]; for (; j < strlen(INFILE); j++)
load_address[k++] = INFILE[j];
load_address[k] = '\0'; load_address[k] = '\0';
if(k == 0) if (k == 0)
loadaddress = -1; loadaddress = -1;
else else
loadaddress = (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 ((ext = getext(filename)) != NULL)
if(strcmp(ext,"mon") == 0 || strcmp(ext,"MON") == 0) if (strcmp(ext, "mon") == 0 || strcmp(ext, "MON") == 0)
inputtype = MONITOR; inputtype = MONITOR;
if ((ifp = fopen(filename, "rb")) == NULL) { if ((ifp = fopen(filename, "rb")) == NULL) {
fprintf(stderr,"Cannot read: %s\n\n",filename); fprintf(stderr, "Cannot read: %s\n\n", filename);
return 1; return 1;
} }
fprintf(stderr,"Reading %s, type %s, load address: $",filename,filetypes[inputtype]); fprintf(stderr, "Reading %s, type %s, load address: $", filename, filetypes[inputtype]);
if(inputtype == BINARY) { if (inputtype == BINARY) {
unsigned char b; unsigned char b;
stat(filename,&st); stat(filename, &st);
filesize = st.st_size; filesize = st.st_size;
if(loadaddress == - 1) { if (loadaddress == -1) {
fread(&b, 1, 1, ifp); fread(&b, 1, 1, ifp);
loadaddress = b; loadaddress = b;
fread(&b, 1, 1, ifp); fread(&b, 1, 1, ifp);
@ -149,13 +150,11 @@ int main(int argc, char **argv)
fread(&b, 1, 1, ifp); fread(&b, 1, 1, ifp);
filesize |= b << 8; filesize |= b << 8;
} }
//check for errors //check for errors
fread(&blank.track[1+loader].sector[0].byte[loadaddress & 0xFF], filesize, 1, ifp); fread(&blank.track[1 + loader].sector[0].byte[loadaddress & 0xFF], filesize, 1, ifp);
} }
// todo: lots of input checking // todo: lots of input checking
if(inputtype == MONITOR) { if (inputtype == MONITOR) {
int byte, naddr; int byte, naddr;
char addrs[8], s; char addrs[8], s;
unsigned char *p = NULL; unsigned char *p = NULL;
@ -163,13 +162,13 @@ int main(int argc, char **argv)
loadaddress = -1; loadaddress = -1;
filesize = 0; filesize = 0;
while(fscanf(ifp,"%s ",addrs) != EOF) { while (fscanf(ifp, "%s ", addrs) != EOF) {
naddr = (int)strtol(addrs, (char **)NULL, 16); naddr = (int) strtol(addrs, (char **) NULL, 16);
if(loadaddress == -1) { if (loadaddress == -1) {
loadaddress = naddr; loadaddress = naddr;
p = &blank.track[1+loader].sector[0].byte[loadaddress & 0xFF]; p = &blank.track[1 + loader].sector[0].byte[loadaddress & 0xFF];
} }
while (fscanf(ifp, "%x%c", &byte, &s) != EOF) { while (fscanf(ifp, "%x%c", &byte, &s) != EOF) {
*p++ = byte; *p++ = byte;
filesize++; filesize++;
@ -182,100 +181,96 @@ int main(int argc, char **argv)
fclose(ifp); fclose(ifp);
fprintf(stderr,"%04X, length: %d\n",loadaddress,filesize); fprintf(stderr, "%04X, length: %d\n", loadaddress, filesize);
fprintf(stderr,"\n"); fprintf(stderr, "\n");
if(!start) if (!start)
start = loadaddress; start = loadaddress;
if(warm) if (warm)
start = 0xFF69; start = 0xFF69;
if(!loader) { if (!loader) {
blank.track[0].sector[1].byte[0xE0] = ceil((filesize + (loadaddress & 0xFF)) / 256.0); 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[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[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[0x1A] = ceil((filesize + (loadaddress & 0xFF)) / 256.0) - 16 * (ceil((filesize + (loadaddress & 0xFF)) / 4096.0) - 1) - 1;
fprintf(stderr,"Number of sectors: %d\n",(int)ceil((filesize + (loadaddress & 0xFF)) / 256.0)); 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, "Memory page range: $%02X - $%02X\n", loadaddress >> 8, (loadaddress + filesize - 1) >> 8);
blank.track[0].sector[1].byte[0x3B] = 0x4C; blank.track[0].sector[1].byte[0x3B] = 0x4C;
blank.track[0].sector[1].byte[0x3C] = start & 0xFF; blank.track[0].sector[1].byte[0x3C] = start & 0xFF;
blank.track[0].sector[1].byte[0x3D] = start >> 8; blank.track[0].sector[1].byte[0x3D] = start >> 8;
fprintf(stderr,"After boot, jump to: $%04X\n\n",start); 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); 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 {
else {
if ((ifp = fopen(textpage, "rb")) == NULL) { if ((ifp = fopen(textpage, "rb")) == NULL) {
fprintf(stderr,"Cannot read: %s\n\n",textpage); fprintf(stderr, "Cannot read: %s\n\n", textpage);
return 1; return 1;
} }
stat(textpage,&st); stat(textpage, &st);
textpagesize = st.st_size; textpagesize = st.st_size;
if(textpagesize != 1024) { if (textpagesize != 1024) {
fprintf(stderr,"textpage %s size %d != 1024\n\n",textpage,textpagesize); fprintf(stderr, "textpage %s size %d != 1024\n\n", textpage, textpagesize);
return 1; return 1;
} }
fread(&blank.track[1].sector[0].byte[0], textpagesize, 1, ifp); fread(&blank.track[1].sector[0].byte[0], textpagesize, 1, ifp);
fclose(ifp); fclose(ifp);
if((loadersize = sizeof(loadercode)) > 256) { if ((loadersize = sizeof(loadercode)) > 256) {
fprintf(stderr,"Loader code size %d > 256\n\n",loadersize); fprintf(stderr, "Loader code size %d > 256\n\n", loadersize);
return 1; return 1;
} }
for(i=0;i<loadersize;i++) for (i = 0; i < loadersize; i++)
blank.track[1].sector[4].byte[i]=loadercode[i]; blank.track[1].sector[4].byte[i] = loadercode[i];
// loader args // loader args
// lasttrack // lasttrack
blank.track[1].sector[4].byte[loadersize]=1 + (int)ceil(filesize / 4096.0); blank.track[1].sector[4].byte[loadersize] = 1 + (int) ceil(filesize / 4096.0);
// lastsector (unused) // lastsector
blank.track[1].sector[4].byte[loadersize+1]= ceil((filesize % 4096) / 256.0) - 1; blank.track[1].sector[4].byte[loadersize + 1] = ceil((filesize % 4096) / 256.0) - 1;
// loadpage // loadpage
blank.track[1].sector[4].byte[loadersize+2]= loadaddress >> 8; blank.track[1].sector[4].byte[loadersize + 2] = loadaddress >> 8;
// program start LSB // program start LSB
blank.track[1].sector[4].byte[loadersize+3]= start & 0xFF; blank.track[1].sector[4].byte[loadersize + 3] = start & 0xFF;
// program start MSB // program start MSB
blank.track[1].sector[4].byte[loadersize+4]= start >> 8; blank.track[1].sector[4].byte[loadersize + 4] = start >> 8;
loaderstart=0x400; loaderstart = 0x400;
loadersize += (1024 + 5); // textpage + loader + loader args 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[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[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[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; 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 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, "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 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); fprintf(stderr, "Binary Memory page range: $%02X - $%02X\n", loadaddress >> 8, (loadaddress + filesize - 1) >> 8);
loaderstart = 0x800; loaderstart = 0x800;
//if(warm)
// loaderstart = 0xFF69;
blank.track[0].sector[1].byte[0x3B] = 0x4C; blank.track[0].sector[1].byte[0x3B] = 0x4C;
blank.track[0].sector[1].byte[0x3C] = loaderstart & 0xFF; blank.track[0].sector[1].byte[0x3C] = loaderstart & 0xFF;
blank.track[0].sector[1].byte[0x3D] = loaderstart >> 8; blank.track[0].sector[1].byte[0x3D] = loaderstart >> 8;
fprintf(stderr,"After boot, jump to: $%04X\n",loaderstart); fprintf(stderr, "After boot, jump to: $%04X\n", loaderstart);
fprintf(stderr,"After loader, jump to: $%04X\n",start); fprintf(stderr, "After loader, jump to: $%04X\n", start);
fprintf(stderr,"\n"); 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[sizeof(loadercode)],blank.track[1].sector[4].byte[sizeof(loadercode)+1],OUTFILE); fprintf(stderr, "Writing %s to T:02/S:00 - T:%02d/S:%02d on %s\n\n", filename, blank.track[1].sector[4].byte[sizeof(loadercode)], blank.track[1].sector[4].byte[sizeof(loadercode) + 1], OUTFILE);
} }
if ((ofp = fopen(OUTFILE, "wb")) == NULL) { if ((ofp = fopen(OUTFILE, "wb")) == NULL) {
fprintf(stderr,"Cannot write: %s\n\n",OUTFILE); fprintf(stderr, "Cannot write: %s\n\n", OUTFILE);
return 1; return 1;
} }
// check for errors // check for errors
fwrite(&blank, 143360, 1, ofp); fwrite(&blank, 143360, 1, ofp);
@ -289,28 +284,26 @@ char *getext(char *filename)
char stack[256], *rval; char stack[256], *rval;
int i, sp = 0; int i, sp = 0;
for(i=strlen(filename)-1;i>=0;i--) { for (i = strlen(filename) - 1; i >= 0; i--) {
if(filename[i] == '.') if (filename[i] == '.')
break; break;
stack[sp++] = filename[i]; stack[sp++] = filename[i];
} }
stack[sp] = '\0'; stack[sp] = '\0';
if(sp == strlen(filename) || sp == 0) if (sp == strlen(filename) || sp == 0)
return(NULL); return (NULL);
if((rval = (char *)malloc(sp * sizeof(char))) == NULL) if ((rval = (char *) malloc(sp * sizeof(char))) == NULL); //do error code
; //do error code
rval[sp] = '\0'; rval[sp] = '\0';
for(i=0;i<sp+i;i++) for (i = 0; i < sp + i; i++)
rval[i] = stack[--sp]; rval[i] = stack[--sp];
return(rval); return (rval);
} }
void usage() void usage()
{ {
fprintf(stderr,"%s",usagetext); fprintf(stderr, "%s", usagetext);
} }