]> Shamusworld >> Repos - rmac/blobdiff - rmac.c
Code cleanup from last patch, also, version bump for same. :-)
[rmac] / rmac.c
diff --git a/rmac.c b/rmac.c
index f0b7efb41b8f3ec94e3cda5154a5fee35e0ff2eb..de2ff3626318cd3131665162f30c50e19b1776c6 100644 (file)
--- a/rmac.c
+++ b/rmac.c
 //
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // RMAC.C - Main Application Code
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011 - 2016 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 "rmac.h"
+#include "6502.h"
+#include "debug.h"
+#include "direct.h"
 #include "error.h"
-#include "listing.h"
-#include "procln.h"
-#include "token.h"
 #include "expr.h"
-#include "sect.h"
+#include "listing.h"
 #include "mark.h"
 #include "macro.h"
-#include "risca.h"
-#include "direct.h"
-#include "version.h"
-#include "debug.h"
-#include "symbol.h"
 #include "object.h"
+#include "procln.h"
+#include "riscasm.h"
+#include "sect.h"
+#include "symbol.h"
+#include "token.h"
+#include "version.h"
 
-int perm_verb_flag;                                    // Permanently verbose, interactive mode
-int list_flag;                                         // "-l" Listing flag on command line
-int verb_flag;                                         // Be verbose about what's going on
-int as68_flag;                                         // as68 kludge mode
-int glob_flag;                                         // Assume undefined symbols are global
-int lsym_flag;                                         // Include local symbols in object file
-int sbra_flag;                                         // Warn about possible short branches
-int obj_format;                                                // Object format flag
-int debug;                                                     // [1..9] Enable debugging levels
-int err_flag;                                          // '-e' specified
-int err_fd;                                                    // File to write error messages to 
-int rgpu, rdsp;                                                // Assembling Jaguar GPU or DSP code
-int list_fd;                                           // File to write listing to
-int regbank;                                           // RISC register bank
-int segpadsize;                                                // Segment padding size
-int in_main;                                           // In main memory flag for GPUMAIN
-int endian;                                                    // Host processor endianess
-char * objfname;                                       // Object filename pointer
-char * firstfname;                                     // First source filename
-char * cmdlnexec;                                      // Executable name, pointer to ARGV[0]
-char * searchpath;                                     // Search path for include files 
-char defname[] = "noname.o";           // Default output filename
-
-// Under Windows and UNIX malloc() is an expensive call, so for small amounts
-// of memory we allocate from a previously allocated buffer.
-
-#define A_AMOUNT        4096                                // Amount to malloc() at a time
-#define A_THRESH        64                                  // Use malloc() for amounts >= A_THRESH
-
-static LONG a_amount;                                       // Amount left at a_ptr 
-static char * a_ptr;                                        // Next free chunk
-LONG amemtot;                                               // amem() total of requests
-
-// Qsort; The THRESHold below is the insertion sort threshold, and has been adjusted
-// for records of size 48 bytes.The MTHREShold is where we stop finding a better median.
-#define THRESH          4                                   // Threshold for insertion
-#define MTHRESH         6                                   // Threshold for median
-
-static int (*qcmp)();                                       // The comparison routine
-static int qsz;                                             // Size of each record
-static int thresh;                                          // THRESHold in chars 
-static int mthresh;                                         // MTHRESHold in chars
+int perm_verb_flag;                            // Permanently verbose, interactive mode
+int list_flag;                                 // "-l" listing flag on command line
+int list_pag = 1;                              // Enable listing pagination by default
+int verb_flag;                                 // Be verbose about what's going on
+int m6502;                                             // 1, assembling 6502 code
+int as68_flag;                                 // as68 kludge mode
+int glob_flag;                                 // Assume undefined symbols are global
+int lsym_flag;                                 // Include local symbols in object file
+int sbra_flag;                                 // Warn about possible short branches
+int prg_flag;                                  // !=0, produce .PRG executable (2=symbols)
+int legacy_flag;                               // Do stuff like insert code in RISC assembler
+int obj_format;                                        // Object format flag
+int debug;                                             // [1..9] Enable debugging levels
+int err_flag;                                  // '-e' specified
+int err_fd;                                            // File to write error messages to
+int rgpu, rdsp;                                        // Assembling Jaguar GPU or DSP code
+int dsp56001;                                  // Assembling DSP 56001 code
+int list_fd;                                   // File to write listing to
+int regbank;                                   // RISC register bank
+int segpadsize;                                        // Segment padding size
+int endian;                                            // Host processor endianess (0 = LE, 1 = BE)
+char * objfname;                               // Object filename pointer
+char * firstfname;                             // First source filename
+char * cmdlnexec;                              // Executable name, pointer to ARGV[0]
+char * searchpath;                             // Search path for include files
+char defname[] = "noname.o";   // Default output filename
+int optim_flags[OPT_COUNT];            // Specific optimisations on/off matrix
+int activecpu = CPU_68000;             // Active 68k CPU (68000 by default)
+int activefpu = FPU_NONE;              // Active FPU (none by default)
 
 
 //
-// qst: Do a quicksort. First, find the median element, and put that one in the first place as 
-// the discriminator.  (This "median" is just the median of the first, last and middle elements).
-// (Using this median instead of the first element is a big win).  Then, the usual 
-// partitioning/swapping, followed by moving the discriminator into the right place.  Then, 
-// figure out the sizes of the two partions, do the smaller one recursively and the larger one 
-// via a repeat of this code.  Stopping when there are less than THRESH elements in a partition
-// and cleaning up with an insertion sort (in our caller) is a huge win. All data swaps are done 
-// in-line, which is space-losing but time-saving. (And there are only three places where 
-// this is done).
+// Manipulate file extension.
 //
