X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=efec94a2f438fd63d3a3931f14567cfea8efa690;hp=b1c368a4d2c8bd5b91ae3303fa60d97d3bc7c487;hb=062214e62031c26d372edc2e68473ebb64f6a506;hpb=11a78647f7f170e6ea39dd04a3734a359151debb diff --git a/direct.c b/direct.c index b1c368a..efec94a 100644 --- a/direct.c +++ b/direct.c @@ -8,7 +8,7 @@ #include "direct.h" #include "sect.h" -#include "risca.h" +#include "riscasm.h" #include "error.h" #include "token.h" #include "procln.h" @@ -21,64 +21,71 @@ #define DEF_KW #include "kwtab.h" + TOKEN exprbuf[128]; // Expression buffer SYM * symbolPtr[1000000]; // Symbol pointers table +static long unused; // For supressing 'write' warnings + // Directive handler table int (*dirtab[])() = { - d_org, // 0 org - d_even, // 1 even - d_unimpl, // 2 .6502 - 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_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 - 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_noclear, // 49 .noclear - d_equrundef, // 50 .equrundef/.regundef - d_ccundef, // 51 .ccundef - d_print, // 52 .print + d_org, // 0 org + d_even, // 1 even + d_unimpl, // 2 .6502 + 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_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 + 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_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) }; @@ -112,15 +119,15 @@ int d_org(void) // 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) @@ -133,7 +140,7 @@ int d_print(void) printf("%s", prntstr); if (list_fd) - write(list_fd, prntstr, (LONG)strlen(prntstr)); + unused = write(list_fd, prntstr, (LONG)strlen(prntstr)); tok += 2; break; @@ -183,7 +190,7 @@ int d_print(void) printf("%s", prntstr); if (list_fd) - write(list_fd, prntstr, (LONG)strlen(prntstr)); + unused = write(list_fd, prntstr, (LONG)strlen(prntstr)); formatting = 0; wordlong = 0; @@ -195,7 +202,7 @@ int d_print(void) } printf("\n"); - println("\n"); +// println("\n"); return 0; @@ -221,7 +228,8 @@ int d_ccundef(void) if (*tok != SYMBOL) { - error(syntax_error); +// error(syntax_error); + error("syntax error; expected symbol"); return ERROR; } @@ -250,26 +258,19 @@ 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) { - // Skip preceeding or seperating commas + // Skip preceeding or seperating commas (if any) if (*tok == ',') tok++; // 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)) @@ -297,51 +298,58 @@ int d_noclear(void) // int d_incbin(void) { - int i, j; + int fd; int bytes = 0; - long pos, size; - char buf; + long pos, size, bytesRead; + char msg[256]; // 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]]); + errors("cannot include binary file \"%s\" in BSS section", string[tok[1]]); return ERROR; } if (*tok != STRING) { - error(syntax_error); +// error(syntax_error); + error("syntax error; string missing"); return ERROR; } -// if ((j = open((char *)tok[1], _OPEN_INC)) >= 0) - if ((j = open(string[tok[1]], _OPEN_INC)) >= 0) + if ((fd = open(string[tok[1]], _OPEN_INC)) < 0) { - size = lseek(j, 0L, SEEK_END); - chcheck(size); - pos = lseek(j, 0L, SEEK_SET); + errors("cannot open include binary file (%s)", string[tok[1]]); + return ERROR; + } - DEBUG - { - printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size); - } + size = lseek(fd, 0L, SEEK_END); + pos = lseek(fd, 0L, SEEK_SET); + chcheck(size); - for(i=0; isvalue = 0; sy->sattr = GLOBAL; +//printf("glob1: Making global symbol: attr=%04X, eattr=%08X, %s\n", sy->sattr, sy->sattre, sy->sname); } else sy->sattr |= GLOBAL; @@ -731,14 +736,14 @@ 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; } @@ -755,8 +760,8 @@ int d_text(void) if (cursect != TEXT) { - savsect(); - switchsect(TEXT); + SaveSection(); + SwitchSection(TEXT); } return 0; @@ -770,8 +775,8 @@ int d_data(void) if (cursect != DATA) { - savsect(); - switchsect(DATA); + SaveSection(); + SwitchSection(DATA); } return 0; @@ -785,8 +790,8 @@ int d_bss(void) if (cursect != BSS) { - savsect(); - switchsect(BSS); + SaveSection(); + SwitchSection(BSS); } return 0; @@ -798,6 +803,9 @@ int d_bss(void) // int d_ds(WORD siz) { +if (verb_flag) + printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); + VALUE eval; // This gets kind of stupid. This directive is disallowed in normal 68000 @@ -816,7 +824,7 @@ int d_ds(WORD siz) // 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)) + if (scattr & SBSS) { listvalue(eval); eval *= siz; @@ -825,7 +833,7 @@ int d_ds(WORD siz) } else { - dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED|ABS), NULL); + dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL); } at_eol(); @@ -892,7 +900,7 @@ 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 @@ -911,7 +919,7 @@ 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 @@ -931,9 +939,9 @@ 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); } @@ -1079,7 +1087,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 @@ -1098,7 +1106,7 @@ 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 @@ -1117,7 +1125,7 @@ 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 @@ -1210,8 +1218,8 @@ int d_68000(void) // Switching from gpu/dsp sections should reset any ORG'd Address orgactive = 0; orgwarning = 0; - savsect(); - switchsect(TEXT); + SaveSection(); + SwitchSection(TEXT); return 0; } @@ -1278,7 +1286,8 @@ int d_dsp(void) // int d_cargs(void) { - VALUE eval; + VALUE eval = 4; // Default to 4 if no offset specified (to account for + // return address) WORD rlist; SYM * symbol; char * p; @@ -1299,9 +1308,6 @@ int d_cargs(void) if (*tok == ',') tok++; } - else - // Default to 4 if not specified (because PC is on stack according to GroovyBee) - eval = 4; for(;;) { @@ -1331,7 +1337,7 @@ int d_cargs(void) // Put symbol in "order of definition" list if (!(symbol->sattr & SDECLLIST)) - sym_decl(symbol); + AddToSymbolOrderList(symbol); symbol->sattr |= (ABS | DEFINED | EQUATED); symbol->svalue = eval; @@ -1391,6 +1397,139 @@ 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 + WORD rlist; + SYM * symbol; + char * symbolName; + int env; + int i; + + if (rgpu || rdsp) + return error("directive forbidden in gpu/dsp mode"); + + if (*tok == '#') + { + tok++; + + if (abs_expr(&eval) != OK) + return 0; + + // Eat the comma, if it's there + if (*tok == ',') + tok++; + } + + for(;;) + { + if (*tok == SYMBOL) + { + symbolName = string[tok[1]]; + + // Set env to either local (dot prefixed) or global scope + env = (symbolName[0] == '.' ? curenv : 0); + symbol = lookup(symbolName, LABEL, env); + + // If the symbol wasn't found, then define it. Otherwise, throw an + // error. + if (symbol == NULL) + { + symbol = NewSymbol(symbolName, LABEL, env); + symbol->sattr = 0; + } + else if (symbol->sattr & DEFINED) + return errors("multiply-defined label '%s'", symbolName); + + // Put symbol in "order of definition" list + if (!(symbol->sattr & SDECLLIST)) + AddToSymbolOrderList(symbol); + + tok += 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) + { + case DOTW: + case DOTL: + eval += eval & 0x01; + } + + symbol->sattr |= (ABS | DEFINED | EQUATED); + symbol->svalue = 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) + { + case DOTL: + eval += 4; + break; + case DOTW: + eval += 2; + break; + case DOTB: + eval += 1; + break; + default: + return error("Symbol missing dot suffix in .cstruct construct"); + } + + tok++; + } + else if (*tok >= KW_D0 && *tok <= KW_A7) + { + if (reglist(&rlist) < 0) + return 0; + + for(i=0; i<16; i++, rlist>>=1) + { + if (rlist & 1) + eval += 4; + } + } + else + { + switch ((int)*tok) + { + case KW_USP: + case KW_SSP: + case KW_PC: + eval += 2; + // FALLTHROUGH + case KW_SR: + case KW_CCR: + eval += 2; + tok++; + break; + case EOL: + return 0; + default: + return error(".cstruct syntax"); + } + } + + // Eat commas in between each argument, if they exist + if (*tok == ',') + tok++; + } +} + + // // Undefine a macro - .undefmac macname [, macname...] // @@ -1413,3 +1552,23 @@ 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?"); +} +