X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=155fa3fb360821bc945bb0e8e3a79ffd6fe973a9;hp=750d5873444f38f9a542566c838230d9fb79ddbe;hb=eace4e1b294ccec54a5c476619f616f5da0bf8a9;hpb=71cec8e7896b200c6ae63ebc428339bef147240a diff --git a/direct.c b/direct.c index 750d587..155fa3f 100644 --- a/direct.c +++ b/direct.c @@ -1,22 +1,27 @@ // -// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System +// RMAC - Reboot's Macro Assembler for all Atari computers // DIRECT.C - Directive Handling -// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // #include "direct.h" -#include "sect.h" -#include "riscasm.h" +#include "6502.h" +#include "amode.h" #include "error.h" -#include "token.h" -#include "procln.h" #include "expr.h" -#include "mach.h" #include "listing.h" +#include "mach.h" +#include "macro.h" #include "mark.h" +#include "procln.h" +#include "riscasm.h" +#include "sect.h" #include "symbol.h" +#include "token.h" +#include "math.h" +#include "sect.h" #define DEF_KW #include "kwtab.h" @@ -26,13 +31,63 @@ TOKEN exprbuf[128]; // Expression buffer SYM * symbolPtr[1000000]; // Symbol pointers table static long unused; // For supressing 'write' warnings char buffer[256]; // Scratch buffer for messages - +int largestAlign[3] = { 2, 2, 2 }; // Largest alignment value seen per section + +// Function prototypes +int d_unimpl(void); +int d_68000(void); +int d_68000(void); +int d_68020(void); +int d_68030(void); +int d_68040(void); +int d_68060(void); +int d_68881(void); +int d_68882(void); +int d_56001(void); +int d_nofpu(void); +int d_bss(void); +int d_data(void); +int d_text(void); +int d_abs(void); +int d_comm(void); +int d_dc(WORD); +int d_ds(WORD); +int d_dcb(WORD); +int d_globl(void); +int d_gpu(void); +int d_dsp(void); +int d_assert(void); +int d_include(void); +int d_list(void); +int d_nlist(void); +int d_error(char *); +int d_warn(char *); +int d_org(void); +int d_init(WORD); +int d_cargs(void); +int d_undmac(void); +int d_regbank0(void); +int d_regbank1(void); +int d_incbin(void); +int d_noclear(void); +int d_equrundef(void); +int d_ccundef(void); +int d_print(void); +int d_gpumain(void); +int d_jpad(void); +int d_nojpad(void); +int d_fail(void); +int d_cstruct(void); +int d_prgflags(void); +int d_opt(void); +int d_dsp(void); +void SetLargestAlignment(int); // Directive handler table int (*dirtab[])() = { d_org, // 0 org d_even, // 1 even - d_unimpl, // 2 .6502 + d_6502, // 2 .6502 d_68000, // 3 .68000 d_bss, // 4 bss d_data, // 5 data @@ -77,8 +132,8 @@ int (*dirtab[])() = { d_title, // 44 title d_subttl, // 45 subttl eject, // 46 eject - d_unimpl, // 47 error - d_unimpl, // 48 warn + d_error, // 47 error + d_warn, // 48 warn d_noclear, // 49 .noclear d_equrundef, // 50 .equrundef/.regundef d_ccundef, // 51 .ccundef @@ -88,20 +143,83 @@ int (*dirtab[])() = { d_nojpad, // 55 .nojpad (deprecated) d_gpumain, // 56 .gpumain (deprecated) d_prgflags, // 57 .prgflags + d_68020, // 58 .68020 + d_68030, // 59 .68030 + d_68040, // 60 .68040 + d_68060, // 61 .68060 + d_68881, // 62 .68881 + d_68882, // 63 .68882 + d_56001, // 64 .56001 + d_nofpu, // 65 nofpu + d_opt, // 58 .opt }; +// +// Set the largest alignment seen in the current section +// +void SetLargestAlignment(int size) +{ + if ((scattr & TEXT) && (largestAlign[0] < size)) + largestAlign[0] = size; + else if ((scattr & DATA) && (largestAlign[1] < size)) + largestAlign[1] = size; + else if ((scattr & BSS) && (largestAlign[2] < size)) + largestAlign[2] = size; +} + + +// +// .error - Abort compilation, printing an error message +// +int d_error(char *str) +{ + if (*tok == EOL) + return error("error directive encountered - aborting assembling"); + else + { + switch(*tok) + { + case STRING: + return error(string[tok[1]]); + break; + default: + return error("error directive encountered--aborting assembly"); + } + } +} + + +// +// .warn - Just display a warning on screen +// +int d_warn(char *str) +{ + if (*tok == EOL) + return warn("WARNING WARNING WARNING"); + else + { + switch(*tok) + { + case STRING: + return warn(string[tok[1]]); + break; + default: + return warn("WARNING WARNING WARNING"); + } + } +} + + // // .org - Set origin // int d_org(void) { - VALUE address; + uint64_t address; - if (!rgpu && !rdsp) - return error(".org permitted only in gpu/dsp section"); - - orgaddr = 0; + if (!rgpu && !rdsp && !m6502) + return error(".org permitted only in gpu/dsp and 6502 sections"); if (abs_expr(&address) == ERROR) { @@ -109,9 +227,32 @@ int d_org(void) return ERROR; } - orgaddr = address; - orgactive = 1; -//printf("ORG: address = $%08X...\n", orgaddr); + if (rgpu | rdsp) + { + orgaddr = address; + orgactive = 1; + } + else + { + // 6502. We also kludge `lsloc' so the listing generator doesn't try + // to spew out megabytes. + if (address > 0xFFFF) + return error(range_error); + + if (sloc != currentorg[0]) + { + currentorg[1] = sloc; + currentorg += 2; + } + + currentorg[0] = address; + ch_size = 0; + lsloc = sloc = address; + chptr = scode->chptr + address; + orgaddr = address; + orgactive = 1; + at_eol(); + } return 0; } @@ -128,7 +269,7 @@ int d_print(void) int wordlong = 0; // WORD = 0, LONG = 1 int outtype = 0; // 0:hex, 1:decimal, 2:unsigned - VALUE eval; // Expression value + uint64_t eval; // Expression value WORD eattr; // Expression attributes SYM * esym; // External symbol involved in expr. TOKEN r_expr[EXPRSIZE]; @@ -141,7 +282,7 @@ int d_print(void) sprintf(prntstr, "%s", string[tok[1]]); printf("%s", prntstr); - if (list_fd) + if (list_fd) unused = write(list_fd, prntstr, (LONG)strlen(prntstr)); tok += 2; @@ -179,9 +320,9 @@ int d_print(void) { switch(outtype) { - case 0: strcpy(format, "%X"); break; - case 1: strcpy(format, "%d" ); break; - case 2: strcpy(format, "%u" ); break; + case 0: strcpy(format, "%X"); break; + case 1: strcpy(format, "%d" ); break; + case 2: strcpy(format, "%u" ); break; } if (wordlong) @@ -191,7 +332,7 @@ int d_print(void) printf("%s", prntstr); - if (list_fd) + if (list_fd) unused = write(list_fd, prntstr, (LONG)strlen(prntstr)); formatting = 0; @@ -298,7 +439,7 @@ int d_noclear(void) } -// +// // Include binary file // int d_incbin(void) @@ -306,12 +447,13 @@ int d_incbin(void) int fd; int bytes = 0; long pos, size, bytesRead; - char msg[256]; + char buf1[256]; + int i; // Check to see if we're in BSS, and, if so, throw an error if (scattr & SBSS) { - errors("cannot include binary file \"%s\" in BSS section", string[tok[1]]); + error("cannot include binary file \"%s\" in BSS section", string[tok[1]]); return ERROR; } @@ -321,12 +463,30 @@ int d_incbin(void) return ERROR; } - if ((fd = open(string[tok[1]], _OPEN_INC)) < 0) + // 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) { - errors("cannot open include binary file (%s)", string[tok[1]]); - return ERROR; + for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++) + { + fd = strlen(buf1); + + // Append path char if necessary + if (fd > 0 && buf1[fd - 1] != SLASHCHAR) + strcat(buf1, SLASHSTRING); + + strcat(buf1, string[tok[1]]); + + if ((fd = open(buf1, _OPEN_INC)) >= 0) + goto allright; + } + + return error("cannot open: \"%s\"", string[tok[1]]); } +allright: + size = lseek(fd, 0L, SEEK_END); pos = lseek(fd, 0L, SEEK_SET); chcheck(size); @@ -338,8 +498,7 @@ int d_incbin(void) if (bytesRead != size) { - sprintf(msg, "was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size); - error(msg); + error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size); return ERROR; } @@ -357,7 +516,7 @@ int d_incbin(void) } -// +// // Set RISC register banks // int d_regbank0(void) @@ -404,8 +563,11 @@ static inline void SkipBytes(unsigned bytesToSkip) // int d_even(void) { + if (m6502) + return error(in_6502mode); + unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01; - + if (skip) { if ((scattr & SBSS) == 0) @@ -434,6 +596,7 @@ int d_long(void) unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03; unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03; SkipBytes(bytesToSkip); + SetLargestAlignment(4); return 0; } @@ -456,6 +619,7 @@ int d_phrase(void) unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07; unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07; SkipBytes(bytesToSkip); + SetLargestAlignment(8); return 0; } @@ -469,6 +633,7 @@ int d_dphrase(void) unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F; unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F; SkipBytes(bytesToSkip); + SetLargestAlignment(16); return 0; } @@ -482,6 +647,7 @@ int d_qphrase(void) unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F; unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F; SkipBytes(bytesToSkip); + SetLargestAlignment(32); return 0; } @@ -499,13 +665,16 @@ int d_qphrase(void) // void auto_even(void) { - if (scattr & SBSS) - sloc++; // Bump BSS section - else - D_byte(0); // Deposit 0.b in non-BSS + if (cursect != M6502) + { + if (scattr & SBSS) + sloc++; // Bump BSS section + else + D_byte(0); // Deposit 0.b in non-BSS - if (lab_sym != NULL) // Bump label if we have to - lab_sym->svalue++; + if (lab_sym != NULL) // Bump label if we have to + lab_sym->svalue++; + } } @@ -518,10 +687,10 @@ int d_unimpl(void) } -// +// // Return absolute (not TDB) and defined expression or return an error // -int abs_expr(VALUE * a_eval) +int abs_expr(uint64_t * a_eval) { WORD eattr; @@ -579,7 +748,7 @@ int d_include(void) char buf[128]; char buf1[128]; - if (*tok == STRING) // Leave strings ALONE + if (*tok == STRING) // Leave strings ALONE fn = string[*++tok]; else if (*tok == SYMBOL) // Try to append ".s" to symbols { @@ -587,24 +756,25 @@ int d_include(void) fext(buf, ".s", 0); fn = &buf[0]; } - else // Punt if no STRING or SYMBOL + else // Punt if no STRING or SYMBOL return error("missing filename"); // Make sure the user didn't try anything like: // .include equates.s if (*++tok != EOL) - return error("extra stuff after filename -- enclose it in quotes"); + return error("extra stuff after filename--enclose it in quotes"); // 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. + // the "-i" option. if ((j = open(fn, 0)) < 0) { for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++) { j = strlen(buf1); - if (j > 0 && buf1[j - 1] != SLASHCHAR) // Append path char if necessary + // Append path char if necessary + if (j > 0 && buf1[j - 1] != SLASHCHAR) strcat(buf1, SLASHSTRING); strcat(buf1, fn); @@ -613,7 +783,7 @@ int d_include(void) goto allright; } - return errors("cannot open: \"%s\"", fn); + return error("cannot open: \"%s\"", fn); } allright: @@ -628,7 +798,7 @@ allright: int d_assert(void) { WORD eattr; - VALUE eval; + uint64_t eval; for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok) { @@ -664,7 +834,7 @@ int globl1(char * p) sy->sattr = GLOBAL; //printf("glob1: Making global symbol: attr=%04X, eattr=%08X, %s\n", sy->sattr, sy->sattre, sy->sname); } - else + else sy->sattr |= GLOBAL; return OK; @@ -673,6 +843,9 @@ int globl1(char * p) int d_globl(void) { + if (m6502) + return error(in_6502mode); + symlist(globl1); return 0; } @@ -683,13 +856,13 @@ int d_globl(void) // int d_prgflags(void) { - VALUE eval; + uint64_t eval; if (*tok == EOL) return error("PRGFLAGS requires value"); else if (abs_expr(&eval) == OK) { - PRGFLAGS=eval; + PRGFLAGS = (uint32_t)eval; return 0; } else @@ -704,7 +877,10 @@ int d_prgflags(void) // int d_abs(void) { - VALUE eval; + uint64_t eval; + + if (m6502) + return error(in_6502mode); SaveSection(); @@ -714,7 +890,7 @@ int d_abs(void) return 0; SwitchSection(ABS); - sloc = eval; + sloc = (uint32_t)eval; return 0; } @@ -726,6 +902,8 @@ int d_text(void) { if (rgpu || rdsp) return error("directive forbidden in gpu/dsp mode"); + else if (m6502) + return error(in_6502mode); if (cursect != TEXT) { @@ -741,6 +919,8 @@ int d_data(void) { if (rgpu || rdsp) return error("directive forbidden in gpu/dsp mode"); + else if (m6502) + return error(in_6502mode); if (cursect != DATA) { @@ -756,6 +936,8 @@ int d_bss(void) { if (rgpu || rdsp) return error("directive forbidden in gpu/dsp mode"); + else if (m6502) + return error(in_6502mode); if (cursect != BSS) { @@ -772,37 +954,43 @@ int d_bss(void) // int d_ds(WORD siz) { -if (verb_flag) - printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); - - VALUE eval; + DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); } - // This gets kind of stupid. This directive is disallowed in normal 68000 - // mode ("for your own good!"), but is permitted for 6502 and Alcyon- - // compatibility modes. For obvious reasons, no auto-even is done in 8-bit - // processor modes. - if (as68_flag == 0 && (scattr & SBSS) == 0) - return error(".ds permitted only in BSS"); + uint64_t eval; - if (siz != SIZB && (sloc & 1)) // Automatic .even - auto_even(); + if (cursect != M6502) + { + if ((siz != SIZB) && (sloc & 1)) // Automatic .even + auto_even(); + } if (abs_expr(&eval) != OK) 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"); + // In non-TDB section (BSS, ABS and M6502) just advance the location // counter appropriately. In TDB sections, deposit (possibly large) chunks - //of zeroed memory.... - if (scattr & SBSS) + // of zeroed memory.... + if ((scattr & SBSS) || cursect == M6502) { - listvalue(eval); + listvalue((uint32_t)eval); eval *= siz; - sloc += eval; - just_bss = 1; // No data deposited (8-bit CPU mode) + sloc += (uint32_t)eval; + + if (cursect == M6502) + chptr += eval; + + just_bss = 1; // No data deposited (8-bit CPU mode) } else { - dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL); + dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL); } at_eol(); @@ -811,23 +999,19 @@ if (verb_flag) // -// dc.b, dc.w / dc, dc.l +// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d // int d_dc(WORD siz) { WORD eattr; - VALUE eval; - WORD tdb; - WORD defined; - LONG i; - char * p; - int movei = 0; // movei flag for dc.i + uint64_t eval; + uint8_t * p; if ((scattr & SBSS) != 0) return error("illegal initialization of section"); // Do an auto_even if it's not BYTE sized (hmm, should we be doing this???) - if ((siz != SIZB) && (sloc & 1)) + if (cursect != M6502 && (siz != SIZB) && (sloc & 1)) auto_even(); // Check to see if we're trying to set LONGS on a non 32-bit aligned @@ -837,24 +1021,38 @@ int d_dc(WORD siz) || (rdsp && (orgaddr >= 0xF1B000) && (orgaddr <= 0xF1CFFFF)))) warn("depositing LONGs on a non-long address in local RAM"); - for(;; ++tok) + for(;; tok++) { // dc.b 'string' [,] ... - if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL)) + if (siz == SIZB && (*tok == STRING || *tok == STRINGA8) && (tok[2] == ',' || tok[2] == EOL)) { - i = strlen(string[tok[1]]); + uint32_t i = strlen(string[tok[1]]); - if ((challoc - ch_size) < i) + if ((challoc - ch_size) < i) chcheck(i); - for(p=string[tok[1]]; *p!=EOS; ++p) - D_byte(*p); + if (*tok == STRING) + { + for(p=string[tok[1]]; *p!=EOS; p++) + D_byte(*p); + } + else if(*tok == STRINGA8) + { + for(p=string[tok[1]]; *p!=EOS; p++) + D_byte(strtoa8[*p]); + } + else + { + error("String format not supported... yet"); + } tok += 2; goto comma; } - if (*tok == 'I') + int movei = 0; // MOVEI flag for dc.i + + if (*tok == DOTI) { movei = 1; tok++; @@ -862,11 +1060,13 @@ int d_dc(WORD siz) } // dc.x - if (expr(exprbuf, &eval, &eattr, NULL) != OK) + SYM * esym = 0; + + if (expr(exprbuf, &eval, &eattr, &esym) != OK) return 0; - tdb = (WORD)(eattr & TDB); - defined = (WORD)(eattr & DEFINED); + uint16_t tdb = eattr & TDB; + uint16_t defined = eattr & DEFINED; if ((challoc - ch_size) < 4) chcheck(4); @@ -885,10 +1085,7 @@ int d_dc(WORD siz) return error("non-absolute byte value"); if (eval + 0x100 >= 0x200) - { - sprintf(buffer, "%s (value = $%X)", range_error, eval); - return error(buffer); - } + return error("%s (value = $%X)", range_error, eval); D_byte(eval); } @@ -903,18 +1100,25 @@ int d_dc(WORD siz) } else { - if (tdb) - rmark(cursect, sloc, tdb, MWORD, NULL); - if (eval + 0x10000 >= 0x20000) return error(range_error); - // Deposit 68000 or 6502 (byte-reversed) word - D_word(eval); + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MWORD, NULL); + + // Deposit 68000 or 6502 (byte-reversed) word + if (cursect != M6502) + D_word(eval) + else + D_rword(eval) } break; case SIZL: + // Shamus: Why can't we do longs in 6502 mode? + if (m6502) + return error(in_6502mode); + if (!defined) { if (movei) @@ -927,16 +1131,87 @@ int d_dc(WORD siz) else { if (tdb) - rmark(cursect, sloc, tdb, MLONG, NULL); + MarkRelocatable(cursect, sloc, tdb, MLONG, NULL); - if (movei) - eval = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000); + if (movei) + eval = WORDSWAP32(eval); D_long(eval); } + break; + case SIZQ: + // 64-bit size + if (m6502) + return error(in_6502mode); + + // Shamus: We only handle DC.Q type stuff, will have to add fixups + // and stuff later (maybe... might not be needed...) + D_quad(eval); + break; + case SIZS: + if (m6502) + return error(in_6502mode); + + if (!defined) + { + float vv = 0; + AddFixup(FU_FLOATSING, sloc, exprbuf); + + D_single(vv); + } + else + { + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL); + + D_single(eval); + } + + break; + case SIZD: + if (m6502) + return error(in_6502mode); + + if (!defined) + { + double vv = 0; + AddFixup(FU_FLOATDOUB, sloc, exprbuf); + + D_double(vv); + } + else + { + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL); + + double vv = *(double *)&eval; + D_double(vv); + } + + break; + case SIZX: + if (m6502) + return error(in_6502mode); + + if (!defined) + { + double vv = 0; + AddFixup(FU_FLOATEXT, sloc, exprbuf); + + D_extend(vv); + } + else + { + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL); + + float vv = *(double *)&eval; + D_extend(vv); + } + break; } - + comma: if (*tok != ',') break; @@ -952,9 +1227,11 @@ comma: // int d_dcb(WORD siz) { - VALUE evalc, eval; + uint64_t evalc, eval; WORD eattr; + DEBUG { printf("dcb: section is %s%s%s (scattr=$%X)\n", (cursect & TEXT ? "TEXT" : ""), (cursect & DATA ? " DATA" : ""), (cursect & BSS ? "BSS" : ""), scattr); } + if ((scattr & SBSS) != 0) return error("illegal initialization of section"); @@ -967,19 +1244,19 @@ int d_dcb(WORD siz) if (expr(exprbuf, &eval, &eattr, NULL) < 0) return 0; - if ((siz != SIZB) && (sloc & 1)) + if (cursect != M6502 && (siz != SIZB) && (sloc & 1)) auto_even(); - dep_block(evalc, siz, eval, eattr, exprbuf); + dep_block((uint32_t)evalc, siz, (uint32_t)eval, eattr, exprbuf); return 0; } // // Generalized initialization directive -// +// // .init[.siz] [#count,] expression [.size] , ... -// +// // The size suffix on the ".init" directive becomes the default size of the // objects to deposit. If an item is preceeded with a sharp (immediate) sign // and an expression, it specifies a repeat count. The value to be deposited @@ -987,8 +1264,8 @@ int d_dcb(WORD siz) // int d_init(WORD def_siz) { - VALUE count; - VALUE eval; + uint64_t count; + uint64_t eval; WORD eattr; WORD siz; @@ -1003,7 +1280,7 @@ int d_init(WORD def_siz) // Get repeat count (defaults to 1) if (*tok == '#') { - ++tok; + tok++; if (abs_expr(&count) != OK) return 0; @@ -1018,25 +1295,25 @@ int d_init(WORD def_siz) if (expr(exprbuf, &eval, &eattr, NULL) < 0) return 0; - switch ((int)*tok++) + switch (*tok++) { // Determine size of object to deposit case DOTB: siz = SIZB; break; case DOTW: siz = SIZB; break; case DOTL: siz = SIZL; break; - default: + default: siz = def_siz; - --tok; + tok--; break; } - dep_block(count, siz, eval, eattr, exprbuf); + dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf); - switch ((int)*tok) + switch (*tok) { case EOL: return 0; case ',': - ++tok; + tok++; continue; default: return error(comma_error); @@ -1048,7 +1325,7 @@ int d_init(WORD def_siz) // // Deposit 'count' values of size 'siz' in the current (non-BSS) segment // -int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf) +int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKEN * exprbuf) { WORD tdb; WORD defined; @@ -1091,17 +1368,24 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf) else { if (tdb) - rmark(cursect, sloc, tdb, MWORD, NULL); + MarkRelocatable(cursect, sloc, tdb, MWORD, NULL); if (eval + 0x10000 >= 0x20000) return error(range_error); // Deposit 68000 or 6502 (byte-reversed) word - D_word(eval); + if (cursect != M6502) + D_word(eval) + else + D_rword(eval) + } break; case SIZL: + if (m6502) + return error(in_6502mode); + if (!defined) { AddFixup(FU_LONG, sloc, exprbuf); @@ -1110,7 +1394,7 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf) else { if (tdb) - rmark(cursect, sloc, tdb, MLONG, NULL); + MarkRelocatable(cursect, sloc, tdb, MLONG, NULL); D_long(eval); } @@ -1130,7 +1414,10 @@ int d_comm(void) { SYM * sym; char * p; - VALUE eval; + uint64_t eval; + + if (m6502) + return error(in_6502mode); if (*tok != SYMBOL) return error("missing symbol"); @@ -1157,7 +1444,7 @@ int d_comm(void) if (abs_expr(&eval) != OK) // Parse size of common region return 0; - sym->svalue = eval; // Install common symbol's size + sym->svalue = (uint32_t)eval; // Install common symbol's size at_eol(); return 0; } @@ -1194,14 +1481,102 @@ int d_68000(void) { rgpu = rdsp = 0; // Switching from gpu/dsp sections should reset any ORG'd Address - orgactive = 0; + orgactive = 0; orgwarning = 0; SaveSection(); SwitchSection(TEXT); + activecpu = CPU_68000; + return 0; +} + + +// +// .68020 - Back to 68000 TEXT segment and select 68020 +// +int d_68020(void) +{ + d_68000(); + activecpu = CPU_68020; return 0; } +// +// .68030 - Back to 68000 TEXT segment and select 68030 +// +int d_68030(void) +{ + d_68000(); + activecpu = CPU_68030; + return 0; +} + + +// +// .68040 - Back to 68000 TEXT segment and select 68040 +// +int d_68040(void) +{ + d_68000(); + activecpu = CPU_68040; + activefpu = FPU_68040; + return 0; +} + + +// +// .68060 - Back to 68000 TEXT segment and select 68060 +// +int d_68060(void) +{ + d_68000(); + activecpu = CPU_68060; + activefpu = FPU_68040; + return 0; +} + + +// +// .68881 - Back to 68000 TEXT segment and select 68881 FPU +// +int d_68881(void) +{ + d_68000(); + activefpu = FPU_68881; + return 0; +} + + +// +// .68882 - Back to 68000 TEXT segment and select 68882 FPU +// +int d_68882(void) +{ + d_68000(); + activefpu = FPU_68881; + return 0; +} + + +// +// nofpu - Deselect FPUs. +// +int d_nofpu(void) +{ + activefpu = FPU_NONE; + return 0; +} + + +// +// DSP56001 +// +int d_56001(void) +{ + return error("Not yet, child. Be patient."); +} + + // // .gpu - Switch to GPU assembler // @@ -1213,14 +1588,12 @@ int d_gpu(void) return ERROR; } - // If previous section was dsp or 68000 then we need to reset ORG'd Addresses + // If previous section was DSP or 68000 then we need to reset ORG'd Addresses if (!rgpu) { -//printf("Resetting ORG...\n"); orgactive = 0; orgwarning = 0; } -//else printf("NOT resetting ORG!\n"); rgpu = 1; // Set GPU assembly rdsp = 0; // Unset DSP assembly @@ -1256,17 +1629,17 @@ int d_dsp(void) // // .cargs [#offset], symbol[.size], ... -// +// // Lists of registers may also be mentioned; they just take up space. Good for // "documentation" purposes: -// +// // .cargs a6, .arg1, .arg2, .arg3... -// +// // Symbols thus created are ABS and EQUATED. // int d_cargs(void) { - VALUE eval = 4; // Default to 4 if no offset specified (to account for + uint64_t eval = 4; // Default to 4 if no offset specified (to account for // return address) WORD rlist; SYM * symbol; @@ -1305,13 +1678,13 @@ int d_cargs(void) symbol->sattr = 0; } else if (symbol->sattr & DEFINED) - return errors("multiply-defined label '%s'", p); + return error("multiply-defined label '%s'", p); // Put symbol in "order of definition" list AddToSymbolDeclarationList(symbol); symbol->sattr |= (ABS | DEFINED | EQUATED); - symbol->svalue = eval; + symbol->svalue = (uint32_t)eval; tok += 2; // What this does is eat any dot suffixes attached to a symbol. If @@ -1369,19 +1742,19 @@ int d_cargs(void) // // .cstruct [#offset], symbol[.size], ... -// +// // Lists of registers may also be mentioned; they just take up space. Good for // "documentation" purposes: -// +// // .cstruct a6, .arg1, .arg2, .arg3... -// +// // Symbols thus created are ABS and EQUATED. Note that this is for // compatibility with VBCC and the Remover's library. Thanks to GroovyBee for // the suggestion. // int d_cstruct(void) { - VALUE eval = 0; // Default, if no offset specified, is zero + uint64_t eval = 0; // Default, if no offset specified, is zero WORD rlist; SYM * symbol; char * symbolName; @@ -1421,7 +1794,7 @@ int d_cstruct(void) symbol->sattr = 0; } else if (symbol->sattr & DEFINED) - return errors("multiply-defined label '%s'", symbolName); + return error("multiply-defined label '%s'", symbolName); // Put symbol in "order of definition" list AddToSymbolDeclarationList(symbol); @@ -1438,7 +1811,7 @@ int d_cstruct(void) } symbol->sattr |= (ABS | DEFINED | EQUATED); - symbol->svalue = eval; + symbol->svalue = (uint32_t)eval; // Check for dot suffixes and adjust space accordingly (longs and // words on an odd boundary get bumped to the next word aligned @@ -1507,7 +1880,6 @@ int undmac1(char * p) SYM * symbol = lookup(p, MACRO, 0); // If the macro symbol exists, cause it to disappear -// if ((sy = lookup(p, MACRO, 0)) != NULL) if (symbol != NULL) symbol->stype = (BYTE)SY_UNDEF; @@ -1541,3 +1913,101 @@ int d_gpumain(void) return error("What the hell? Do you think we adhere to the Goof standard?"); } + +// +// .opt - turn a specific (or all) optimisation on or off +// +int d_opt(void) +{ + while (*tok != EOL) + { + if (*tok == STRING) + { + tok++; + char * tmpstr = string[*tok++]; + + if (ParseOptimization(tmpstr) != OK) + return error("unknown optimization flag '%s'", tmpstr); + } + else + return error(".opt directive needs every switch enclosed inside quotation marks"); + } + + return OK; +} + + +// +// .if, Start conditional assembly +// +int d_if(void) +{ + WORD eattr; + uint64_t eval; + SYM * esym; + IFENT * rif = f_ifent; + + // Alloc an IFENTRY + if (rif == NULL) + rif = (IFENT *)malloc(sizeof(IFENT)); + else + f_ifent = rif->if_prev; + + rif->if_prev = ifent; + ifent = rif; + + if (!disabled) + { + if (expr(exprbuf, &eval, &eattr, &esym) != OK) + return 0; + + if ((eattr & DEFINED) == 0) + return error(undef_error); + + disabled = !eval; + } + + rif->if_state = (WORD)disabled; + return 0; +} + + +// +// .else, Do alternate case for .if +// +int d_else(void) +{ + IFENT * rif = ifent; + + if (rif->if_prev == NULL) + return error("mismatched .else"); + + if (disabled) + disabled = rif->if_prev->if_state; + else + disabled = 1; + + rif->if_state = (WORD)disabled; + return 0; +} + + +// +// .endif, End of conditional assembly block +// This is also called by fpop() to pop levels of IFENTs in case a macro or +// include file exits early with `exitm' or `end'. +// +int d_endif(void) +{ + IFENT * rif = ifent; + + if (rif->if_prev == NULL) + return error("mismatched .endif"); + + ifent = rif->if_prev; + disabled = rif->if_prev->if_state; + rif->if_prev = f_ifent; + f_ifent = rif; + return 0; +} +