-static int qst(char * base, char * max)
-{
-   char c, * i, * j, * jj;
-   int ii;
-   char * mid, * tmp;
-   long lo, hi;
-
-   /*
-        * At the top here, lo is the number of characters of elements in the
-        * current partition.  (Which should be max - base).
-        * Find the median of the first, last, and middle element and make
-        * that the middle element.  Set j to largest of first and middle.
-        * If max is larger than that guy, then it's that guy, else compare
-        * max with loser of first and take larger.  Things are set up to
-        * prefer the middle, then the first in case of ties.
-        */
-       lo = max - base;                /* number of elements as chars */
-       do      {
-               mid = i = base + qsz * ((lo / qsz) >> 1);
-               if (lo >= mthresh) {
-                       j = (qcmp((jj = base), i) > 0 ? jj : i);
-                       if (qcmp(j, (tmp = max - qsz)) > 0) {
-                               /* switch to first loser */
-                               j = (j == jj ? i : jj);
-                               if (qcmp(j, tmp) < 0)
-                                       j = tmp;
-                       }
-                       if (j != i) {
-                               ii = qsz;
-                               do      {
-                                       c = *i;
-                                       *i++ = *j;
-                                       *j++ = c;
-                               } while (--ii);
-                       }
-               }
-               /*
-                * Semi-standard quicksort partitioning/swapping
-                */
-               for (i = base, j = max - qsz; ; ) {
-                       while (i < mid && qcmp(i, mid) <= 0)
-                               i += qsz;
-                       while (j > mid) {
-                               if (qcmp(mid, j) <= 0) {
-                                       j -= qsz;
-                                       continue;
-                               }
-                               tmp = i + qsz;  /* value of i after swap */
-                               if (i == mid) {
-                                       /* j <-> mid, new mid is j */
-                                       mid = jj = j;
-                               } else {
-                                       /* i <-> j */
-                                       jj = j;
-                                       j -= qsz;
-                               }
-                               goto swap;
-                       }
-                       if (i == mid) {
-                               break;
-                       } else {
-                               /* i <-> mid, new mid is i */
-                               jj = mid;
-                               tmp = mid = i;  /* value of i after swap */
-                               j -= qsz;
-                       }
-swap:
-                       ii = qsz;
-                       do      {
-                               c = *i;
-                               *i++ = *jj;
-                               *jj++ = c;
-                       } while (--ii);
-                       i = tmp;
-               }
-               /*
-                * Look at sizes of the two partitions, do the smaller
-                * one first by recursion, then do the larger one by
-                * making sure lo is its size, base and max are update
-                * correctly, and branching back.  But only repeat
-                * (recursively or by branching) if the partition is
-                * of at least size THRESH.
-                */
-               i = (j = mid) + qsz;
-               if ((lo = j - base) <= (hi = max - i)) {
-                       if (lo >= thresh)
-                               qst(base, j);
-                       base = i;
-                       lo = hi;
-               } else {
-                       if (hi >= thresh)
-                               qst(i, max);
-                       max = j;
-               }
-       } while (lo >= thresh);
-
-   return(0);
-}
-
-
-/*
- * qsort:
- * First, set up some global parameters for qst to share.  Then, quicksort
- * with qst(), and then a cleanup insertion sort ourselves.  Sound simple?
- * It's not...
- */
-int rmac_qsort(char * base, int n, int size, int       (*compar)())
+// 'name' must be large enough to hold any possible filename. If 'stripp' is
+// nonzero, any old extension is removed. If the file does not already have an
+// extension, 'extension' is appended to the filename.
+//
+char * fext(char * name, char * extension, int stripp)
 {
-       register char c, * i, * j, * lo, * hi;
-       char * min, * max;
+       char * s;
 
-       if (n <= 1)
-               return(0);
+       // Find beginning of "real" name (strip off path)
+       char * beg = strrchr(name, SLASHCHAR);
 
-       qsz = size;
-       qcmp = compar;
-       thresh = qsz * THRESH;
-       mthresh = qsz * MTHRESH;
-       max = base + n * qsz;
+       if (beg == NULL)
+               beg = name;
 
-       if (n >= THRESH)
-       {
-               qst(base, max);
-               hi = base + thresh;
-       }
-       else
+       // Clobber any old extension, if requested
+       if (stripp)
        {
-               hi = max;
-       }
+               for(s=beg; *s && *s!='.'; ++s)
+                       ;
 
-       /*
-        * First put smallest element, which must be in the first THRESH, in
-        * the first position as a sentinel.  This is done just by searching
-        * the first THRESH elements (or the first n if n < THRESH), finding
-        * the min, and swapping it into the first position.
-        */
-       for (j = lo = base; (lo += qsz) < hi; )
-               if (qcmp(j, lo) > 0)
-                       j = lo;
-
-       if (j != base)
-       {
-               /* swap j into place */
-               for (i = base, hi = base + qsz; i < hi; )
-               {
-                       c = *j;
-                       *j++ = *i;
-                       *i++ = c;
-               }
-       }
-       /*
-        * With our sentinel in place, we now run the following hyper-fast
-        * insertion sort.  For each remaining element, min, from [1] to [n-1],
-        * set hi to the index of the element AFTER which this one goes.
-        * Then, do the standard insertion sort shift on a character at a time
-        * basis for each element in the frob.
-        */
-       for (min = base; (hi = min += qsz) < max; ) {
-               while (qcmp(hi -= qsz, min) > 0)
-                       /* void */;
-               if ((hi += qsz) != min) {
-                       for (lo = min + qsz; --lo >= min; ) {
-                               c = *lo;
-                               for (i = j = lo; (j -= qsz) >= hi; i = j)
-                                       *i = *j;
-                               *i = c;
-                       }
-               }
+               *s = '\0';
        }
-   return(0);
+
+       if (strrchr(beg, '.') == NULL)
+               strcat(beg, extension);
+
+       return name;
 }
 
 
 //
