X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=b1c368a4d2c8bd5b91ae3303fa60d97d3bc7c487;hp=95fd51befb5cc6b0ed1cc0b31e9371929b506ab4;hb=11a78647f7f170e6ea39dd04a3734a359151debb;hpb=d09274f3e3d4dca122c308a621ea8edc100b7d99 diff --git a/direct.c b/direct.c index 95fd51b..b1c368a 100644 --- a/direct.c +++ b/direct.c @@ -21,80 +21,67 @@ #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[])() = { - 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 - exitmac, // 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_gpumain, // 53 .gpumain - d_jpad, // 54 .jpad - d_nojpad, // 55 .nojpad - d_fail, // 56 .fail + 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 }; -// -// .org - Set origin -// -int d_fail(void) -{ - fatal("user abort"); - return 0; -} - - // // .org - Set origin // @@ -120,23 +107,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 +128,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 +143,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 +225,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 +269,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 +302,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 +706,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 +857,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; @@ -881,14 +885,14 @@ int d_dc(WORD siz) defined = (WORD)(eattr & DEFINED); if ((challoc - ch_size) < 4) - chcheck(4L); + chcheck(4); switch (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 +911,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 +931,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 +1079,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 +1098,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 +1148,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 +1183,7 @@ int d_comm(void) int d_list(void) { if (list_flag) - ++listing; + listing++; return 0; } @@ -1190,7 +1195,7 @@ int d_list(void) int d_nlist(void) { if (list_flag) - --listing; + listing--; return 0; } @@ -1202,7 +1207,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 +1234,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 +1259,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 +1270,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. +// "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; WORD rlist; - SYM * sy; + SYM * symbol; char * p; int env; int i; @@ -1318,92 +1290,103 @@ 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 + // Default to 4 if not specified (because PC is on stack according to GroovyBee) 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 (*tok >= KW_D0 && *tok <= KW_A7) - { - if (reglist(&rlist) < 0) - return 0; + if (reglist(&rlist) < 0) + return 0; - for(i=0; i++<16; rlist>>=1) - if (rlist & 1) - eval += 4; +// for(i=0; i++<16; rlist>>=1) + for(i=0; i<16; i++, rlist>>=1) + { + if (rlist & 1) + eval += 4; } - else + } + else + { + 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 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"); } - - if (*tok == ',') - ++tok; } + + // Eat commas in between each argument, if they exist + if (*tok == ',') + tok++; } } @@ -1413,11 +1396,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 +1412,4 @@ int d_undmac(void) symlist(undmac1); return 0; } +