//
// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
// PROCLN.C - Line Processing
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 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
+#define DEF_KW // Declare keyword values
#include "kwtab.h" // Incl generated keyword tables & defs
#define DEF_MN // Incl 68k keyword definitions
#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
-int just_bss; // 1, ds.b in microprocessor mode
-VALUE pcloc; // Value of "PC" at beginning of line
-IFENT * ifent; // Current ifent
+int just_bss; // 1, ds.b in microprocessor mode
+VALUE pcloc; // Value of "PC" at beginning of line
SYM * lab_sym; // Label on line (or NULL)
+int bfparam1; // bfxxx instruction parameters
+int bfparam2; // bfxxx instruction parameters
const char extra_stuff[] = "extra (unexpected) text found after addressing mode";
const char comma_error[] = "missing comma";
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,
0L, // 076
0L, // 077
M_ABASE, // 0100
- M_MEMPOST, // 0101
- M_MEMPRE, // 0102
+ 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_SR, // 0107
M_AM_CCR, // 0110
- M_AM_NONE // 0111
-}; // 0112 length
+ M_AM_NONE, // 0111
+ 0x30, // 0112
+ 0x30, // 0113
+ 0L, // 0114
+ 0L, // 0115
+ 0L, // 0116
+ 0L, // 0117
+ M_CREG, // 0120 (caches - TODO: is this correct or does it need its own bitfield?)
+ M_CREG, // 0121
+ M_FREG, // 0122
+ M_FPSCR // 0123
+}; // 0123 length
// Function prototypes
// Get another line of tokens
if (TokenizeLine() == TKEOF)
{
-if (verb_flag) printf("Assemble: Found TKEOF flag...\n");
+if (debug) printf("Assemble: Found TKEOF flag...\n");
if (list_flag && listflag) // Flush last line of source
listeol();
// First token MUST be a symbol (Shamus: not sure why :-/)
if (*tok != 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;
}
// Check for ".b" ".w" ".l" after directive, macro or mnemonic.
siz = SIZN;
- if (*tok == DOTW)
+ if (*tok == DOTW)
siz = SIZW, tok++;
else if (*tok == DOTL)
siz = SIZL, tok++;
else if (*tok == DOTB)
siz = SIZB, tok++;
+ else if(*tok == DOTD)
+ siz = SIZD, tok++;
+ else if(*tok == DOTP)
+ siz = SIZP, tok++;
+ else if(*tok == DOTQ)
+ siz = SIZQ, tok++;
+ else if(*tok == DOTS)
+ siz = SIZS, tok++;
+ else if(*tok == DOTX)
+ siz = SIZX, tok++;
+
// Do special directives (500..999) (These must be handled in "real time")
if (state >= 500 && state < 1000)
switch (state)
{
case MN_IF:
- d_if ();
+ d_if();
goto loop;
case MN_ELSE:
d_else();
goto loop;
case MN_ENDIF:
- d_endif ();
+ d_endif();
goto loop;
case MN_IIF: // .iif --- immediate if
if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK)
{
if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR))
{
-//REALLY? sy->sattre |= ~UNDEF_EQUR;
- sy->sattre &= ~UNDEF_EQUR;
+//REALLY? sy->sattre |= ~UNDEF_EQUR;
+ sy->sattre &= ~UNDEF_EQUR;
sy->svalue = 0;
}
else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC))
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))
// Invoke macro or complain about bad mnemonic
if (state < 0)
{
- if ((sy = lookup(opname, MACRO, 0)) != NULL)
+ if ((sy = lookup(opname, MACRO, 0)) != NULL)
InvokeMacro(sy, siz);
else
errors("unknown op '%s'", opname);
goto loop;
}
+ // 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)
}
-//
+//
// .if, Start conditional assembly
//
int d_if(void)
}
-//
+//
// .else, Do alternate case for .if
//
int d_else(void)