-// Allocate memory; Panic and Quit if we Run Out
+// Return 'item'nth element of semicolon-seperated pathnames specified in the
+// enviroment string 's'. Copy the pathname to 'buf'.  Return 0 if the 'item'
+// nth path doesn't exist.
+//
+// ['item' ranges from 0 to N-1, where N = #elements in search path]
 //
-char * amem(LONG amount)
+int nthpath(char * env_var, int itemno, char * buf)
 {
-       char * p;
+       char * s = searchpath;
+
+       if (s == NULL)
+               s = getenv(env_var);
 
-       if (amount & 1)                                           // Keep word alignment
-               ++amount;
+       if (s == NULL)
+               return 0;
 
-       if (amount < A_THRESH)
-       {                                  // Honor *small* request
-               if (a_amount < amount)
-               {
-                       a_ptr = amem(A_AMOUNT);
-                       a_amount = A_AMOUNT;
-               }
+       while (itemno--)
+               while (*s != EOS && *s++ != ';')
+                       ;
 
-               p = a_ptr;
-               a_ptr += amount;
-               a_amount -= amount;
-       }
-       else
-       {
-               amemtot += amount;                                    // Bump total alloc
-               p = (char *)malloc(amount);                           // Get memory from malloc
+       if (*s == EOS)
+               return 0;
 
-               if ((LONG)p == (LONG)NULL)
-                       fatal("memory exhausted");
+       while (*s != EOS && *s != ';')
+               *buf++ = *s++;
 
-               memset(p, 0, amount);
-       }
+       *buf++ = EOS;
 
-       return p;
+       return 1;
 }
 
 
 //
-// Copy stuff around, return pointer to dest+count+1 (doesn't handle overlap)
+// Display command line help
 //
-char * copy(char * dest, char * src, LONG count)
+void DisplayHelp(void)
 {
-       while (count--)
-               *dest++ = *src++;
-
-       return dest;
+       printf("Usage:\n"
+               "    %s [options] srcfile\n"
+               "\n"
+               "Options:\n"
+               "  -? or -h          Display usage information\n"
+               "  -dsymbol[=value]  Define symbol (with optional value, default=0)\n"
+               "  -e[errorfile]     Send error messages to file, not stdout\n"
+               "  -f[format]        Output object file format\n"
+               "                    a: ALCYON (use this for ST)\n"
+               "                    b: BSD (use this for Jaguar)\n"
+               "                    e: ELF\n"
+               "                    x: com/exe/xex (Atari 800)\n"
+               "  -i[path]          Directory to search for include files\n"
+               "  -l[filename]      Create an output listing file\n"
+               "  -l*[filename]     Create an output listing file without pagination\n"
+               "  -n                Don't do things behind your back in RISC assembler\n"
+               "  -o file           Output file name\n"
+               "  +o[value]         Turn a specific optimisation on\n"
+               "                    Available optimisation values and default settings:\n"
+               "                    o0: Absolute long adddresses to word        (on)\n"
+               "                    o1: move.l #x,dn/an to moveq                (on)\n"
+               "                    o2: Word branches to short                  (on)\n"
+               "                    o3: Outer displacement 0(an) to (an)        (off)\n"
+               "                    o4: lea size(An),An to addq #size,An        (off)\n"
+               "                    o5: Absolute long base displacement to word (off)\n"
+               "  ~o[value]         Turn a specific optimisation off\n"
+               "  +oall             Turn all optimisations on\n"
+               "  ~oall             Turn all optimisations off\n"
+               "  -p                Create an ST .prg (without symbols)\n"
+               "  -ps               Create an ST .prg (with symbols)\n"
+               "                    Forces -fa\n"
+               "  -r[size]          Pad segments to boundary size specified\n"
+               "                    w: word (2 bytes, default alignment)\n"
+               "                    l: long (4 bytes)\n"
+               "                    p: phrase (8 bytes)\n"
+               "                    d: double phrase (16 bytes)\n"
+               "                    q: quad phrase (32 bytes)\n"
+               "  -s                Warn about possible short branches\n"
+               "                    and applied optimisations\n"
+               "  -u                Force referenced and undefined symbols global\n"
+               "  -v                Set verbose mode\n"
+               "  -x                Turn on debugging mode\n"
+               "  -y[pagelen]       Set page line length (default: 61)\n"
+               "\n", cmdlnexec);
 }
 
 
 //
-// Clear a region of memory
+// Display version information
 //
