X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=3146c5345599c18d9703daa1c787ce157e961ceb;hp=31852c8e2f9213c3a3a0e3735406aa9c57b95fab;hb=d0c28c349ddfb8393568037f68bddbe8979ce0df;hpb=0aa220d2e02e982734d05cf3ea840e54d04541eb diff --git a/direct.c b/direct.c index 31852c8..3146c53 100644 --- a/direct.c +++ b/direct.c @@ -3,7 +3,7 @@ // DIRECT.C - Directive Handling // Copyright (C) 199x Landon Dyer, 2011 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" @@ -85,6 +85,7 @@ int (*dirtab[])() = { d_cstruct, // 53 .cstruct d_jpad, // 54 .jpad (deprecated) d_nojpad, // 55 .nojpad (deprecated) + d_gpumain, // 56 .gpumain (deprecated) }; @@ -107,26 +108,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) @@ -134,7 +136,6 @@ int d_print(void) switch(*tok) { case STRING: -// sprintf(prntstr, "%s", (char *)tok[1]); sprintf(prntstr, "%s", string[tok[1]]); printf("%s", prntstr); @@ -201,7 +202,6 @@ int d_print(void) } printf("\n"); - println("\n"); return 0; @@ -212,7 +212,7 @@ token_err: // -// Undefine an Equated Condition Code +// Undefine an equated condition code // int d_ccundef(void) { @@ -227,11 +227,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 @@ -248,7 +247,7 @@ int d_ccundef(void) // -// Undefine an Equated Register +// Undefine an equated register // int d_equrundef(void) { @@ -256,10 +255,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) { @@ -269,17 +265,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; @@ -290,7 +287,7 @@ 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) { @@ -299,7 +296,7 @@ int d_noclear(void) // -// Include Binary File +// Include binary file // int d_incbin(void) { @@ -317,7 +314,7 @@ int d_incbin(void) if (*tok != STRING) { - error(syntax_error); + error("syntax error; string missing"); return ERROR; } @@ -343,7 +340,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; @@ -359,7 +355,7 @@ int d_incbin(void) // -// Set RISC Register Banks +// Set RISC register banks // int d_regbank0(void) { @@ -378,11 +374,36 @@ int d_regbank1(void) // -// Adjust Location to an EVEN Value +// Helper function, to cut down on mistakes & typing +// +static inline void SkipBytes(unsigned bytesToSkip) +{ + if (!bytesToSkip) + return; + + if ((scattr & SBSS) == 0) + { + chcheck(bytesToSkip); + D_ZEROFILL(bytesToSkip); + } + else + { + sloc += bytesToSkip; + + if (orgactive) + orgaddr += bytesToSkip; + } +} + + +// +// Adjust location to an EVEN value // int d_even(void) { - if (sloc & 1) + unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01; + + if (skip) { if ((scattr & SBSS) == 0) { @@ -391,7 +412,10 @@ int d_even(void) } else { - ++sloc; + sloc++; + + if (orgactive) + orgaddr++; } } @@ -400,137 +424,61 @@ int d_even(void) // -// Adjust Location to an LONG Value +// Adjust location to a LONG value // int d_long(void) { - unsigned i; - unsigned val = 4; - - i = sloc & ~(val - 1); - - if (i != sloc) - val = val - (sloc - i); - else - val = 0; - - if (val) - { - 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) { @@ -590,18 +540,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; @@ -612,7 +558,7 @@ int symlist(int(* func)()) if (*tok != ',') return error(em); - ++tok; + tok++; } return 0; @@ -630,23 +576,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: @@ -711,7 +649,7 @@ int d_assert(void) // int globl1(char * p) { - SYM *sy; + SYM * sy; if (*p == '.') return error("cannot .globl local symbol"); @@ -721,6 +659,7 @@ 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 sy->sattr |= GLOBAL; @@ -743,23 +682,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) @@ -767,8 +705,8 @@ int d_text(void) if (cursect != TEXT) { - savsect(); - switchsect(TEXT); + SaveSection(); + SwitchSection(TEXT); } return 0; @@ -782,8 +720,8 @@ int d_data(void) if (cursect != DATA) { - savsect(); - switchsect(DATA); + SaveSection(); + SwitchSection(DATA); } return 0; @@ -797,8 +735,8 @@ int d_bss(void) if (cursect != BSS) { - savsect(); - switchsect(BSS); + SaveSection(); + SwitchSection(BSS); } return 0; @@ -907,7 +845,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 @@ -926,7 +864,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 @@ -946,9 +884,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); } @@ -1094,7 +1032,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 @@ -1113,7 +1051,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 @@ -1132,7 +1070,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 @@ -1163,7 +1101,6 @@ int d_comm(void) if (*tok != SYMBOL) return error("missing symbol"); -// p = (char *)tok[1]; p = string[tok[1]]; tok += 2; @@ -1225,14 +1162,14 @@ 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; } // -// .gpu - Switch to GPU Assembler +// .gpu - Switch to GPU assembler // int d_gpu(void) { @@ -1245,9 +1182,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 @@ -1257,7 +1196,7 @@ int d_gpu(void) // -// .dsp - Switch to DSP Assembler +// .dsp - Switch to DSP assembler // int d_dsp(void) { @@ -1320,18 +1259,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) @@ -1343,8 +1274,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; @@ -1369,7 +1299,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) @@ -1461,8 +1390,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; @@ -1573,3 +1501,9 @@ int d_nojpad(void) return OK; } + +int d_gpumain(void) +{ + return error("What the hell? Do you think we adhere to the Goof standard?"); +} +