X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=53d7c6ae48aeab8126bc826e24abda4edaf3c3e6;hp=b17f9dde6393fc515f74df779a52b469d5a60464;hb=ace0b549a94110b69ec61442f825fb421b79799a;hpb=7d364a21bf389d947bb61cc235d00b3892aca89a diff --git a/direct.c b/direct.c index b17f9dd..53d7c6a 100644 --- a/direct.c +++ b/direct.c @@ -1,7 +1,7 @@ // // RMAC - Reboot's Macro Assembler for all Atari computers // DIRECT.C - Directive Handling -// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -51,6 +51,7 @@ int d_abs(void); int d_comm(void); int d_dc(WORD); int d_ds(WORD); +int d_dsm(WORD); int d_dcb(WORD); int d_globl(void); int d_gpu(void); @@ -153,6 +154,7 @@ int (*dirtab[])() = { d_nofpu, // 65 nofpu d_opt, // 66 .opt d_objproc, // 67 .objproc + (void *)d_dsm, // 68 .dsm }; @@ -219,8 +221,8 @@ int d_org(void) { uint64_t address; - if (!rgpu && !rdsp && !robjproc && !m6502 && !dsp56001) - return error(".org permitted only in GPU/DSP/OP, 56001 and 6502 sections"); + if (!rgpu && !rdsp && !robjproc && !m6502 && !dsp56001 && !(obj_format == RAW)) + return error(".org permitted only in GPU/DSP/OP, 56001, 6502 and 68k (with -fr switch) sections"); // M56K can leave the expression off the org for some reason :-/ // (It's because the expression is non-standard, and so we have to look at @@ -344,6 +346,17 @@ int d_org(void) // N.B.: It seems that by enabling this, even though it works elsewhere, will cause symbols to royally fuck up. Will have to do some digging to figure out why. // orgactive = 1; } + else + { + // If we get here we assume it's 68k with RAW output, so this is allowed + if (orgactive) + { + return error("In 68k mode only one .org statement is allowed"); + } + + org68k_address = address; + org68k_active = 1; + } ErrorIfNotAtEOL(); return 0; @@ -546,13 +559,13 @@ int d_noclear(void) // -// Include binary file +// Include binary file (can add addition size & position params, comma separated) // int d_incbin(void) { int fd; int bytes = 0; - long pos, size, bytesRead; + uint64_t pos, size, bytesRead; char buf1[256]; int i; @@ -572,7 +585,9 @@ int d_incbin(void) // Attempt to open the include file in the current directory, then (if that // failed) try list of include files passed in the enviroment string or by // the "-d" option. - if ((fd = open(string[tok[1]], _OPEN_INC)) < 0) + TOKEN filename = tok[1]; + + if ((fd = open(string[filename], _OPEN_INC)) < 0) { for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++) { @@ -582,29 +597,81 @@ int d_incbin(void) if (fd > 0 && buf1[fd - 1] != SLASHCHAR) strcat(buf1, SLASHSTRING); - strcat(buf1, string[tok[1]]); + strcat(buf1, string[filename]); if ((fd = open(buf1, _OPEN_INC)) >= 0) goto allright; } - return error("cannot open: \"%s\"", string[tok[1]]); + return error("cannot open: \"%s\"", string[filename]); } allright: - size = lseek(fd, 0L, SEEK_END); - pos = lseek(fd, 0L, SEEK_SET); + tok += 2; + + if (*tok != EOL) + { + // Check size parameter (can be omitted) + if (*tok++ == ',') + { + if (*tok != ',') + { + if (abs_expr(&size) != OK) + { + close(fd); + return ERROR; + } + } + else + size = lseek(fd, 0L, SEEK_END); + } + + // Check offset parameter (can be omitted) + if (*tok != EOL) + { + if (*tok++ == ',') + { + if (*tok != EOL) + { + if (abs_expr(&pos) != OK) + { + close(fd); + return ERROR; + } + + lseek(fd, pos, SEEK_SET); + size -= pos; + } + else + { + // offset parameter omitted, so it's 0 + pos = lseek(fd, 0L, SEEK_SET); + } + } + else + return error(comma_error); + } + else + pos = lseek(fd, 0L, SEEK_SET); + } + else + { + // size & pos not given, so assume offset of 0 and all of the binary + size = lseek(fd, 0L, SEEK_END); + pos = lseek(fd, 0L, SEEK_SET); + } + chcheck(size); - DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size); } + DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[filename], size); } char * fileBuffer = (char *)malloc(size); bytesRead = read(fd, fileBuffer, size); if (bytesRead != size) { - error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size); + error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[filename], size); return ERROR; } @@ -1074,11 +1141,11 @@ int d_ds(WORD siz) return 0; // Check to see if the value being passed in is negative (who the hell does - // that?--nobody does; it's the code gremlins, or rum, that does it) - // N.B.: Since 'eval' is of type uint32_t, if it goes negative, it will have - // its high bit set. - if (eval & 0x80000000) - return error("negative sizes not allowed"); + // that?--nobody does; it's the code gremlins, or rum, what does it) + // N.B.: Since 'eval' is of type uint64_t, if it goes negative, it will + // have its high bit set. + if (eval & 0x8000000000000000) + return error("negative sizes not allowed in DS"); // In non-TDB section (BSS, ABS and M6502) just advance the location // counter appropriately. In TDB sections, deposit (possibly large) chunks @@ -1094,7 +1161,7 @@ int d_ds(WORD siz) just_bss = 1; // No data deposited (8-bit CPU mode) } - else if (cursect == M56001P || cursect == M56001X || cursect == M56001Y || cursect == M56001L) + else if (cursect & M56KPXYL) { // Change segment instead of marking blanks. // Only mark segments we actually wrote something @@ -1123,12 +1190,57 @@ int d_ds(WORD siz) } ErrorIfNotAtEOL(); - return 0; + return OK; +} + + +// +// dsm[.siz] expression +// Define modulo storage +// Quoting the Motorola assembler manual: +// "The DSM directive reserves a block of memory the length of which in words is equal to +// the value of .If the runtime location counter is not zero, this directive first +// advances the runtime location counter to a base address that is a multiple of 2k, where +// 2k >= ." +// The kicker of course is written a few sentences after: +// "