X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=d535c4842b40870f794dfeb424e28093b96c6dea;hp=6a41e82ed9991b9b9a5cd6f8506f42b5b0494b7d;hb=f3c7d186a15b89c39e360b9cc89545a0d24bd6a4;hpb=ff2052bcaa1428a33a202822a81a6f9b8e567ef4 diff --git a/direct.c b/direct.c index 6a41e82..d535c48 100644 --- a/direct.c +++ b/direct.c @@ -1,13 +1,14 @@ // -// 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, 2017 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 "6502.h" +#include "amode.h" #include "error.h" #include "expr.h" #include "listing.h" @@ -19,18 +20,33 @@ #include "sect.h" #include "symbol.h" #include "token.h" +#include "math.h" +#include "sect.h" #define DEF_KW #include "kwtab.h" -TOKEN exprbuf[128]; // Expression buffer +// N.B.: It's perfectly fine to keep exprbuf as an array of TOKENS and to cast +// to a TOKENPTR where needed. But this works too. :-P +TOKEN _exprbuf[128]; // Expression buffer +TOKENPTR exprbuf = (TOKENPTR)_exprbuf; // Expression buffer point 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); @@ -66,6 +82,8 @@ 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[])() = { @@ -127,26 +145,48 @@ 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) + if (*tok.u32 == EOL) return error("error directive encountered - aborting assembling"); else { - switch(*tok) + switch(*tok.u32) { case STRING: - return error(string[tok[1]]); + return error(string[tok.u32[1]]); break; default: - return error("error directive encountered - aborting assembling"); + return error("error directive encountered--aborting assembly"); } } } @@ -157,14 +197,14 @@ int d_error(char *str) // int d_warn(char *str) { - if (*tok == EOL) + if (*tok.u32 == EOL) return warn("WARNING WARNING WARNING"); else { - switch(*tok) + switch(*tok.u32) { case STRING: - return warn(string[tok[1]]); + return warn(string[tok.u32[1]]); break; default: return warn("WARNING WARNING WARNING"); @@ -178,7 +218,7 @@ int d_warn(char *str) // int d_org(void) { - VALUE address; + uint64_t address; if (!rgpu && !rdsp && !m6502) return error(".org permitted only in gpu/dsp and 6502 sections"); @@ -231,32 +271,32 @@ 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]; - while (*tok != EOL) + while (*tok.u32 != EOL) { - switch(*tok) + switch(*tok.u32) { case STRING: - sprintf(prntstr, "%s", string[tok[1]]); + sprintf(prntstr, "%s", string[tok.u32[1]]); printf("%s", prntstr); if (list_fd) unused = write(list_fd, prntstr, (LONG)strlen(prntstr)); - tok += 2; + tok.u32 += 2; break; case '/': formatting = 1; - if (tok[1] != SYMBOL) + if (tok.u32[1] != SYMBOL) goto token_err; -// strcpy(prntstr, (char *)tok[2]); - strcpy(prntstr, string[tok[2]]); +// strcpy(prntstr, (char *)tok.u32[2]); + strcpy(prntstr, string[tok.u32[2]]); switch(prntstr[0]) { @@ -270,13 +310,13 @@ int d_print(void) return ERROR; } - tok += 3; + tok.u32 += 3; break; case ',': - tok++; + tok.u32++; break; default: - if (expr(r_expr, &eval, &eattr, &esym) != OK) + if (expr((TOKENPTR)r_expr, &eval, &eattr, &esym) != OK) goto token_err; else { @@ -330,13 +370,13 @@ int d_ccundef(void) return ERROR; } - if (*tok != SYMBOL) + if (*tok.u32 != SYMBOL) { error("syntax error; expected symbol"); return ERROR; } - ccname = lookup(string[tok[1]], LABEL, 0); + ccname = lookup(string[tok.u32[1]], LABEL, 0); // Make sure symbol is a valid ccdef if (!ccname || !(ccname->sattre & EQUATEDCC)) @@ -362,18 +402,18 @@ int d_equrundef(void) if (!rgpu && !rdsp) return error(".equrundef/.regundef must be defined in .gpu/.dsp section"); - while (*tok != EOL) + while (*tok.u32 != EOL) { // Skip preceeding or seperating commas (if any) - if (*tok == ',') - tok++; + if (*tok.u32 == ',') + tok.u32++; // Check we are dealing with a symbol - if (*tok != SYMBOL) + if (*tok.u32 != SYMBOL) return error("syntax error; expected symbol"); // Lookup and undef if equated register - regname = lookup(string[tok[1]], LABEL, 0); + regname = lookup(string[tok.u32[1]], LABEL, 0); if (regname && (regname->sattre & EQUATEDREG)) { @@ -384,7 +424,7 @@ int d_equrundef(void) } // Skip over symbol token and address - tok += 2; + tok.u32 += 2; } return 0; @@ -409,18 +449,17 @@ 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.u32[1]]); return ERROR; } - if (*tok != STRING) + if (*tok.u32 != STRING) { error("syntax error; string missing"); return ERROR; @@ -429,7 +468,7 @@ 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) + if ((fd = open(string[tok.u32[1]], _OPEN_INC)) < 0) { for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++) { @@ -439,13 +478,13 @@ int d_incbin(void) if (fd > 0 && buf1[fd - 1] != SLASHCHAR) strcat(buf1, SLASHSTRING); - strcat(buf1, string[tok[1]]); + strcat(buf1, string[tok.u32[1]]); if ((fd = open(buf1, _OPEN_INC)) >= 0) goto allright; } - return errors("cannot open: \"%s\"", string[tok[1]]); + return error("cannot open: \"%s\"", string[tok.u32[1]]); } allright: @@ -454,15 +493,14 @@ allright: 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[tok.u32[1]], size); } char * fileBuffer = (char *)malloc(size); bytesRead = read(fd, fileBuffer, size); 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.u32[1]], size); return ERROR; } @@ -560,6 +598,7 @@ int d_long(void) unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03; unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03; SkipBytes(bytesToSkip); + SetLargestAlignment(4); return 0; } @@ -582,6 +621,7 @@ int d_phrase(void) unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07; unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07; SkipBytes(bytesToSkip); + SetLargestAlignment(8); return 0; } @@ -595,6 +635,7 @@ int d_dphrase(void) unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F; unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F; SkipBytes(bytesToSkip); + SetLargestAlignment(16); return 0; } @@ -608,6 +649,7 @@ int d_qphrase(void) unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F; unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F; SkipBytes(bytesToSkip); + SetLargestAlignment(32); return 0; } @@ -650,7 +692,7 @@ 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; @@ -676,21 +718,21 @@ int symlist(int(* func)()) for(;;) { - if (*tok != SYMBOL) + if (*tok.u32 != SYMBOL) return error(em); - if ((*func)(string[tok[1]]) != OK) + if ((*func)(string[tok.u32[1]]) != OK) break; - tok += 2; + tok.u32 += 2; - if (*tok == EOL) + if (*tok.u32 == EOL) break; - if (*tok != ',') + if (*tok.u32 != ',') return error(em); - tok++; + tok.u32++; } return 0; @@ -708,11 +750,11 @@ int d_include(void) char buf[128]; char buf1[128]; - if (*tok == STRING) // Leave strings ALONE - fn = string[*++tok]; - else if (*tok == SYMBOL) // Try to append ".s" to symbols + if (*tok.u32 == STRING) // Leave strings ALONE + fn = string[*++tok.u32]; + else if (*tok.u32 == SYMBOL) // Try to append ".s" to symbols { - strcpy(buf, string[*++tok]); + strcpy(buf, string[*++tok.u32]); fext(buf, ".s", 0); fn = &buf[0]; } @@ -721,8 +763,8 @@ int d_include(void) // 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"); + if (*++tok.u32 != EOL) + 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 @@ -743,7 +785,7 @@ int d_include(void) goto allright; } - return errors("cannot open: \"%s\"", fn); + return error("cannot open: \"%s\"", fn); } allright: @@ -758,9 +800,9 @@ allright: int d_assert(void) { WORD eattr; - VALUE eval; + uint64_t eval; - for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok) + for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok.u32) { if (!(eattr & DEFINED)) return error("forward or undefined .assert"); @@ -768,7 +810,7 @@ int d_assert(void) if (!eval) return error("assert failure"); - if (*tok != ',') + if (*tok.u32 != ',') break; } @@ -816,13 +858,13 @@ int d_globl(void) // int d_prgflags(void) { - VALUE eval; + uint64_t eval; - if (*tok == EOL) + if (*tok.u32 == EOL) return error("PRGFLAGS requires value"); else if (abs_expr(&eval) == OK) { - PRGFLAGS=eval; + PRGFLAGS = (uint32_t)eval; return 0; } else @@ -837,20 +879,20 @@ int d_prgflags(void) // int d_abs(void) { - VALUE eval; + uint64_t eval; if (m6502) return error(in_6502mode); SaveSection(); - if (*tok == EOL) + if (*tok.u32 == EOL) eval = 0; else if (abs_expr(&eval) != OK) return 0; SwitchSection(ABS); - sloc = eval; + sloc = (uint32_t)eval; return 0; } @@ -916,7 +958,7 @@ int d_ds(WORD siz) { DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); } - VALUE eval; + uint64_t eval; if (cursect != M6502) { @@ -929,7 +971,9 @@ int d_ds(WORD siz) // 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) - if (eval < 0) + // 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 @@ -937,9 +981,9 @@ int d_ds(WORD siz) // of zeroed memory.... if ((scattr & SBSS) || cursect == M6502) { - listvalue(eval); + listvalue((uint32_t)eval); eval *= siz; - sloc += eval; + sloc += (uint32_t)eval; if (cursect == M6502) chptr += eval; @@ -948,7 +992,7 @@ int d_ds(WORD siz) } else { - dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL); + dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), (TOKENPTR){NULL}); } at_eol(); @@ -957,12 +1001,12 @@ int d_ds(WORD siz) // -// dc.b, dc.w / dc, dc.l, dc.i +// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d // int d_dc(WORD siz) { WORD eattr; - VALUE eval; + uint64_t eval; uint8_t * p; if ((scattr & SBSS) != 0) @@ -979,29 +1023,41 @@ 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.u32++) { // dc.b 'string' [,] ... - if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL)) + if (siz == SIZB && (*tok.u32 == STRING || *tok.u32 == STRINGA8) && (tok.u32[2] == ',' || tok.u32[2] == EOL)) { - uint32_t i = strlen(string[tok[1]]); + uint32_t i = strlen(string[tok.u32[1]]); if ((challoc - ch_size) < i) chcheck(i); - for(p=string[tok[1]]; *p!=EOS; p++) - D_byte(*p); + if (*tok.u32 == STRING) + { + for(p=string[tok.u32[1]]; *p!=EOS; p++) + D_byte(*p); + } + else if(*tok.u32 == STRINGA8) + { + for(p=string[tok.u32[1]]; *p!=EOS; p++) + D_byte(strtoa8[*p]); + } + else + { + error("String format not supported... yet"); + } - tok += 2; + tok.u32 += 2; goto comma; } int movei = 0; // MOVEI flag for dc.i - if (*tok == DOTI) + if (*tok.u32 == DOTI) { movei = 1; - tok++; + tok.u32++; siz = SIZL; } @@ -1027,15 +1083,12 @@ int d_dc(WORD siz) } else { - if (eval + 0x100 >= 0x200) - { - sprintf(buffer, "%s (value = $%X)", range_error, eval); - return error(buffer); - } - if (tdb) return error("non-absolute byte value"); + if (eval + 0x100 >= 0x200) + return error("%s (value = $%X)", range_error, eval); + D_byte(eval); } @@ -1064,6 +1117,7 @@ int d_dc(WORD siz) break; case SIZL: + // Shamus: Why can't we do longs in 6502 mode? if (m6502) return error(in_6502mode); @@ -1086,11 +1140,82 @@ int d_dc(WORD siz) 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 != ',') + if (*tok.u32 != ',') break; } @@ -1104,7 +1229,7 @@ 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); } @@ -1115,7 +1240,7 @@ int d_dcb(WORD siz) if (abs_expr(&evalc) != OK) return 0; - if (*tok++ != ',') + if (*tok.u32++ != ',') return error("missing comma"); if (expr(exprbuf, &eval, &eattr, NULL) < 0) @@ -1124,7 +1249,7 @@ int d_dcb(WORD siz) 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; } @@ -1141,8 +1266,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; @@ -1155,14 +1280,14 @@ int d_init(WORD def_siz) for(;;) { // Get repeat count (defaults to 1) - if (*tok == '#') + if (*tok.u32 == '#') { - ++tok; + tok.u32++; if (abs_expr(&count) != OK) return 0; - if (*tok++ != ',') + if (*tok.u32++ != ',') return error(comma_error); } else @@ -1172,25 +1297,25 @@ int d_init(WORD def_siz) if (expr(exprbuf, &eval, &eattr, NULL) < 0) return 0; - switch ((int)*tok++) + switch (*tok.u32++) { // Determine size of object to deposit case DOTB: siz = SIZB; break; case DOTW: siz = SIZB; break; case DOTL: siz = SIZL; break; default: siz = def_siz; - tok--; + tok.u32--; break; } - dep_block(count, siz, eval, eattr, exprbuf); + dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf); - switch ((int)*tok) + switch (*tok.u32) { case EOL: return 0; case ',': - tok++; + tok.u32++; continue; default: return error(comma_error); @@ -1202,7 +1327,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, TOKENPTR exprbuf) { WORD tdb; WORD defined; @@ -1291,16 +1416,16 @@ int d_comm(void) { SYM * sym; char * p; - VALUE eval; + uint64_t eval; if (m6502) return error(in_6502mode); - if (*tok != SYMBOL) + if (*tok.u32 != SYMBOL) return error("missing symbol"); - p = string[tok[1]]; - tok += 2; + p = string[tok.u32[1]]; + tok.u32 += 2; if (*p == '.') // Cannot .comm a local symbol return error(locgl_error); @@ -1315,13 +1440,13 @@ int d_comm(void) sym->sattr = GLOBAL | COMMON | BSS; - if (*tok++ != ',') + if (*tok.u32++ != ',') return error(comma_error); 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; } @@ -1362,10 +1487,98 @@ int d_68000(void) 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 // @@ -1377,14 +1590,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 @@ -1430,7 +1641,7 @@ int d_dsp(void) // 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; @@ -1441,23 +1652,23 @@ int d_cargs(void) if (rgpu || rdsp) return error("directive forbidden in gpu/dsp mode"); - if (*tok == '#') + if (*tok.u32 == '#') { - tok++; + tok.u32++; if (abs_expr(&eval) != OK) return 0; // Eat the comma, if it's there - if (*tok == ',') - tok++; + if (*tok.u32 == ',') + tok.u32++; } for(;;) { - if (*tok == SYMBOL) + if (*tok.u32 == SYMBOL) { - p = string[tok[1]]; + p = string[tok.u32[1]]; // Set env to either local (dot prefixed) or global scope env = (*p == '.' ? curenv : 0); @@ -1469,30 +1680,30 @@ 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; - tok += 2; + symbol->svalue = (uint32_t)eval; + tok.u32 += 2; // What this does is eat any dot suffixes attached to a symbol. If // it's a .L, it adds 4 to eval; if it's .W or .B, it adds 2. If // there is no dot suffix, it assumes a size of 2. - switch ((int)*tok) + switch ((int)*tok.u32) { case DOTL: eval += 2; case DOTB: case DOTW: - tok++; + tok.u32++; } eval += 2; } - else if (*tok >= KW_D0 && *tok <= KW_A7) + else if (*tok.u32 >= KW_D0 && *tok.u32 <= KW_A7) { if (reglist(&rlist) < 0) return 0; @@ -1505,7 +1716,7 @@ int d_cargs(void) } else { - switch ((int)*tok) + switch ((int)*tok.u32) { case KW_USP: case KW_SSP: @@ -1515,7 +1726,7 @@ int d_cargs(void) case KW_SR: case KW_CCR: eval += 2; - tok++; + tok.u32++; break; case EOL: return 0; @@ -1525,8 +1736,8 @@ int d_cargs(void) } // Eat commas in between each argument, if they exist - if (*tok == ',') - tok++; + if (*tok.u32 == ',') + tok.u32++; } } @@ -1545,7 +1756,7 @@ int d_cargs(void) // 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; @@ -1555,23 +1766,23 @@ int d_cstruct(void) if (rgpu || rdsp) return error("directive forbidden in gpu/dsp mode"); - if (*tok == '#') + if (*tok.u32 == '#') { - tok++; + tok.u32++; if (abs_expr(&eval) != OK) return 0; // Eat the comma, if it's there - if (*tok == ',') - tok++; + if (*tok.u32 == ',') + tok.u32++; } for(;;) { - if (*tok == SYMBOL) + if (*tok.u32 == SYMBOL) { - symbolName = string[tok[1]]; + symbolName = string[tok.u32[1]]; // Set env to either local (dot prefixed) or global scope env = (symbolName[0] == '.' ? curenv : 0); @@ -1585,16 +1796,16 @@ 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); - tok += 2; + tok.u32 += 2; // Adjust label start address if it's a word or a long, as a byte // label might have left us on an odd address. - switch ((int)*tok) + switch ((int)*tok.u32) { case DOTW: case DOTL: @@ -1602,12 +1813,12 @@ 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 // address). If no suffix, then throw an error. - switch ((int)*tok) + switch ((int)*tok.u32) { case DOTL: eval += 4; @@ -1622,9 +1833,9 @@ int d_cstruct(void) return error("Symbol missing dot suffix in .cstruct construct"); } - tok++; + tok.u32++; } - else if (*tok >= KW_D0 && *tok <= KW_A7) + else if (*tok.u32 >= KW_D0 && *tok.u32 <= KW_A7) { if (reglist(&rlist) < 0) return 0; @@ -1637,7 +1848,7 @@ int d_cstruct(void) } else { - switch ((int)*tok) + switch ((int)*tok.u32) { case KW_USP: case KW_SSP: @@ -1647,7 +1858,7 @@ int d_cstruct(void) case KW_SR: case KW_CCR: eval += 2; - tok++; + tok.u32++; break; case EOL: return 0; @@ -1657,8 +1868,8 @@ int d_cstruct(void) } // Eat commas in between each argument, if they exist - if (*tok == ',') - tok++; + if (*tok.u32 == ',') + tok.u32++; } } @@ -1710,19 +1921,15 @@ int d_gpumain(void) // int d_opt(void) { - while (*tok != EOL) + while (*tok.u32 != EOL) { - if (*tok == STRING) + if (*tok.u32 == STRING) { - tok++; - char * tmpstr = string[*tok++]; + tok.u32++; + char * tmpstr = string[*tok.u32++]; if (ParseOptimization(tmpstr) != OK) - { - char temperr[256]; - sprintf(temperr, "unknown optimization flag '%s'", tmpstr); - return error(temperr); - } + return error("unknown optimization flag '%s'", tmpstr); } else return error(".opt directive needs every switch enclosed inside quotation marks"); @@ -1731,3 +1938,78 @@ int d_opt(void) 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; +} +