X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=3471742ea179a28ca817d232b46501e5887ac41b;hp=8d4f3fdc53fc5dd601a9964f938db63402045704;hb=adc2f2df316f46cc70f8939f30c5f39ce6470a20;hpb=49cce96fba11282e4244187f15be418d5ae5bb8d diff --git a/direct.c b/direct.c index 8d4f3fd..3471742 100644 --- a/direct.c +++ b/direct.c @@ -21,7 +21,8 @@ #define DEF_KW #include "kwtab.h" -TOKEN exprbuf[128]; // Expression buffer +TOKEN exprbuf[128]; // Expression buffer +SYM * symbolPtr[1000000]; // Symbol pointers table // Directive handler table int (*dirtab[])() = { @@ -61,7 +62,7 @@ int (*dirtab[])() = { d_include, // 33 include fpop, // 34 end d_unimpl, // 35* macro - exitmac, // 36* exitm + ExitMacro, // 36* exitm d_unimpl, // 37* endm d_list, // 38 list d_nlist, // 39 nlist @@ -78,23 +79,10 @@ int (*dirtab[])() = { d_equrundef, // 50 .equrundef/.regundef d_ccundef, // 51 .ccundef d_print, // 52 .print - d_gpumain, // 53 .gpumain - d_jpad, // 54 .jpad - d_nojpad, // 55 .nojpad - d_fail, // 56 .fail + d_cstruct, // 53 .cstruct }; -// -// .fail - User abort -// -int d_fail(void) -{ - fatal("user abort"); - return 0; -} - - // // .org - Set origin // @@ -120,23 +108,6 @@ int d_org(void) } -// -// NOP Padding Directive -// -int d_jpad(void) -{ - jpad = 1; - return 0; -} - - -int d_nojpad(void) -{ - jpad = 0; - return 0; -} - - // // Print Directive // @@ -158,7 +129,8 @@ int d_print(void) switch(*tok) { case STRING: - sprintf(prntstr, "%s", (char *)tok[1]); +// sprintf(prntstr, "%s", (char *)tok[1]); + sprintf(prntstr, "%s", string[tok[1]]); printf("%s", prntstr); if (list_fd) @@ -172,7 +144,8 @@ int d_print(void) if (tok[1] != SYMBOL) goto token_err; - strcpy(prntstr, (char *)tok[2]); +// strcpy(prntstr, (char *)tok[2]); + strcpy(prntstr, string[tok[2]]); switch(prntstr[0]) { @@ -253,7 +226,8 @@ int d_ccundef(void) return ERROR; } - ccname = lookup((char *)tok[1], LABEL, 0); +// ccname = lookup((char *)tok[1], LABEL, 0); + ccname = lookup(string[tok[1]], LABEL, 0); // Make sure symbol is a valid ccdef if (!ccname || !(ccname->sattre & EQUATEDCC)) @@ -296,7 +270,8 @@ int d_equrundef(void) } // Lookup and undef if equated register - regname = lookup((char *)tok[1], LABEL, 0); +// regname = lookup((char *)tok[1], LABEL, 0); + regname = lookup(string[tok[1]], LABEL, 0); if (regname && (regname->sattre & EQUATEDREG)) regname->sattre |= UNDEF_EQUR; @@ -328,18 +303,31 @@ int d_incbin(void) long pos, size; char buf; + // 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]]); + return ERROR; + } + if (*tok != STRING) { error(syntax_error); return ERROR; } - if ((j = open((char *)tok[1], _OPEN_INC)) >= 0) +// if ((j = open((char *)tok[1], _OPEN_INC)) >= 0) + if ((j = open(string[tok[1]], _OPEN_INC)) >= 0) { size = lseek(j, 0L, SEEK_END); chcheck(size); pos = lseek(j, 0L, SEEK_SET); - + + DEBUG + { + printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size); + } + for(i=0; i 0 && buf1[j-1] != SLASHCHAR) // Append path char if necessary + if (j > 0 && buf1[j - 1] != SLASHCHAR) // Append path char if necessary strcat(buf1, SLASHSTRING); strcat(buf1, fn); @@ -703,7 +707,7 @@ int globl1(char * p) if ((sy = lookup(p, LABEL, 0)) == NULL) { - sy = newsym(p, LABEL, 0); + sy = NewSymbol(p, LABEL, 0); sy->svalue = 0; sy->sattr = GLOBAL; } @@ -854,12 +858,13 @@ int d_dc(WORD siz) // dc.b 'string' [,] ... if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL)) { - i = strlen((const char*)tok[1]); +// i = strlen((const char*)tok[1]); + i = strlen(string[tok[1]]); if ((challoc - ch_size) < i) chcheck(i); - for(p=(char *)tok[1]; *p!=EOS; ++p) + for(p=string[tok[1]]; *p!=EOS; ++p) D_byte(*p); tok += 2; @@ -888,7 +893,7 @@ int d_dc(WORD siz) case SIZB: if (!defined) { - fixup(FU_BYTE|FU_SEXT, sloc, exprbuf); + fixup(FU_BYTE | FU_SEXT, sloc, exprbuf); D_byte(0); } else @@ -907,7 +912,7 @@ int d_dc(WORD siz) case SIZN: if (!defined) { - fixup(FU_WORD|FU_SEXT, sloc, exprbuf); + fixup(FU_WORD | FU_SEXT, sloc, exprbuf); D_word(0); } else @@ -927,7 +932,7 @@ int d_dc(WORD siz) if (!defined) { if (movei) - fixup(FU_LONG|FU_MOVEI, sloc, exprbuf); + fixup(FU_LONG | FU_MOVEI, sloc, exprbuf); else fixup(FU_LONG, sloc, exprbuf); @@ -1075,7 +1080,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); + fixup(FU_BYTE | FU_SEXT, sloc, exprbuf); D_byte(0); } else @@ -1094,7 +1099,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); + fixup(FU_WORD | FU_SEXT, sloc, exprbuf); D_word(0); } else @@ -1144,29 +1149,30 @@ int d_comm(void) if (*tok != SYMBOL) return error("missing symbol"); - p = (char *)tok[1]; +// p = (char *)tok[1]; + p = string[tok[1]]; tok += 2; - if (*p == '.') // Cannot .comm a local symbol + if (*p == '.') // Cannot .comm a local symbol return error(locgl_error); if ((sym = lookup(p, LABEL, 0)) == NULL) - sym = newsym(p, LABEL, 0); + sym = NewSymbol(p, LABEL, 0); else { if (sym->sattr & DEFINED) return error(".comm symbol already defined"); } - sym->sattr = GLOBAL|COMMON|BSS; + sym->sattr = GLOBAL | COMMON | BSS; if (*tok++ != ',') return error(comma_error); - if (abs_expr(&eval) != OK) // Parse size of common region + if (abs_expr(&eval) != OK) // Parse size of common region return 0; - sym->svalue = eval; // Install common symbol's size + sym->svalue = eval; // Install common symbol's size at_eol(); return 0; } @@ -1178,7 +1184,7 @@ int d_comm(void) int d_list(void) { if (list_flag) - ++listing; + listing++; return 0; } @@ -1190,7 +1196,7 @@ int d_list(void) int d_nlist(void) { if (list_flag) - --listing; + listing--; return 0; } @@ -1202,7 +1208,6 @@ int d_nlist(void) int d_68000(void) { rgpu = rdsp = 0; - in_main = 0; // Switching from gpu/dsp sections should reset any ORG'd Address orgactive = 0; orgwarning = 0; @@ -1230,39 +1235,9 @@ int d_gpu(void) orgwarning = 0; } - rgpu = 1; // Set GPU assembly - rdsp = 0; // Unset DSP assembly - regbank = BANK_N; // Set no default register bank - in_main = 0; - jpad = 0; - return 0; -} - - -// -// GPU Main Code Directive -// - -int d_gpumain(void) -{ - if ((cursect != TEXT) && (cursect != DATA)) - { - error(".gpumain can only be used in the TEXT or DATA segments"); - return ERROR; - } - - // If previous section was dsp or 68000 then we need to reset ORG'd Addresses - if (!rgpu) - { - orgactive = 0; - orgwarning = 0; - } - - rgpu = 1; // Set GPU assembly - rdsp = 0; // Unset DSP assembly - regbank = BANK_N; // Set no default register bank - in_main = 1; // Enable main code execution rules - jpad = 0; + rgpu = 1; // Set GPU assembly + rdsp = 0; // Unset DSP assembly + regbank = BANK_N; // Set no default register bank return 0; } @@ -1285,11 +1260,9 @@ int d_dsp(void) orgwarning = 0; } - rdsp = 1; // Set DSP assembly - rgpu = 0; // Unset GPU assembly - regbank = BANK_N; // Set no default register bank - in_main = 0; - jpad = 0; + rdsp = 1; // Set DSP assembly + rgpu = 0; // Unset GPU assembly + regbank = BANK_N; // Set no default register bank return 0; } @@ -1298,17 +1271,18 @@ int d_dsp(void) // .cargs [#offset], symbol[.size], ... // // Lists of registers may also be mentioned; they just take up space. Good for -// "documentation" purposes. +// "documentation" purposes: // -// .cargs a6,.arg1, .arg2, .arg3... +// .cargs a6, .arg1, .arg2, .arg3... // -// The symbols are ABS and EQUATED. +// Symbols thus created are ABS and EQUATED. // int d_cargs(void) { - VALUE eval; + VALUE eval = 4; // Default to 4 if no offset specified (to account for + // return address) WORD rlist; - SYM * sy; + SYM * symbol; char * p; int env; int i; @@ -1318,92 +1292,233 @@ int d_cargs(void) if (*tok == '#') { - ++tok; + tok++; if (abs_expr(&eval) != OK) return 0; - if (*tok == ',') // Eat comma if it's there - ++tok; + // Eat the comma, if it's there + if (*tok == ',') + tok++; } - else - eval = 4; for(;;) { if (*tok == SYMBOL) { - p = (char *)tok[1]; +// p = (char *)tok[1]; + p = string[tok[1]]; +#if 0 if (*p == '.') - env = curenv; + env = curenv; // Label is local else - env = 0; - - sy = lookup(p, LABEL, env); - - if (sy == NULL) + 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) { - sy = newsym(p, LABEL, env); - sy->sattr = 0; + symbol = NewSymbol(p, LABEL, env); + symbol->sattr = 0; } - else if (sy->sattr & DEFINED) + else if (symbol->sattr & DEFINED) return errors("multiply-defined label '%s'", p); // Put symbol in "order of definition" list - if (!(sy->sattr & SDECLLIST)) - sym_decl(sy); + if (!(symbol->sattr & SDECLLIST)) + sym_decl(symbol); - sy->sattr |= ABS|DEFINED|EQUATED; - sy->svalue = eval; + symbol->sattr |= (ABS | DEFINED | EQUATED); + symbol->svalue = eval; tok += 2; - switch((int)*tok) + // 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) { case DOTL: eval += 2; case DOTB: case DOTW: - ++tok; + tok++; } eval += 2; } - else + else if (*tok >= KW_D0 && *tok <= KW_A7) + { + if (reglist(&rlist) < 0) + return 0; + +// for(i=0; i++<16; rlist>>=1) + 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(".cargs syntax"); + } + } + + // Eat commas in between each argument, if they exist + if (*tok == ',') + tok++; + } +} + + +// +// .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) { - if (*tok >= KW_D0 && *tok <= KW_A7) + 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) { - if (reglist(&rlist) < 0) - return 0; + symbol = NewSymbol(symbolName, LABEL, env); + symbol->sattr = 0; + } + else if (symbol->sattr & DEFINED) + return errors("multiply-defined label '%s'", symbolName); - for(i=0; i++<16; rlist>>=1) - if (rlist & 1) - eval += 4; + // Put symbol in "order of definition" list + if (!(symbol->sattr & SDECLLIST)) + sym_decl(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; } - else + + 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) { - 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(".cargs syntax"); - } + 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"); } - if (*tok == ',') - ++tok; + 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++; } } @@ -1413,11 +1528,12 @@ int d_cargs(void) // int undmac1(char * p) { - SYM * sy; + SYM * symbol = lookup(p, MACRO, 0); - // If the macro symbol exists, cause it to dissappear - if ((sy = lookup(p, MACRO, 0)) != NULL) - sy->stype = (BYTE)SY_UNDEF; + // If the macro symbol exists, cause it to disappear +// if ((sy = lookup(p, MACRO, 0)) != NULL) + if (symbol != NULL) + symbol->stype = (BYTE)SY_UNDEF; return OK; } @@ -1428,3 +1544,4 @@ int d_undmac(void) symlist(undmac1); return 0; } +