-void clear(char * dest, LONG count)
+void DisplayVersion(void)
 {
-       while(count--)
-               *dest++ = 0;
+       printf("\n"
+               " _ __ _ __ ___   __ _  ___ \n"
+               "| '__| '_ ` _ \\ / _` |/ __|\n"
+               "| |  | | | | | | (_| | (__ \n"
+               "|_|  |_| |_| |_|\\__,_|\\___|\n"
+               "\nReboot's Macro Assembler\n"
+               "Copyright (C) 199x Landon Dyer, 2011-2017 Reboot\n"
+               "V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
 }
 
 
 //
-// Check to see if the string is a keyword. Returns -1, or a value from the
-// 'accept[]' table
+// Parse optimisation options
 //
-int kmatch(char * p, int * base, int * check, int * tab, int * accept)
+int ParseOptimization(char * optstring)
 {
-       int state;
-       int j;
+       int onoff = 0;
 
-       for(state=0; state>=0;)
-       {
-               j = base[state] + (int)tolowertab[*p];
+       if (*optstring == '+')
+               onoff = 1;
+       else if (*optstring != '~')
+               return ERROR;
 
-               if (check[j] != state)
-               {                               // Reject, character doesn't match
-                       state = -1;                                        // No match 
-                       break;
-               }
+       if ((optstring[2] == 'a' || optstring[2] == 'A')
+               && (optstring[3] == 'l' || optstring[3] == 'L')
+               && (optstring[4] == 'l' || optstring[4] == 'L'))
+       {
+               memset(optim_flags, onoff, OPT_COUNT * sizeof(int));
+               return OK;
+       }
+       else if (optstring[1] == 'o' || optstring[1] == 'O') // Turn on specific optimisation
+       {
+               int opt_no = atoi(&optstring[2]);
 
-               if (!*++p)
-               {                                           // Must accept or reject at EOS
-                       state = accept[j];                                 // (-1 on no terminal match) 
-                       break;
+               if ((opt_no >= 0) && (opt_no < OPT_COUNT))
+               {
+                       optim_flags[opt_no] = onoff;
+                       return OK;
                }
-
-               state = tab[j];
+               else
+                       return ERROR;
+       }
+       else
+       {
+               return ERROR;
        }
-
-       return state;
-}
-
-
-//
-// Auto-even a section
-//
-void autoeven(int sect)
-{
-       switchsect(sect);
-       d_even();
-       savsect();
 }
 
 
 //
-// Manipulate file extension.
-// `name' must be large enough to hold any possible filename.
-// If `stripp' is nonzero, any old extension is removed.
-// Then, if the file does not already have an extension,
-// `extension' is appended to the filename.
+// Process command line arguments and do an assembly
 //
-char * fext(char * name, char * extension, int stripp)
+int Process(int argc, char ** argv)
 {
-       char * s, * beg;                                           // String pointers
-
-       // Find beginning of "real" name
-       beg = name + strlen(name) - 1;
-
-       for(; beg>name; --beg)
+       int argno;                                              // Argument number
+       SYM * sy;                                               // Pointer to a symbol record
+       char * s;                                               // String pointer
+       int fd;                                                 // File descriptor
+       char fnbuf[FNSIZ];                              // Filename buffer
+       int i;                                                  // Iterator
+
+       errcnt = 0;                                             // Initialise error count
+       listing = 0;                                    // Initialise listing level
+       list_flag = 0;                                  // Initialise listing flag
+       verb_flag = perm_verb_flag;             // Initialise verbose flag
+       as68_flag = 0;                                  // Initialise as68 kludge mode
+       glob_flag = 0;                                  // Initialise .globl flag
+       sbra_flag = 0;                                  // Initialise short branch flag
+       debug = 0;                                              // Initialise debug flag
+       searchpath = NULL;                              // Initialise search path
+       objfname = NULL;                                // Initialise object filename
+       list_fname = NULL;                              // Initialise listing filename
+       err_fname = NULL;                               // Initialise error filename
+       obj_format = BSD;                               // Initialise object format
+       firstfname = NULL;                              // Initialise first filename
+       err_fd = ERROUT;                                // Initialise error file descriptor
+       err_flag = 0;                                   // Initialise error flag
+       rgpu = 0;                                               // Initialise GPU assembly flag
+       rdsp = 0;                                               // Initialise DSP assembly flag
+       lsym_flag = 1;                                  // Include local symbols in object file
+       regbank = BANK_N;                               // No RISC register bank specified
+       orgactive = 0;                                  // Not in RISC org section
+       orgwarning = 0;                                 // No ORG warning issued
+       segpadsize = 2;                                 // Initialise segment padding size
+       m6502 = 0;                                              // 6502 mode off by default
+
+       // Initialise modules
+       InitSymbolTable();                              // Symbol table
+       InitTokenizer();                                // Tokenizer
+       InitLineProcessor();                    // Line processor
+       InitExpression();                               // Expression analyzer
+       InitSection();                                  // Section manager / code generator
+       InitMark();                                             // Mark tape-recorder
+       InitMacro();                                    // Macro processor
+       InitListing();                                  // Listing generator
+       Init6502();                                             // 6502 assembler
+
+       // Process command line arguments and assemble source files
+       for(argno=0; argno<argc; argno++)
        {
-               if (*beg == SLASHCHAR)
+               if (*argv[argno] == '-')
                {
-                       ++beg;
-                       break;
-               }
-       }
+                       switch (argv[argno][1])
+                       {
+                       case 'd':                               // Define symbol
+                       case 'D':
+                               for(s=argv[argno]+2; *s!=EOS;)
+                               {
+                                       if (*s++ == '=')
+                                       {
+                                               s[-1] = EOS;
+                                               break;
+                                       }
+                               }
 
-       if (stripp)
-       {                                             // Clobber any old extension
-               for(s=beg; *s && *s!='.'; ++s) 
-                       ;
+                               if (argv[argno][2] == EOS)
+                               {
+                                       printf("-d: empty symbol\n");
+                                       errcnt++;
+                                       return errcnt;
+                               }
 
-               *s = '\0';
-       }
+                               sy = lookup(argv[argno] + 2, 0, 0);
 
-       for(s=beg; *s!='.'; ++s)
-       {
-               if (!*s)
-               {                                             // Append the new extension
-                       strcat(beg, extension);
-                       break;
-               }
-       }
+                               if (sy == NULL)
+                               {
+                                       sy = NewSymbol(argv[argno] + 2, LABEL, 0);
+                                       sy->svalue = 0;
+                               }
 
-       return name;
-}
+                               sy->sattr = DEFINED | EQUATED | ABS;
+                               sy->svalue = (*s ? (VALUE)atoi(s) : 0);
+                               break;
+                       case 'e':                               // Redirect error message output
+                       case 'E':
+                               err_fname = argv[argno] + 2;
+                               break;
+                       case 'f':                               // -f<format>
+                       case 'F':
+                               switch (argv[argno][2])
+                               {
+                               case EOS:
+                               case 'a':                       // -fa = Alcyon [the default]
+                               case 'A':
+                                       obj_format = ALCYON;
+                                       break;
+                               case 'b':                       // -fb = BSD (Jaguar Recommended: 3 out 4 jaguars recommend it!)
+                               case 'B':
+                                       obj_format = BSD;
+                                       break;
+                               case 'e':                       // -fe = ELF
+                               case 'E':
+                                       obj_format = ELF;
+                                       break;
+                               case 'x':                       // -fx = COM/EXE/XEX
+                               case 'X':
+                                       obj_format = XEX;
+                                       break;
+                               default:
+                                       printf("-f: unknown object format specified\n");
+                                       errcnt++;
+                                       return errcnt;
+                               }
+                               break;
+                       case 'g':                               // Debugging flag
+                       case 'G':
+                               printf("Debugging flag (-g) not yet implemented\n");
+                               break;
+                       case 'i':                               // Set directory search path
+                       case 'I':
+                               searchpath = argv[argno] + 2;
+                               break;
+                       case 'l':                               // Produce listing file
+                       case 'L':
+                               if (*(argv[argno] + 2) == '*')
+                               {
+                                       list_fname = argv[argno] + 3;
+                                       list_pag = 0;    // Special case - turn off pagination
+                               }
+                               else
+                               {
+                                       list_fname = argv[argno] + 2;
+                               }
 
+                               listing = 1;
+                               list_flag = 1;
+                               lnsave++;
+                               break;
+                       case 'o':                               // Direct object file output
+                       case 'O':
+                               if (argv[argno][2] != EOS)
+                                       objfname = argv[argno] + 2;
+                               else
+                               {
+                                       if (++argno >= argc)
+                                       {
+                                               printf("Missing argument to -o");
+                                               errcnt++;
+                                               return errcnt;
+                                       }
+
+                                       objfname = argv[argno];
+                               }
 
-//
-// Return `item'nth element of semicolon-seperated pathnames specified in the
-// enviroment string `s'. Copy the pathname to `buf'.  Return 0 if the `item'
-// nth path doesn't exist.
-// 
-// [`item' ranges from 0 to N-1, where N = #elements in search path]
-//
-int nthpath(char * env_var, int itemno, char * buf)
-{
-       char * s = searchpath;
+                               break;
+                       case 'p':               /* -p: generate ".PRG" executable output */
+                       case 'P':
+                               /*
+                                * -p           .PRG generation w/o symbols
+                                * -ps  .PRG generation with symbols
+                                */
+                               switch (argv[argno][2])
+                               {
+                                       case EOS:
+                                               prg_flag = 1;
+                                               break;
+
+                                       case 's':
+                                       case 'S':
+                                               prg_flag = 2;
+                                               break;
+
+                                       default:
+                                               printf("-p: syntax error\n");
+                                               ++errcnt;
+                                               return errcnt;
+                               }
 
-       if (s == NULL)
-               s = getenv(env_var);
+                               // Enforce Alcyon object format - kind of silly
+                               // to ask for .prg output without it!
+                               obj_format = ALCYON;
+                               break;
+                       case 'r':                               // Pad seg to requested boundary size
+                       case 'R':
+                               switch(argv[argno][2])
+                               {
+                               case 'w': case 'W': segpadsize = 2;  break;
+                               case 'l': case 'L': segpadsize = 4;  break;
+                               case 'p': case 'P': segpadsize = 8;  break;
+                               case 'd': case 'D': segpadsize = 16; break;
+                               case 'q': case 'Q': segpadsize = 32; break;
+                               default: segpadsize = 2; break; // Effective autoeven();
+                               }
+                               break;
+                       case 's':                               // Warn about possible short branches
+                       case 'S':
+                               sbra_flag = 1;
+                               break;
+                       case 'u':                               // Make undefined symbols .globl
+                       case 'U':
+                               glob_flag = 1;
+                               break;
+                       case 'v':                               // Verbose flag
+                       case 'V':
+                               verb_flag++;
 
-       if (s == NULL)
-               return 0;
+                               if (verb_flag > 1)
+                                       DisplayVersion();
 
-       while (itemno--)
-               while (*s != EOS && *s++ != ';')
-                       ;
+                               break;
+                       case 'x':                               // Turn on debugging
+                       case 'X':
+                               debug = 1;
+                               printf("~ Debugging ON\n");
+                               break;
+                       case 'y':                               // -y<pagelen>
+                       case 'Y':
+                               pagelen = atoi(argv[argno] + 2);
 
-       if (*s == EOS)
-               return 0;
+                               if (pagelen < 10)
+                               {
+                                       printf("-y: bad page length\n");
+                                       ++errcnt;
+                                       return errcnt;
+                               }
 
-       while (*s != EOS && *s != ';')
-               *buf++ = *s++;
+                               break;
+                       case EOS:                               // Input is stdin
+                               if (firstfname == NULL) // Kludge first filename
+                                       firstfname = defname;
 
-       *buf++ = EOS;
+                               include(0, "(stdin)");
+                               Assemble();
+                               break;
+                       case 'h':                               // Display command line usage
+                       case 'H':
+                       case '?':
+                               DisplayVersion();
+                               DisplayHelp();
+                               errcnt++;
+                               break;
+                       case 'n':                               // Turn off legacy mode
+                       case 'N':
+                               legacy_flag = 0;
+                               printf("Legacy mode OFF\n");
+                               break;
+                       default:
+                               DisplayVersion();
+                               printf("Unknown switch: %s\n\n", argv[argno]);
+                               DisplayHelp();
+                               errcnt++;
+                               break;
+                       }
+               }
+               else if (*argv[argno] == '+' || *argv[argno] == '~')
+               {
+                       if (ParseOptimization(argv[argno]) != OK)
+                       {
+                               DisplayVersion();
+                               printf("Unknown switch: %s\n\n", argv[argno]);
+                               DisplayHelp();
+                               errcnt++;
+                               break;
+                       }
+               }
+               else
+               {
+                       // Record first filename.
+                       if (firstfname == NULL)
+                               firstfname = argv[argno];
 
-       return 1;
-}
+                       strcpy(fnbuf, argv[argno]);
+                       fext(fnbuf, ".s", 0);
+                       fd = open(fnbuf, 0);
 
+                       if (fd < 0)
+                       {
+                               printf("Cannot open: %s\n", fnbuf);
+                               errcnt++;
+                               continue;
+                       }
 
-//
-// Display Command Line Help
-//
-void display_help(void)
-{
-       printf("Usage:\n");
-       printf("    %s [options] srcfile\n", cmdlnexec);
-       printf("\n");
-       printf("Options:\n");
-       printf("   -? or -h              display usage information\n");
-       printf("   -dsymbol[=value]      define symbol\n");
-       printf("   -e[errorfile]         send error messages to file, not stdout\n");
-       printf("   -f[format]            output object file format\n");
-       printf("                         b: BSD (use this for Jaguar)\n");
-       printf("   -i[path]              directory to search for include files\n");
-       printf("   -l[filename]          create an output listing file\n");
-       printf("   -o file               output file name\n");
-       printf("   -r[size]              pad segments to boundary size specified\n");
-       printf("                         w: word (2 bytes, default alignment)\n");
-       printf("                         l: long (4 bytes)\n");
-       printf("                         p: phrase (8 bytes)\n");
-       printf("                         d: double phrase (16 bytes)\n");
-       printf("                         q: quad phrase (32 bytes)\n");
-       printf("   -s                    warn about possible short branches\n");
-       printf("   -u                    force referenced and undefined symbols global\n");
-       printf("   -v                    set verbose mode\n");
-       printf("   -y[pagelen]           set page line length (default: 61)\n");
-       printf("\n");
-}
+                       include(fd, fnbuf);
+                       Assemble();
+               }
+       }
 
+       // Wind-up processing;
+       // o  save current section (no more code generation)
+       // o  do auto-even of all sections (or boundary alignment as requested
+       //    through '-r')
+    // o  save the last pc value for 6502 (if we used 6502 at all) and
+    //    detemine if the last section contains anything
+       // o  determine name of object file:
+       //    -  "foo.o" for linkable output;
+       //    -  "foo.prg" for GEMDOS executable (-p flag).
+       SaveSection();
+
+       for(i=TEXT; i<=BSS; i<<=1)
+       {
+               SwitchSection(i);
 
-//
-// Display Version Information
-//
-void display_version(void)
-{
-       printf("\nReboot's Macro Assembler for Atari Jaguar\n"); 
-       printf("Copyright (C) 199x Landon Dyer, 2011 Reboot\n"); 
-       printf("V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
-}
+               switch(segpadsize)
+               {
+               case 2:  d_even();    break;
+               case 4:  d_long();    break;
+               case 8:  d_phrase();  break;
+               case 16: d_dphrase(); break;
+               case 32: d_qphrase(); break;
+               }
 
+               SaveSection();
+       }
 
-// 
-// Process Command Line Arguments and do an Assembly
-//
-int process(int argc, char ** argv)
-{
-   int argno;                                               // Argument number
-   SYM * sy;                                                 // Pointer to a symbol record
-   char * s;                                                 // String pointer
-   int fd;                                                  // File descriptor
-   char fnbuf[FNSIZ];                                       // Filename buffer 
-   int i;                                                   // Iterator
-
-   errcnt = 0;                                              // Initialise error count
-   listing = 0;                                             // Initialise listing level
-   list_flag = 0;                                           // Initialise listing flag
-   verb_flag = perm_verb_flag;                              // Initialise verbose flag
-   as68_flag = 0;                                           // Initialise as68 kludge mode
-   glob_flag = 0;                                           // Initialise .globl flag
-   sbra_flag = 0;                                           // Initialise short branch flag
-   debug = 0;                                               // Initialise debug flag
-   searchpath = NULL;                                       // Initialise search path
-   objfname = NULL;                                         // Initialise object filename
-   list_fname = NULL;                                       // Initialise listing filename
-   err_fname = NULL;                                        // Initialise error filename
-   obj_format = BSD;                                        // Initialise object format
-   firstfname = NULL;                                       // Initialise first filename
-   err_fd = ERROUT;                                         // Initialise error file descriptor
-   err_flag = 0;                                            // Initialise error flag
-   rgpu = 0;                                                // Initialise GPU assembly flag
-   rdsp = 0;                                                // Initialise DSP assembly flag
-   lsym_flag = 1;                                           // Include local symbols in object file
-   regbank = BANK_N;                                        // No RISC register bank specified
-   orgactive = 0;                                           // Not in RISC org section
-   orgwarning = 0;                                          // No ORG warning issued
-   a_amount = 0;
-   segpadsize = 2;                                          // Initialise segment padding size
-   in_main = 0;
-
-   // Initialise modules
-       init_sym();                                              // Symbol table
-   init_token();                                            // Tokenizer
-   init_procln();                                           // Line processor
-   init_expr();                                             // Expression analyzer
-   init_sect();                                             // Section manager / code generator
-   init_mark();                                             // Mark tape-recorder
-       init_macro();                                            // Macro processor
-   init_list();                                             // Listing generator
-
-   // Process command line arguments and assemble source files
-   for(argno = 0; argno < argc; ++argno) {
-      if (*argv[argno] == '-') {
-         switch(argv[argno][1]) {
-            case 'd':                                       // Define symbol
-            case 'D':
-               for(s = argv[argno] + 2; *s != EOS;) {
-                  if (*s++ == '=') {
-                     s[-1] = EOS;
-                     break;
-                                               }
-               }
-               if (argv[argno][2] == EOS) {
-                  printf("-d: empty symbol\n");
-                  ++errcnt;
-                  return(errcnt);
-               }
-               sy = lookup(argv[argno] + 2, 0, 0);
-               if (sy == NULL) {
-                  sy = newsym(argv[argno] + 2, LABEL, 0);
-                  sy->svalue = 0;
-               }
-               sy->sattr = DEFINED | EQUATED | ABS;
-               if (*s)
-                  sy->svalue = (VALUE)atoi(s);
-               else
-                  sy->svalue = 0;
-               break;
-            case 'e':                                       // Redirect error message output
-            case 'E':
-               err_fname = argv[argno] + 2;
-               break;
-            case 'f':                                       // -f<format>
-            case 'F':
-               switch(argv[argno][2]) {
-                  case EOS:
-                  case 'b':                                 // -fb = BSD (Jaguar Recommended)
-                  case 'B':
-                     obj_format = BSD;
-                     break;
-                  default:
-                     printf("-f: unknown object format specified\n");
-                     ++errcnt;
-                     return(errcnt);
-               }
-               break;
-            case 'g':                                       // Debugging flag
-            case 'G':
-               printf("Debugging flag (-g) not yet implemented\n");
-               break;
-            case 'i':                                       // Set directory search path
-            case 'I':
-               searchpath = argv[argno] + 2;
-               break;
-            case 'l':                                       // Produce listing file
-            case 'L':
-               list_fname = argv[argno] + 2;
-               listing = 1;
-               list_flag = 1;
-               ++lnsave;
-               break;
-            case 'o':                                       // Direct object file output
-            case 'O':
-               if (argv[argno][2] != EOS) objfname = argv[argno] + 2;
-               else {
-                  if (++argno >= argc) {
-                     printf("Missing argument to -o");
-                     ++errcnt;
-                     return(errcnt);
-                  }
-                  objfname = argv[argno];
-               }
-               break;
-            case 'r':                                       // Pad seg to requested boundary size
-            case 'R':
-               switch(argv[argno][2]) {
-                  case 'w': case 'W': segpadsize = 2;  break;  
-                  case 'l': case 'L': segpadsize = 4;  break;
-                  case 'p': case 'P': segpadsize = 8;  break;
-                  case 'd': case 'D': segpadsize = 16; break;
-                  case 'q': case 'Q': segpadsize = 32; break;
-                  default: segpadsize = 2; break;           // Effective autoeven();
-               }
-               break;
-            case 's':                                       // Warn about possible short branches
-            case 'S':
-               sbra_flag = 1;
-               break;
-            case 'u':                                       // Make undefined symbols .globl
-            case 'U':
-               glob_flag = 1;
-               break;
-            case 'v':                                       // Verbose flag
-            case 'V':
-               verb_flag++;
-               if (verb_flag > 1) display_version();
-               break;
-            case 'x':                                       // Turn on debugging
-            case 'X':
-               debug = 1;
-               printf("~ Debugging ON\n");
-               break;
-            case 'y':                                       // -y<pagelen>
-            case 'Y':
-               pagelen = atoi(argv[argno] + 2);
-               if (pagelen < 10) {
-                  printf("-y: bad page length\n");
-                  ++errcnt;
-                  return(errcnt);
-               }
-               break;
-            case EOS:                                       // Input is stdin
-               if (firstfname == NULL)                       // Kludge first filename
-                  firstfname = defname;
-               include(0, "(stdin)");
-               assemble();
-               break;
-            case 'h':                                       // Display command line usage
-            case 'H':
-            case '?':
-               display_version();
-               display_help();
-               ++errcnt;
-               break;
-            default:
-               display_version();
-               printf("Unknown switch: %s\n\n", argv[argno]);
-               display_help();
-               ++errcnt;
-               break;
-         }
-      } else {
-         // Record first filename.
-         if (firstfname == NULL)
-            firstfname = argv[argno];
-         strcpy(fnbuf, argv[argno]);
-         fext(fnbuf, ".s", 0);
-         fd = open(fnbuf, 0);
-         if (fd < 0) {
-            printf("Cannot open: %s\n", fnbuf);
-            ++errcnt;
-            continue;
-         }
-         include(fd, fnbuf);
-         assemble();
-      }
-   }
-
-   // Wind-up processing;
-   // o  save current section (no more code generation)
-   // o  do auto-even of all sections (or boundary alignment as requested through '-r')
-   // o  determine name of object file:
-   //    -  "foo.o" for linkable output;
-   //    -  "foo.prg" for GEMDOS executable (-p flag).
-   savsect();
-   for(i = TEXT; i <= BSS; i <<= 1) {
-      switchsect(i);
-      switch(segpadsize) {
-         case 2:  d_even();    break;
-         case 4:  d_long();    break;
-         case 8:  d_phrase();  break;
-         case 16: d_dphrase(); break;
-         case 32: d_qphrase(); break;
-      }
-      savsect();
-   }
-
-   if (objfname == NULL) {
-      if (firstfname == NULL)
-         firstfname = defname;
-      strcpy(fnbuf, firstfname);
-      //fext(fnbuf, prg_flag ? ".prg" : ".o", 1);
-      fext(fnbuf, ".o", 1);
-      objfname = fnbuf;
-   }
-
-   // With one pass finished, go back and:
-   // (1)   run through all the fixups and resolve forward references;
-   // (1.5) ensure that remaining fixups can be handled by the linker
-   //       (`lo68' format, extended (postfix) format....)
-   // (2)   generate the output file image and symbol table;
-   // (3)   generate relocation information from left-over fixups.
-   fixups();                                                // Do all fixups
-   stopmark();                                              // Stop mark tape-recorder
-   if (errcnt == 0) {
-      if ((fd = open(objfname, _OPEN_FLAGS, _PERM_MODE)) < 0)
-         cantcreat(objfname);
-      if (verb_flag) {
-         s = "object";
-         printf("[Writing %s file: %s]\n", s, objfname);
-      }
-      object((WORD)fd);
-      close(fd);
-      if (errcnt != 0)
-         unlink(objfname);
-   }
-
-   if (list_flag) {
-      if (verb_flag) printf("[Wrapping-up listing file]\n");
-      listing = 1;
-      symtable();
-      close(list_fd);
-   }
-
-   if (err_flag)
-      close(err_fd);
-
-   DEBUG dump_everything();
-
-   return(errcnt);
-}
+       SwitchSection(M6502);
 
+       if (sloc != currentorg[0])
+       {
+               currentorg[1] = sloc;
+               currentorg += 2;
+       }
 
-#if 0
-//
-// Interactive Mode
-//
-void interactive(void)
-{
-       char * s;                                                 // String pointer for banner
-       char ln[LNSIZ];                                          // Input line
-       char * argv[MAXARGV];                                     // Argument values
-       int argcnt;                                              // Argument count
-
-   // As there is no command line, print a copyright message and prompt for command line
-       s = "*****************************************************\n";
-       printf("\n%s* RMAC - Reboot's Macro Assembler for Atari Jaguar  *\n", s);
-       printf("* Copyright (C) 199x Landon Dyer, 2011 Reboot       *\n");
-       printf("* Version %01i.%01i.%01i                Platform: %-9s  *\n",MAJOR,MINOR,PATCH,PLATFORM);
-       printf("* ------------------------------------------------- *\n");
-       printf("* INTERACTIVE MODE (press ENTER by itself to quit)  *\n%s\n", s);
-
-       perm_verb_flag = 1;                                      // Enter permanent verbose mode
-
-       // Handle commandlines until EOF or we get an empty one
-       for(;;)
+       if (objfname == NULL)
        {
-               loop:
-               printf("* ");
-               fflush(stdout);                                       // Make prompt visible
+               if (firstfname == NULL)
+                       firstfname = defname;
+
+               strcpy(fnbuf, firstfname);
+               fext(fnbuf, (prg_flag ? ".prg" : ".o"), 1);
+               objfname = fnbuf;
+       }
 
-//             if (gets(ln) == NULL || !*ln)                          // Get input line
-               if (fgets(ln, LNSIZ, stdin) == NULL || !*ln)                          // Get input line
-                       break;
+       // With one pass finished, go back and:
+       // (1)   run through all the fixups and resolve forward references;
+       // (1.5) ensure that remaining fixups can be handled by the linker
+       //       (`lo68' format, extended (postfix) format....)
+       // (2)   generate the output file image and symbol table;
+       // (3)   generate relocation information from left-over fixups.
+       ResolveAllFixups();                                             // Do all fixups
+       StopMark();                                                             // Stop mark tape-recorder
 
-               argcnt = 0;                                           // Process input line
-               s = ln;
+       if (errcnt == 0)
+       {
+               if ((fd = open(objfname, _OPEN_FLAGS, _PERM_MODE)) < 0)
+                       cantcreat(objfname);
 
-               while (*s)
+               if (verb_flag)
                {
-                       if (isspace(*s))
-                       {                                  // Skip whitespace
-                               ++s;
-                       }
-                       else
-                       {
-                               if (argcnt >= MAXARGV)
-                               {
-                                       printf("Too many arguments\n");
-                                       goto loop;
-                               }
+                       s = (prg_flag ? "executable" : "object");
+                       printf("[Writing %s file: %s]\n", s, objfname);
+               }
 
-                               argv[argcnt++] = s;
+               WriteObject(fd);
+               close(fd);
 
-                               while (*s && !isspace(*s))
-                                       ++s;
+               if (errcnt != 0)
+                       unlink(objfname);
+       }
 
-                               if (isspace(*s))
-                                       *s++ = EOS;
-                       }
-               }
+       if (list_flag)
+       {
+               if (verb_flag)
+                       printf("[Wrapping-up listing file]\n");
 
-               if (argcnt == 0)                                       // Exit if no arguments
-                       break;
+               listing = 1;
+               symtable();
+               close(list_fd);
+       }
 
-               process(argcnt, argv);                                // Process arguments
+       if (err_flag)
+               close(err_fd);
 
-               if (errcnt)
-                       printf("%d assembly error%s\n", errcnt, (errcnt > 1) ? "s" : "");
-       }
+       DEBUG dump_everything();
+
+       return errcnt;
 }
