X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=b2e67998e863a7a216e16b8b8b4f2bd8dd39599d;hp=6f94402c4c0502564942368273a17cac1b0781eb;hb=60f204cb9e3905100da0d89f14bb40db764acd9e;hpb=b10167d55798ea184f97fafda075255c0852f3b6 diff --git a/direct.c b/direct.c index 6f94402..b2e6799 100644 --- a/direct.c +++ b/direct.c @@ -1,9 +1,9 @@ // // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System // DIRECT.C - Directive Handling -// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 -// Source Utilised with the Kind Permission of Landon Dyer +// Source utilised with the kind permission of Landon Dyer // #include "direct.h" @@ -22,9 +22,10 @@ #include "kwtab.h" -TOKEN exprbuf[128]; // Expression buffer +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 // Directive handler table @@ -32,60 +33,107 @@ int (*dirtab[])() = { d_org, // 0 org d_even, // 1 even d_unimpl, // 2 .6502 - d_68000, // 3 .68000 + d_68000, // 3 .68000 d_bss, // 4 bss - d_data, // 5 data - d_text, // 6 text - d_abs, // 7 abs - d_comm, // 8 comm - d_init, // 9 init - d_cargs, // 10 cargs - d_goto, // 11 goto - d_dc, // 12 dc - d_ds, // 13 ds - d_undmac, // 14 undefmac + d_data, // 5 data + d_text, // 6 text + d_abs, // 7 abs + d_comm, // 8 comm + (void *)d_init, // 9 init + d_cargs, // 10 cargs + (void *)d_goto, // 11 goto + (void *)d_dc, // 12 dc + (void *)d_ds, // 13 ds + d_undmac, // 14 undefmac d_gpu, // 15 .gpu d_dsp, // 16 .dsp - d_dcb, // 17 dcb - d_unimpl, // 18* set - d_unimpl, // 19* reg - d_unimpl, // 20 dump - d_incbin, // 21 .incbin //load - d_unimpl, // 22 disable - d_unimpl, // 23 enable - d_globl, // 24 globl + (void *)d_dcb, // 17 dcb + d_unimpl, // 18* set + d_unimpl, // 19* reg + d_unimpl, // 20 dump + d_incbin, // 21 .incbin //load + d_unimpl, // 22 disable + d_unimpl, // 23 enable + d_globl, // 24 globl d_regbank0, // 25 .regbank0 d_regbank1, // 26 .regbank1 - d_unimpl, // 27 xdef - d_assert, // 28 assert - d_unimpl, // 29* if - d_unimpl, // 30* endif - d_unimpl, // 31* endc - d_unimpl, // 32* iif - d_include, // 33 include - fpop, // 34 end - d_unimpl, // 35* macro - ExitMacro, // 36* exitm - d_unimpl, // 37* endm - d_list, // 38 list - d_nlist, // 39 nlist - d_long, // 40* rept - d_phrase, // 41* endr - d_dphrase, // 42 struct - d_qphrase, // 43 ends - d_title, // 44 title - d_subttl, // 45 subttl - eject, // 46 eject - d_unimpl, // 47 error - d_unimpl, // 48 warn + d_unimpl, // 27 xdef + d_assert, // 28 assert + d_unimpl, // 29* if + d_unimpl, // 30* endif + d_unimpl, // 31* endc + d_unimpl, // 32* iif + d_include, // 33 include + fpop, // 34 end + d_unimpl, // 35* macro + ExitMacro, // 36* exitm + d_unimpl, // 37* endm + d_list, // 38 list + d_nlist, // 39 nlist + d_long, // 40* rept + d_phrase, // 41* endr + d_dphrase, // 42 struct + d_qphrase, // 43 ends + d_title, // 44 title + d_subttl, // 45 subttl + eject, // 46 eject + d_error, // 47 error + d_warn, // 48 warn d_noclear, // 49 .noclear d_equrundef, // 50 .equrundef/.regundef d_ccundef, // 51 .ccundef d_print, // 52 .print d_cstruct, // 53 .cstruct + d_jpad, // 54 .jpad (deprecated) + d_nojpad, // 55 .nojpad (deprecated) + d_gpumain, // 56 .gpumain (deprecated) + d_prgflags, // 57 .prgflags + d_opt, // 58 .opt }; +// +// .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 assembling"); + } + } +} + + +// +// .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 // @@ -93,7 +141,7 @@ int d_org(void) { VALUE address; - if (!rgpu && !rdsp) + if (!rgpu && !rdsp) return error(".org permitted only in gpu/dsp section"); orgaddr = 0; @@ -105,26 +153,27 @@ int d_org(void) } orgaddr = address; - orgactive = 1; + orgactive = 1; +//printf("ORG: address = $%08X...\n", orgaddr); return 0; } // -// Print Directive +// Print directive // int d_print(void) { - char prntstr[LNSIZ]; // String for PRINT directive - char format[LNSIZ]; // Format for PRINT directive - int formatting = 0; // Formatting on/off - int wordlong = 0; // WORD = 0, LONG = 1 - int outtype = 0; // 0:hex, 1:decimal, 2:unsigned - - VALUE eval; // Expression value - WORD eattr; // Expression attributes - SYM * esym; // External symbol involved in expr. + char prntstr[LNSIZ]; // String for PRINT directive + char format[LNSIZ]; // Format for PRINT directive + int formatting = 0; // Formatting on/off + int wordlong = 0; // WORD = 0, LONG = 1 + int outtype = 0; // 0:hex, 1:decimal, 2:unsigned + + VALUE eval; // Expression value + WORD eattr; // Expression attributes + SYM * esym; // External symbol involved in expr. TOKEN r_expr[EXPRSIZE]; while (*tok != EOL) @@ -132,11 +181,10 @@ int d_print(void) switch(*tok) { case STRING: -// sprintf(prntstr, "%s", (char *)tok[1]); 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; @@ -174,9 +222,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) @@ -186,7 +234,7 @@ int d_print(void) printf("%s", prntstr); - if (list_fd) + if (list_fd) unused = write(list_fd, prntstr, (LONG)strlen(prntstr)); formatting = 0; @@ -199,7 +247,6 @@ int d_print(void) } printf("\n"); - println("\n"); return 0; @@ -210,7 +257,7 @@ token_err: // -// Undefine an Equated Condition Code +// Undefine an equated condition code // int d_ccundef(void) { @@ -225,11 +272,10 @@ int d_ccundef(void) if (*tok != SYMBOL) { - error(syntax_error); + error("syntax error; expected symbol"); return ERROR; } -// ccname = lookup((char *)tok[1], LABEL, 0); ccname = lookup(string[tok[1]], LABEL, 0); // Make sure symbol is a valid ccdef @@ -246,7 +292,7 @@ int d_ccundef(void) // -// Undefine an Equated Register +// Undefine an equated register // int d_equrundef(void) { @@ -254,10 +300,7 @@ int d_equrundef(void) // Check that we are in a RISC section if (!rgpu && !rdsp) - { - error(".equrundef/.regundef must be defined in .gpu/.dsp section"); - return ERROR; - } + return error(".equrundef/.regundef must be defined in .gpu/.dsp section"); while (*tok != EOL) { @@ -267,17 +310,18 @@ int d_equrundef(void) // Check we are dealing with a symbol if (*tok != SYMBOL) - { - error(syntax_error); - return ERROR; - } + return error("syntax error; expected symbol"); // Lookup and undef if equated register -// regname = lookup((char *)tok[1], LABEL, 0); regname = lookup(string[tok[1]], LABEL, 0); if (regname && (regname->sattre & EQUATEDREG)) + { + // Reset the attributes of this symbol... + regname->sattr = 0; + regname->sattre &= ~(EQUATEDREG | BANK_0 | BANK_1); regname->sattre |= UNDEF_EQUR; + } // Skip over symbol token and address tok += 2; @@ -288,16 +332,17 @@ int d_equrundef(void) // -// Do Not Allow the Use of the CLR.L Opcode +// Do not allow use of the CLR.L opcode // int d_noclear(void) { + warn("CLR.L opcode ignored..."); return 0; } -// -// Include Binary File +// +// Include binary file // int d_incbin(void) { @@ -305,6 +350,8 @@ int d_incbin(void) 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) @@ -315,16 +362,34 @@ int d_incbin(void) if (*tok != STRING) { - error(syntax_error); + error("syntax error; string missing"); 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 errors("cannot open: \"%s\"", string[tok[1]]); } +allright: + size = lseek(fd, 0L, SEEK_END); pos = lseek(fd, 0L, SEEK_SET); chcheck(size); @@ -341,7 +406,6 @@ int d_incbin(void) return ERROR; } -//#define D_byte(b) {*chptr++=(char)b; ++sloc; ++ch_size; if(orgactive) ++orgaddr;} memcpy(chptr, fileBuffer, size); chptr += size; sloc += size; @@ -356,8 +420,8 @@ int d_incbin(void) } -// -// Set RISC Register Banks +// +// Set RISC register banks // int d_regbank0(void) { @@ -376,54 +440,48 @@ int d_regbank1(void) // -// Adjust Location to an EVEN Value +// Helper function, to cut down on mistakes & typing // -int d_even(void) +static inline void SkipBytes(unsigned bytesToSkip) { - if (sloc & 1) + if (!bytesToSkip) + return; + + if ((scattr & SBSS) == 0) { - if ((scattr & SBSS) == 0) - { - chcheck(1); - D_byte(0); - } - else - { - ++sloc; - } + chcheck(bytesToSkip); + D_ZEROFILL(bytesToSkip); } + else + { + sloc += bytesToSkip; - return 0; + if (orgactive) + orgaddr += bytesToSkip; + } } // -// Adjust Location to an LONG Value +// Adjust location to an EVEN value // -int d_long(void) +int d_even(void) { - unsigned i; - unsigned val = 4; - - i = sloc & ~(val - 1); + unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01; - if (i != sloc) - val = val - (sloc - i); - else - val = 0; - - if (val) + if (skip) { if ((scattr & SBSS) == 0) { - chcheck(val); - - for(i=0; isvalue; + if (lab_sym != NULL) // Bump label if we have to + lab_sym->svalue++; } // -// Unimplemened Directive Error +// Unimplemened directive error // int d_unimpl(void) { @@ -563,7 +581,7 @@ int d_unimpl(void) } -// +// // Return absolute (not TDB) and defined expression or return an error // int abs_expr(VALUE * a_eval) @@ -588,18 +606,14 @@ int abs_expr(VALUE * a_eval) // int symlist(int(* func)()) { - char * em = "symbol list syntax"; + const char * em = "symbol list syntax"; for(;;) { if (*tok != SYMBOL) return error(em); -#if 0 - if ((*func)(tok[1]) != OK) -#else if ((*func)(string[tok[1]]) != OK) -#endif break; tok += 2; @@ -610,7 +624,7 @@ int symlist(int(* func)()) if (*tok != ',') return error(em); - ++tok; + tok++; } return 0; @@ -628,23 +642,15 @@ int d_include(void) char buf[128]; char buf1[128]; - if (*tok == STRING) // Leave strings ALONE -#if 0 - fn = (char *)*++tok; -#else + if (*tok == STRING) // Leave strings ALONE fn = string[*++tok]; -#endif - else if (*tok == SYMBOL) // Try to append ".s" to symbols + else if (*tok == SYMBOL) // Try to append ".s" to symbols { -#if 0 - strcpy(buf, (char *)*++tok); -#else strcpy(buf, string[*++tok]); -#endif 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: @@ -654,14 +660,15 @@ int d_include(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. + // 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); @@ -709,7 +716,7 @@ int d_assert(void) // int globl1(char * p) { - SYM *sy; + SYM * sy; if (*p == '.') return error("cannot .globl local symbol"); @@ -719,8 +726,9 @@ int globl1(char * p) sy = NewSymbol(p, LABEL, 0); sy->svalue = 0; 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; @@ -734,6 +742,27 @@ int d_globl(void) } +// +// .prgflags expression +// +int d_prgflags(void) +{ + VALUE eval; + + if (*tok == EOL) + return error("PRGFLAGS requires value"); + else if (abs_expr(&eval) == OK) + { + PRGFLAGS=eval; + return 0; + } + else + { + return error("PRGFLAGS requires value"); + } +} + + // // .abs [expression] // @@ -741,23 +770,22 @@ int d_abs(void) { VALUE eval; - savsect(); + SaveSection(); if (*tok == EOL) eval = 0; else if (abs_expr(&eval) != OK) return 0; - switchsect(ABS); + SwitchSection(ABS); sloc = eval; return 0; } // -// Switch Segments +// Switch segments // - int d_text(void) { if (rgpu || rdsp) @@ -765,8 +793,8 @@ int d_text(void) if (cursect != TEXT) { - savsect(); - switchsect(TEXT); + SaveSection(); + SwitchSection(TEXT); } return 0; @@ -780,8 +808,8 @@ int d_data(void) if (cursect != DATA) { - savsect(); - switchsect(DATA); + SaveSection(); + SwitchSection(DATA); } return 0; @@ -795,8 +823,8 @@ int d_bss(void) if (cursect != BSS) { - savsect(); - switchsect(BSS); + SaveSection(); + SwitchSection(BSS); } return 0; @@ -808,8 +836,7 @@ int d_bss(void) // int d_ds(WORD siz) { -if (verb_flag) - printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); + DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); } VALUE eval; @@ -820,21 +847,26 @@ if (verb_flag) if (as68_flag == 0 && (scattr & SBSS) == 0) return error(".ds permitted only in BSS"); - if (siz != SIZB && (sloc & 1)) // Automatic .even + 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) + if (eval < 0) + 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.... + // of zeroed memory.... if (scattr & SBSS) { listvalue(eval); eval *= siz; sloc += eval; - just_bss = 1; // No data deposited (8-bit CPU mode) + just_bss = 1; // No data deposited (8-bit CPU mode) } else { @@ -847,43 +879,48 @@ if (verb_flag) // -// dc.b, dc.w / dc, dc.l +// dc.b, dc.w / dc, dc.l, dc.i // 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 + 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)) auto_even(); - for(;; ++tok) + // Check to see if we're trying to set LONGS on a non 32-bit aligned + // address in a GPU or DSP section, in their local RAM + if ((siz == SIZL) && (orgaddr & 0x03) + && ((rgpu && (orgaddr >= 0xF03000) && (orgaddr <= 0xF03FFFF)) + || (rdsp && (orgaddr >= 0xF1B000) && (orgaddr <= 0xF1CFFFF)))) + warn("depositing LONGs on a non-long address in local RAM"); + + for(;; tok++) { // dc.b 'string' [,] ... if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL)) { -// i = strlen((const char*)tok[1]); - 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) + for(p=string[tok[1]]; *p!=EOS; p++) D_byte(*p); tok += 2; goto comma; } - if (*tok == 'I') + int movei = 0; // MOVEI flag for dc.i + + if (*tok == DOTI) { movei = 1; tok++; @@ -891,11 +928,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); @@ -905,17 +944,20 @@ int d_dc(WORD siz) case SIZB: if (!defined) { - fixup(FU_BYTE | FU_SEXT, sloc, exprbuf); + AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf); D_byte(0); } 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(range_error); - D_byte(eval); } @@ -924,18 +966,18 @@ int d_dc(WORD siz) case SIZN: if (!defined) { - fixup(FU_WORD | FU_SEXT, sloc, exprbuf); + AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf); D_word(0); } else { - if (tdb) - rmark(cursect, sloc, tdb, MWORD, NULL); - if (eval + 0x10000 >= 0x20000) return error(range_error); - // Deposit 68000 or 6502 (byte-reversed) word + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MWORD, NULL); + + // Deposit 68000 or 6502 (byte-reversed) word D_word(eval); } @@ -944,25 +986,25 @@ int d_dc(WORD siz) if (!defined) { if (movei) - fixup(FU_LONG | FU_MOVEI, sloc, exprbuf); + AddFixup(FU_LONG | FU_MOVEI, sloc, exprbuf); else - fixup(FU_LONG, sloc, exprbuf); + AddFixup(FU_LONG, sloc, exprbuf); D_long(0); } 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; } - + comma: if (*tok != ',') break; @@ -981,6 +1023,8 @@ int d_dcb(WORD siz) VALUE 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"); @@ -1003,9 +1047,9 @@ int d_dcb(WORD siz) // // 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 @@ -1049,9 +1093,9 @@ int d_init(WORD def_siz) case DOTB: siz = SIZB; break; case DOTW: siz = SIZB; break; case DOTL: siz = SIZL; break; - default: + default: siz = def_siz; - --tok; + tok--; break; } @@ -1062,7 +1106,7 @@ int d_init(WORD def_siz) case EOL: return 0; case ',': - ++tok; + tok++; continue; default: return error(comma_error); @@ -1092,7 +1136,7 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf) case SIZB: if (!defined) { - fixup(FU_BYTE | FU_SEXT, sloc, exprbuf); + AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf); D_byte(0); } else @@ -1111,13 +1155,13 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf) case SIZN: if (!defined) { - fixup(FU_WORD | FU_SEXT, sloc, exprbuf); + AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf); D_word(0); } else { if (tdb) - rmark(cursect, sloc, tdb, MWORD, NULL); + MarkRelocatable(cursect, sloc, tdb, MWORD, NULL); if (eval + 0x10000 >= 0x20000) return error(range_error); @@ -1130,13 +1174,13 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf) case SIZL: if (!defined) { - fixup(FU_LONG, sloc, exprbuf); + AddFixup(FU_LONG, sloc, exprbuf); D_long(0); } else { if (tdb) - rmark(cursect, sloc, tdb, MLONG, NULL); + MarkRelocatable(cursect, sloc, tdb, MLONG, NULL); D_long(eval); } @@ -1161,7 +1205,6 @@ int d_comm(void) if (*tok != SYMBOL) return error("missing symbol"); -// p = (char *)tok[1]; p = string[tok[1]]; tok += 2; @@ -1221,16 +1264,16 @@ int d_68000(void) { rgpu = rdsp = 0; // Switching from gpu/dsp sections should reset any ORG'd Address - orgactive = 0; + orgactive = 0; orgwarning = 0; - savsect(); - switchsect(TEXT); + SaveSection(); + SwitchSection(TEXT); return 0; } // -// .gpu - Switch to GPU Assembler +// .gpu - Switch to GPU assembler // int d_gpu(void) { @@ -1243,9 +1286,11 @@ int d_gpu(void) // 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 @@ -1255,7 +1300,7 @@ int d_gpu(void) // -// .dsp - Switch to DSP Assembler +// .dsp - Switch to DSP assembler // int d_dsp(void) { @@ -1281,12 +1326,12 @@ 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) @@ -1318,18 +1363,10 @@ int d_cargs(void) { if (*tok == SYMBOL) { -// p = (char *)tok[1]; p = string[tok[1]]; -#if 0 - if (*p == '.') - env = curenv; // Label is local - else - env = 0; // Label is global -#else // Set env to either local (dot prefixed) or global scope env = (*p == '.' ? curenv : 0); -#endif symbol = lookup(p, LABEL, env); if (symbol == NULL) @@ -1341,8 +1378,7 @@ int d_cargs(void) return errors("multiply-defined label '%s'", p); // Put symbol in "order of definition" list - if (!(symbol->sattr & SDECLLIST)) - sym_decl(symbol); + AddToSymbolDeclarationList(symbol); symbol->sattr |= (ABS | DEFINED | EQUATED); symbol->svalue = eval; @@ -1367,7 +1403,6 @@ int d_cargs(void) if (reglist(&rlist) < 0) return 0; -// for(i=0; i++<16; rlist>>=1) for(i=0; i<16; i++, rlist>>=1) { if (rlist & 1) @@ -1404,12 +1439,12 @@ 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. @@ -1459,8 +1494,7 @@ int d_cstruct(void) return errors("multiply-defined label '%s'", symbolName); // Put symbol in "order of definition" list - if (!(symbol->sattr & SDECLLIST)) - sym_decl(symbol); + AddToSymbolDeclarationList(symbol); tok += 2; @@ -1543,7 +1577,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; @@ -1557,3 +1590,50 @@ int d_undmac(void) return 0; } + +int d_jpad(void) +{ + warn("JPAD directive is deprecated/non-functional"); + return OK; +} + + +int d_nojpad(void) +{ + warn("NOJPAD directive is deprecated/non-functional"); + return OK; +} + + +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) + { + char temperr[256]; + sprintf(temperr, "unknown optimization flag '%s'", tmpstr); + return error(temperr); + } + } + else + return error(".opt directive needs every switch enclosed inside quotation marks"); + } + + return OK; +} +