X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=procln.c;h=9c207bfdefe8481ca71195ad1ad7c3aaaf7c3471;hp=4afd5388c092035de15310389b7bf7156dded649;hb=4205233c8397c581b4d27ab36ab81ec896ef3dd0;hpb=052be802baa4836564801c780b1d432cfe17c576 diff --git a/procln.c b/procln.c index 4afd538..9c207bf 100644 --- a/procln.c +++ b/procln.c @@ -1,22 +1,26 @@ // -// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System +// RMAC - Reboot's Macro Assembler for all Atari computers // PROCLN.C - Line Processing -// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // #include "procln.h" -#include "listing.h" +#include "6502.h" #include "amode.h" +#include "direct.h" +#include "dsp56k_amode.h" +#include "dsp56k_mach.h" #include "error.h" -#include "sect.h" #include "expr.h" +#include "listing.h" #include "mach.h" -#include "direct.h" #include "macro.h" -#include "symbol.h" +#include "op.h" #include "riscasm.h" +#include "sect.h" +#include "symbol.h" #define DEF_KW // Declare keyword values #include "kwtab.h" // Incl generated keyword tables & defs @@ -29,20 +33,27 @@ #define DECL_MR #include "risckw.h" -#define DEF_MP /* include 6502 keyword definitions */ -#define DECL_MP /* include 6502 keyword state machine tables */ -#include "6502.h" -extern int m6502; /* 1, assembler in .6502 mode */ -extern VOID m6502cg(); /* 6502 code generator */ -extern VOID m6502obj(int ofd); +#define DEF_MP // Include 6502 keyword definitions +#define DECL_MP // Include 6502 keyword state machine tables +#include "6502kw.h" + +#define DEF_MO // Include OP keyword definitions +#define DECL_MO // Include OP keyword state machine tables +#include "opkw.h" + +#define DEF_DSP // Include DSP56K keywords definitions +#define DECL_DSP // Include DSP56K keyword state machine tables +#include "dsp56kkw.h" + IFENT * ifent; // Current ifent static IFENT ifent0; // Root ifent -static IFENT * f_ifent; // Freelist of ifents -static int disabled; // Assembly conditionally disabled +IFENT * f_ifent; // Freelist of ifents +int disabled; // Assembly conditionally disabled int just_bss; // 1, ds.b in microprocessor mode -VALUE pcloc; // Value of "PC" at beginning of line +uint32_t pcloc; // Value of "PC" at beginning of line SYM * lab_sym; // Label on line (or NULL) +char * label_defined; // The name of the last label defined in current line (if any) const char extra_stuff[] = "extra (unexpected) text found after addressing mode"; const char comma_error[] = "missing comma"; @@ -51,7 +62,7 @@ const char locgl_error[] = "cannot GLOBL local symbol"; const char lab_ignored[] = "label ignored"; // Table to convert an addressing-mode number to a bitmask. -LONG amsktab[0112] = { +LONG amsktab[0124] = { M_DREG, M_DREG, M_DREG, M_DREG, M_DREG, M_DREG, M_DREG, M_DREG, @@ -73,25 +84,35 @@ LONG amsktab[0112] = { M_AINDEXED, M_AINDEXED, M_AINDEXED, M_AINDEXED, M_AINDEXED, M_AINDEXED, M_AINDEXED, M_AINDEXED, - M_ABSW, // 070 - M_ABSL, // 071 - M_PCDISP, // 072 - M_PCINDEXED, // 073 - M_IMMED, // 074 - 0L, // 075 - 0L, // 076 - 0L, // 077 - M_ABASE, // 0100 - M_MEMPOST, // 0101 - M_MEMPRE, // 0102 - M_PCBASE, // 0103 - M_PCMPOST, // 0104 - M_PCMPRE, // 0105 - M_AM_USP, // 0106 - M_AM_SR, // 0107 - M_AM_CCR, // 0110 - M_AM_NONE // 0111 -}; // 0112 length + M_ABSW, // 070 + M_ABSL, // 071 + M_PCDISP, // 072 + M_PCINDEXED, // 073 + M_IMMED, // 074 + 0L, // 075 + 0L, // 076 + 0L, // 077 + M_ABASE, // 0100 + M_MEMPOST, // 0101 + M_MEMPRE, // 0102 + M_PCBASE, // 0103 + M_PCMPOST, // 0104 + M_PCMPRE, // 0105 + M_AM_USP, // 0106 + M_AM_SR, // 0107 + M_AM_CCR, // 0110 + M_AM_NONE, // 0111 + 0x30, // 0112 + 0x30, // 0113 + 0L, // 0114 + 0L, // 0115 + 0L, // 0116 + 0L, // 0117 + M_CACHE40, // 0120 + M_CREG, // 0121 + M_FREG, // 0122 + M_FPSCR // 0123 +}; // 0123 length // Function prototypes @@ -123,7 +144,7 @@ void Assemble(void) char * equate; // Symbol (or NULL) int labtyp = 0; // Label type (':', DCOLON) int equtyp = 0; // Equ type ('=', DEQUALS) - VALUE eval; // Expression value + uint64_t eval; // Expression value WORD eattr; // Expression attributes SYM * esym; // External symbol involved in expr. WORD siz = 0; // Size suffix to mnem/diretve/macro @@ -142,7 +163,7 @@ loop: // Line processing loop label // Get another line of tokens if (TokenizeLine() == TKEOF) { -if (debug) printf("Assemble: Found TKEOF flag...\n"); +DEBUG { printf("Assemble: Found TKEOF flag...\n"); } if (list_flag && listflag) // Flush last line of source listeol(); @@ -152,7 +173,7 @@ if (debug) printf("Assemble: Found TKEOF flag...\n"); return; } - DEBUG DumpTokenBuffer(); + DEBUG { DumpTokenBuffer(); } if (list_flag) { @@ -166,10 +187,11 @@ if (debug) printf("Assemble: Found TKEOF flag...\n"); state = -3; // No keyword (just EOL) label = NULL; // No label + label_defined = NULL; // No label defined yet lab_sym = NULL; // No (exported) label equate = NULL; // No equate tk = tok; // Save first token in line - pcloc = (VALUE)sloc; // Set beginning-of-line PC + pcloc = (uint32_t)sloc; // Set beginning-of-line PC loop1: // Internal line processing loop @@ -179,7 +201,11 @@ loop1: // Internal line processing loop // First token MUST be a symbol (Shamus: not sure why :-/) if (*tok != SYMBOL) { - error("syntax error; expected symbol"); + if ((*tok >= KW_D0) && (*tok <= KW_R31)) + error("cannot use reserved keyword as label name or .equ"); + else + error("syntax error; expected symbol"); + goto loop; } @@ -209,6 +235,8 @@ as68label: if (HandleLabel(label, labtyp) != 0) goto loop; + label_defined = label; + goto as68label; } } @@ -217,7 +245,7 @@ as68label: if (*tok == EOL) goto normal; - // Next token MUST be a symbol + // First token MUST be a symbol (if we get here, tok didn't advance) if (*tok++ != SYMBOL) { error("syntax error; expected symbol"); @@ -257,12 +285,17 @@ as68label: // Check for ".b" ".w" ".l" after directive, macro or mnemonic. siz = SIZN; - if (*tok == DOTW) - siz = SIZW, tok++; - else if (*tok == DOTL) - siz = SIZL, tok++; - else if (*tok == DOTB) - siz = SIZB, tok++; + switch (*tok) + { + case DOTW: siz = SIZW, tok++; break; + case DOTL: siz = SIZL, tok++; break; + case DOTB: siz = SIZB, tok++; break; + case DOTD: siz = SIZD, tok++; break; + case DOTP: siz = SIZP, tok++; break; + case DOTQ: siz = SIZQ, tok++; break; + case DOTS: siz = SIZS, tok++; break; + case DOTX: siz = SIZX, tok++; break; + } // Do special directives (500..999) (These must be handled in "real time") if (state >= 500 && state < 1000) @@ -271,13 +304,16 @@ as68label: { case MN_IF: d_if(); - goto loop; + goto loop; + case MN_ELSE: d_else(); goto loop; + case MN_ENDIF: d_endif(); goto loop; + case MN_IIF: // .iif --- immediate if if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK) goto loop; @@ -298,6 +334,7 @@ as68label: goto loop; goto loop1; + case MN_MACRO: // .macro --- macro definition if (!disabled) { @@ -309,6 +346,7 @@ as68label: } goto loop; + case MN_EXITM: // .exitm --- exit macro case MN_ENDM: // .endm --- same as .exitm if (!disabled) @@ -320,6 +358,7 @@ as68label: } goto loop; + case MN_REPT: if (!disabled) { @@ -328,12 +367,15 @@ as68label: { if (HandleLabel(label, labtyp) != 0) goto loop; + + label_defined = label; } - defrept(); + HandleRept(); } goto loop; + case MN_ENDR: if (!disabled) error("mis-nested .endr"); @@ -374,19 +416,17 @@ normal: { if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR)) { -//REALLY? sy->sattre |= ~UNDEF_EQUR; sy->sattre &= ~UNDEF_EQUR; sy->svalue = 0; } else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC)) { -//REALLY? sy->sattre |= ~UNDEF_CC; sy->sattre &= ~UNDEF_CC; sy->svalue = 0; } else { - errors("multiple equate to '%s'", sy->sname); + error("multiple equate to '%s'", sy->sname); goto loop; } } @@ -442,9 +482,9 @@ When checking to see if it's already been equated, issue a warning. tok += 3; // Anything other than a 0 or a 1 will result in "No Bank" - if (*tok == 0) + if (*(uint64_t *)tok == 0) registerbank = BANK_0; - else if (*tok == 1) + else if (*(uint64_t *)tok == 1) registerbank = BANK_1; } @@ -461,8 +501,6 @@ When checking to see if it's already been equated, issue a warning. sy->sattre |= regbank; // Store register bank #endif eattr = ABS | DEFINED | GLOBAL; -// & what does this $80000080 constant mean??? -// eval = 0x80000080 + (riscreg) + (registerbank << 8); eval = riscreg; tok++; } @@ -496,7 +534,7 @@ When checking to see if it's already been equated, issue a warning. if (reglist(&rmask) < 0) goto loop; - eval = (VALUE)rmask; + eval = (uint32_t)rmask; eattr = ABS | DEFINED; } else if (equtyp == CCDEF) @@ -524,7 +562,7 @@ When checking to see if it's already been equated, issue a warning. else if (expr(exprbuf, &eval, &eattr, &esym) != OK) goto loop; } - //equ a equr + // equ an equr else if (*tok == SYMBOL) { sy2 = lookup(string[tok[1]], LABEL, j); @@ -534,7 +572,6 @@ When checking to see if it's already been equated, issue a warning. sy->stype = sy2->stype; sy->sattr = sy2->sattr; sy->sattre = sy2->sattre; -//ICK sy->svalue = (sy2->svalue & 0xFFFFF0FF); sy->svalue = sy2->svalue; goto loop; } @@ -554,9 +591,9 @@ When checking to see if it's already been equated, issue a warning. sy->svalue = eval; if (list_flag) // Put value in listing - listvalue(eval); + listvalue((uint32_t)eval); - at_eol(); // Must be at EOL now + ErrorIfNotAtEOL(); // Must be at EOL now goto loop; } @@ -566,50 +603,49 @@ When checking to see if it's already been equated, issue a warning. // Non-zero == error occurred if (HandleLabel(label, labtyp) != 0) goto loop; + + label_defined = label; } // Punt on EOL if (state == -3) goto loop; - /* - * If we're in 6502 mode and are still in need - * of a mnemonic, then search for valid 6502 mnemonic. - */ - if (m6502 && - (state < 0 || state >= 1000)) + // If we're in 6502 mode and are still in need of a mnemonic, then search + // for valid 6502 mnemonic. + if (m6502 && (state < 0 || state >= 1000)) { #ifdef ST state = kmatch(opname, mpbase, mpcheck, mptab, mpaccept); #else - for (state = 0, p = opname; state >= 0;) + for(state=0, p=opname; state>= 0; ) { j = mpbase[state] + tolowertab[*p]; - if (mpcheck[j] != state) /* reject, character doesn't match */ + + if (mpcheck[j] != state) // Reject, character doesn't match { - state = -1; /* no match */ + state = -1; // No match break; } if (!*++p) - { /* must accept or reject at EOS */ - state = mpaccept[j]; /* (-1 on no terminal match) */ + { // Must accept or reject at EOS + state = mpaccept[j]; // (-1 on no terminal match) break; } + state = mptab[j]; } #endif - /* - * Call 6502 code generator if we found a mnemonic - */ + // Call 6502 code generator if we found a mnemonic if (state >= 2000) { m6502cg(state - 2000); goto loop; } } - + // If we are in GPU or DSP mode and still in need of a mnemonic then search // for one if ((rgpu || rdsp) && (state < 0 || state >= 1000)) @@ -643,13 +679,132 @@ When checking to see if it's already been equated, issue a warning. } } + // If we are in OP mode and still in need of a mnemonic then search for one + if (robjproc && ((state < 0) || (state >= 1000))) + { + for(state=0, p=opname; state>=0;) + { + j = mobase[state] + (int)tolowertab[*p]; + + // Reject, character doesn't match + if (mocheck[j] != state) + { + state = -1; // No match + break; + } + + // Must accept or reject at EOS + if (!*++p) + { + state = moaccept[j]; // (-1 on no terminal match) + break; + } + + state = motab[j]; + } + + // Call OP code generator if we found a mnemonic + if (state >= 3100) + { + GenerateOPCode(state); + goto loop; + } + } + + // If we are in 56K mode and still in need of a mnemonic then search for one + if (dsp56001 && ((state < 0) || (state >= 1000))) + { + for(state=0, p=opname; state>=0;) + { + j = dspbase[state] + (int)tolowertab[*p]; + + // Reject, character doesn't match + if (dspcheck[j] != state) + { + state = -1; // No match + break; + } + + // Must accept or reject at EOS + if (!*++p) + { + state = dspaccept[j]; // (-1 on no terminal match) + break; + } + + state = dsptab[j]; + } + + // Call DSP code generator if we found a mnemonic + if (state >= 2000) + { + LONG parcode; + int operands; + MNTABDSP * md = &dsp56k_machtab[state - 2000]; + deposit_extra_ea = 0; // Assume no extra word needed + + if (md->mnfunc == dsp_mult) + { + // Special case for multiplication instructions: they require + // 3 operands + if ((operands = dsp_amode(3)) == ERROR) + goto loop; + } + else if ((md->mnattr & PARMOVE) && md->mn0 != M_AM_NONE) + { + if (dsp_amode(2) == ERROR) + goto loop; + } + else if ((md->mnattr & PARMOVE) && md->mn0 == M_AM_NONE) + { + // Instructions that have parallel moves but use no operands + // (probably only move). In this case, don't parse addressing + // modes--just go straight to parallel parse + dsp_am0 = dsp_am1 = M_AM_NONE; + } + else + { + // Non parallel move instructions can have up to 4 parameters + // (well, only tcc instructions really) + if ((operands = dsp_amode(4)) == ERROR) + goto loop; + + if (operands == 4) + { + dsp_tcc4(md->mninst); + goto loop; + } + } + + if (md->mnattr & PARMOVE) + { + // Check for parallel moves + if ((parcode = parmoves(dsp_a1reg)) == ERROR) + goto loop; + } + else + { + if (*tok != EOL) + error("parallel moves not allowed with this instruction"); + + parcode = 0; + } + + while ((dsp_am0 & md->mn0) == 0 || (dsp_am1 & md->mn1) == 0) + md = &dsp56k_machtab[md->mncont]; + + (*md->mnfunc)(md->mninst | (parcode << 8)); + goto loop; + } + } + // Invoke macro or complain about bad mnemonic if (state < 0) { if ((sy = lookup(opname, MACRO, 0)) != NULL) InvokeMacro(sy, siz); else - errors("unknown op '%s'", opname); + error("unknown op '%s'", opname); goto loop; } @@ -662,10 +817,10 @@ When checking to see if it's already been equated, issue a warning. } // Do mnemonics - // o can't deposit instrs in BSS or ABS - // o do automatic .EVEN for instrs - // o allocate space for largest possible instr - // o can't do ".b" operations with an address register + // o can't deposit instrs in BSS or ABS + // o do automatic .EVEN for instrs + // o allocate space for largest possible instr + // o can't do ".b" operations with an address register if (scattr & SBSS) { error("cannot initialize non-storage (BSS) section"); @@ -707,16 +862,13 @@ When checking to see if it's already been equated, issue a warning. // Keep a backup of chptr (used for optimisations during codegen) chptr_opcode = chptr; - for(;;) - { - if ((m->mnattr & siz) && (amsk0 & m->mn0) != 0 && (amsk1 & m->mn1) != 0) - { - (*m->mnfunc)(m->mninst, siz); - goto loop; - } - + while (!(m->mnattr & siz) || (amsk0 & m->mn0) == 0 || (amsk1 & m->mn1) == 0) m = &machtab[m->mncont]; - } + + DEBUG { printf(" 68K: mninst=$%X, siz=$%X, mnattr=$%X, amsk0=$%X, mn0=$%X, amsk1=$%X, mn1=$%X\n", m->mninst, siz, m->mnattr, amsk0, m->mn0, amsk1, m->mn1); } + + (*m->mnfunc)(m->mninst, siz); + goto loop; } @@ -733,11 +885,10 @@ int HandleLabel(char * label, int labelType) { symbol = NewSymbol(label, LABEL, environment); symbol->sattr = 0; -// symbol->sattre = RISCSYM; symbol->sattre = 0; } else if (symbol->sattr & DEFINED) - return errors("multiply-defined label '%s'", label); + return error("multiply-defined label '%s'", label); // Put symbol in "order of definition" list if it's not already in it AddToSymbolDeclarationList(symbol); @@ -755,6 +906,8 @@ int HandleLabel(char * label, int labelType) lab_sym = symbol; + // Yes, our CS professors told us to write checks for equality this way, + // but damn, it hurts my brain every time I look at it. :-/ if (0 == environment) curenv++; @@ -770,78 +923,3 @@ int HandleLabel(char * label, int labelType) return 0; } - -// -// .if, Start conditional assembly -// -int d_if(void) -{ - IFENT * rif; - WORD eattr; - VALUE eval; - SYM * esym; - - // Alloc an IFENTRY - if ((rif = f_ifent) == NULL) - rif = (IFENT *)malloc(sizeof(IFENT)); - else - f_ifent = rif->if_prev; - - rif->if_prev = ifent; - ifent = rif; - - if (!disabled) - { - if (expr(exprbuf, &eval, &eattr, &esym) != OK) - return 0; - - if ((eattr & DEFINED) == 0) - return error(undef_error); - - disabled = !eval; - } - - rif->if_state = (WORD)disabled; - return 0; -} - - -// -// .else, Do alternate case for .if -// -int d_else(void) -{ - IFENT * rif = ifent; - - if (rif->if_prev == NULL) - return error("mismatched .else"); - - if (disabled) - disabled = rif->if_prev->if_state; - else - disabled = 1; - - rif->if_state = (WORD)disabled; - return 0; -} - - -// -// .endif, End of conditional assembly block -// This is also called by fpop() to pop levels of IFENTs in case a macro or -// include file exits early with `exitm' or `end'. -// -int d_endif (void) -{ - IFENT * rif = ifent; - - if (rif->if_prev == NULL) - return error("mismatched .endif"); - - ifent = rif->if_prev; - disabled = rif->if_prev->if_state; - rif->if_prev = f_ifent; - f_ifent = rif; - return 0; -} -