-#endif
 
 
 //
-// Determine Processor Endianess
+// Determine processor endianess
 //
-int get_endianess(void)
+int GetEndianess(void)
 {
        int i = 1;
        char * p = (char *)&i;
@@ -820,35 +621,29 @@ int get_endianess(void)
 
 
 //
-// Application Entry Point; Handle the Command Line
+// Application entry point
 //
 int main(int argc, char ** argv)
 {
-       int status;                                              // Status flag
-       int i;
-
-       perm_verb_flag = 0;                                      // Clobber "permanent" verbose flag
-       cmdlnexec = argv[0];                                     // Obtain executable name
+       perm_verb_flag = 0;                             // Clobber "permanent" verbose flag
+       legacy_flag = 1;                                // Default is legacy mode on (:-P)
 
-       endian = get_endianess();                                // Get processor endianess
+       // Set legacy optimisation flags to on and everything else to off
+       memset(optim_flags, 0, OPT_COUNT * sizeof(int));
+       optim_flags[OPT_ABS_SHORT] =
+               optim_flags[OPT_MOVEL_MOVEQ] =
+               optim_flags[OPT_BSR_BCC_S] = 1;
 
-       for(i=0; i<MAXFWDJUMPS; i++)
-               fwdjump[i] = 0;
+       cmdlnexec = argv[0];                    // Obtain executable name
+       endian = GetEndianess();                // Get processor endianess
 
+       // If commands were passed in, process them
        if (argc > 1)
-       {                                           // Full command line passed
-               status = process(argc - 1, argv + 1);              
-       }
-       // Interactive mode 
-       else
-       {
-// Sorry Landon, this is the year 20xx and we haz plenty of resources now ;-)
-//             status = 0;
-//             interactive();
-               // Instead, we show a nice banner and switches :-)
-               display_version();
-               display_help();
-       }
+               return Process(argc - 1, argv + 1);
+
+       DisplayVersion();
+       DisplayHelp();
 
-       return status;
+       return 0;
 }
+