X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=procln.c;h=8dd19c6371cb93192cbde7953b91786662e188e9;hp=dd8980622be2eb42d4f4ebd7e3dd75ab3572c9f7;hb=29b32d134bc12831a8ddd098bf9aeeda26dcfe7c;hpb=60f204cb9e3905100da0d89f14bb40db764acd9e diff --git a/procln.c b/procln.c index dd89806..8dd19c6 100644 --- a/procln.c +++ b/procln.c @@ -1,22 +1,23 @@ // -// 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-2017 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 "error.h" -#include "sect.h" #include "expr.h" +#include "listing.h" #include "mach.h" -#include "direct.h" #include "macro.h" -#include "symbol.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,13 +30,16 @@ #define DECL_MR #include "risckw.h" +#define DEF_MP // Include 6502 keyword definitions +#define DECL_MP // Include 6502 keyword state machine tables +#include "6502kw.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) const char extra_stuff[] = "extra (unexpected) text found after addressing mode"; @@ -45,7 +49,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, @@ -67,25 +71,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 @@ -117,7 +131,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 @@ -136,7 +150,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(); @@ -146,7 +160,7 @@ if (debug) printf("Assemble: Found TKEOF flag...\n"); return; } - DEBUG DumpTokenBuffer(); + DEBUG { DumpTokenBuffer(); } if (list_flag) { @@ -163,7 +177,7 @@ if (debug) printf("Assemble: Found TKEOF flag...\n"); 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 @@ -173,7 +187,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; } @@ -211,7 +229,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"); @@ -251,12 +269,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) @@ -265,13 +288,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; @@ -292,6 +318,7 @@ as68label: goto loop; goto loop1; + case MN_MACRO: // .macro --- macro definition if (!disabled) { @@ -303,6 +330,7 @@ as68label: } goto loop; + case MN_EXITM: // .exitm --- exit macro case MN_ENDM: // .endm --- same as .exitm if (!disabled) @@ -314,6 +342,7 @@ as68label: } goto loop; + case MN_REPT: if (!disabled) { @@ -324,10 +353,11 @@ as68label: goto loop; } - defrept(); + HandleRept(); } goto loop; + case MN_ENDR: if (!disabled) error("mis-nested .endr"); @@ -380,7 +410,7 @@ normal: } else { - errors("multiple equate to '%s'", sy->sname); + error("multiple equate to '%s'", sy->sname); goto loop; } } @@ -436,9 +466,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; } @@ -490,7 +520,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) @@ -548,7 +578,7 @@ 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 goto loop; @@ -566,6 +596,41 @@ When checking to see if it's already been equated, issue a warning. 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)) + { +#ifdef ST + state = kmatch(opname, mpbase, mpcheck, mptab, mpaccept); +#else + for(state=0, p=opname; state>= 0; ) + { + j = mpbase[state] + tolowertab[*p]; + + if (mpcheck[j] != state) // Reject, character doesn't match + { + state = -1; // No match + break; + } + + if (!*++p) + { // 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 + 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)) @@ -605,7 +670,7 @@ When checking to see if it's already been equated, issue a warning. if ((sy = lookup(opname, MACRO, 0)) != NULL) InvokeMacro(sy, siz); else - errors("unknown op '%s'", opname); + error("unknown op '%s'", opname); goto loop; } @@ -618,10 +683,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"); @@ -693,7 +758,7 @@ int HandleLabel(char * label, int labelType) 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); @@ -711,6 +776,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++; @@ -726,78 +793,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; -} -