]> Shamusworld >> Repos - rmac/blobdiff - rmac.c
EOY minor update.
[rmac] / rmac.c
diff --git a/rmac.c b/rmac.c
index c47adf2b2997cd60fe8e519cab9f3f1b516cdc3c..1111d6d64053ac5901cea5b35e0991db71372538 100644 (file)
--- a/rmac.c
+++ b/rmac.c
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // RMAC.C - Main Application Code
-// Copyright (C) 199x Landon Dyer, 2011 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
+// Source utilised with the kind permission of Landon Dyer
 //
 
 #include "rmac.h"
+#include "6502.h"
+#include "debug.h"
+#include "direct.h"
+#include "dsp56k.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 "object.h"
+#include "procln.h"
 #include "riscasm.h"
-#include "direct.h"
-#include "version.h"
-#include "debug.h"
+#include "sect.h"
 #include "symbol.h"
-#include "object.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 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 list_fd;                                           // File to write listing to
-int regbank;                                           // RISC register bank
-int segpadsize;                                                // Segment padding size
-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
-
-
-//
-// Copy stuff around, return pointer to dest+count+1 (doesn't handle overlap)
-//
-char * copy(char * dest, char * src, LONG count)
-{
-       while (count--)
-               *dest++ = *src++;
-
-       return dest;
-}
-
-
-//
-// Clear a region of memory
-//
-void clear(char * dest, LONG count)
-{
-       while(count--)
-               *dest++ = 0;
-}
-
-
-//
-// Check to see if the string is a keyword. Returns -1, or a value from the
-// 'accept[]' table
-//
-int kmatch(char * p, int * base, int * check, int * tab, int * accept)
-{
-       int state;
-       int j;
-
-       for(state=0; state>=0;)
-       {
-               j = base[state] + (int)tolowertab[*p];
-
-               if (check[j] != state)
-               {                               // Reject, character doesn't match
-                       state = -1;                                        // No match 
-                       break;
-               }
-
-               if (!*++p)
-               {                                           // Must accept or reject at EOS
-                       state = accept[j];                                 // (-1 on no terminal match) 
-                       break;
-               }
-
-               state = tab[j];
-       }
+#include "token.h"
+#include "version.h"
 
-       return state;
-}
+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 prg_extend;                                        // !=0, output extended .PRG 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 robjproc;                                  // Assembling Jaguar Object Processor 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)
 
 
 //
-// Auto-even a section
+// Convert a string to uppercase
 //
-void autoeven(int sect)
+void strtoupper(char * s)
 {
-       switchsect(sect);
-       d_even();
-       savsect();
+       while (*s)
+               *s++ &= 0xDF;
 }
 
 
 //
 // 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.
+//
+// '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)
 {
-       char * s, * beg;                                           // String pointers
+       char * s;
 
-       // Find beginning of "real" name
-       beg = name + strlen(name) - 1;
+       // Find beginning of "real" name (strip off path)
+       char * beg = strrchr(name, SLASHCHAR);
 
-       for(; beg>name; --beg)
-       {
-               if (*beg == SLASHCHAR)
-               {
-                       ++beg;
-                       break;
-               }
-       }
+       if (beg == NULL)
+               beg = name;
 
+       // Clobber any old extension, if requested
        if (stripp)
-       {                                             // Clobber any old extension
-               for(s=beg; *s && *s!='.'; ++s) 
+       {
+               for(s=beg; *s && *s!='.'; ++s)
                        ;
 
                *s = '\0';
        }
 
-       for(s=beg; *s!='.'; ++s)
-       {
-               if (!*s)
-               {                                             // Append the new extension
-                       strcat(beg, extension);
-                       break;
-               }
-       }
+       if (strrchr(beg, '.') == NULL)
+               strcat(beg, extension);
 
        return name;
 }
 
 
 //
-// Return `item'nth element of semicolon-seperated pathnames specified in the
-// enviroment string `s'. Copy the pathname to `buf'.  Return 0 if the `item'
+// 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]
+//
+// ['item' ranges from 0 to N-1, where N = #elements in search path]
 //
 int nthpath(char * env_var, int itemno, char * buf)
 {
@@ -189,23 +134,50 @@ int nthpath(char * env_var, int itemno, char * buf)
 
 
 //
-// Display Command Line Help
+// Display command line help
 //
-void display_help(void)
+void DisplayHelp(void)
 {
        printf("Usage:\n"
                "    %s [options] srcfile\n"
                "\n"
                "Options:\n"
                "  -? or -h          Display usage information\n"
-               "  -dsymbol[=value]  Define symbol\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\n"
                "                    b: BSD (use this for Jaguar)\n"
+               "                    e: ELF\n"
+               "                    p: P56 (use this for DSP56001 only)\n"
+               "                    l: LOD (use this for DSP56001 only)\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"
+               "  -m[cpu]           Select default CPU. Available options:\n"
+               "                    68000, 68020, 68030, 68040, 68060, 6502, tom, jerry, 56001\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"
+               "                    o6: Null branches to NOP                    (off)\n"
+               "                    o7: clr.l Dx to moveq #0,Dx                 (off)\n"
+               "                    o8: adda.w/l #x,Dy to addq.w/l #x,Dy        (off)\n"
+               "                    o9: adda.w/l #x,Dy to lea x(Dy),Dy          (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"
+               "  -px               Create an ST .prg (with exsymbols)\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"
@@ -213,61 +185,110 @@ void display_help(void)
                "                    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);
 }
 
 
 //
-// Display Version Information
+// Display version information
 //
-void display_version(void)
+void DisplayVersion(void)
 {
-       printf("\nReboot's Macro Assembler for Atari Jaguar\n"
-               "Copyright (C) 199x Landon Dyer, 2011 Reboot\n"
+       printf("\n"
+               " _ __ _ __ ___   __ _  ___ \n"
+               "| '__| '_ ` _ \\ / _` |/ __|\n"
+               "| |  | | | | | | (_| | (__ \n"
+               "|_|  |_| |_| |_|\\__,_|\\___|\n"
+               "\nReboot's Macro Assembler\n"
+               "Copyright (C) 199x Landon Dyer, 2011-2020 Reboot\n"
                "V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
 }
 
 
-// 
-// Process Command Line Arguments and do an Assembly
 //
-int process(int argc, char ** argv)
+// Parse optimisation options
+//
+int ParseOptimization(char * optstring)
+{
+       int onoff = 0;
+
+       if (*optstring == '+')
+               onoff = 1;
+       else if (*optstring != '~')
+               return ERROR;
+
+       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 ((opt_no >= 0) && (opt_no < OPT_COUNT))
+               {
+                       optim_flags[opt_no] = onoff;
+                       return OK;
+               }
+               else
+                       return ERROR;
+       }
+       else
+       {
+               return ERROR;
+       }
+}
+
+
+//
+// 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 
+       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
+       errcnt = 0;                                             // Initialize error count
+       listing = 0;                                    // Initialize listing level
+       list_flag = 0;                                  // Initialize listing flag
+       verb_flag = perm_verb_flag;             // Initialize verbose flag
+       as68_flag = 0;                                  // Initialize as68 kludge mode
+       glob_flag = 0;                                  // Initialize .globl flag
+       sbra_flag = 0;                                  // Initialize short branch flag
+       debug = 0;                                              // Initialize debug flag
+       searchpath = NULL;                              // Initialize search path
+       objfname = NULL;                                // Initialize object filename
+       list_fname = NULL;                              // Initialize listing filename
+       err_fname = NULL;                               // Initialize error filename
+       obj_format = BSD;                               // Initialize object format
+       firstfname = NULL;                              // Initialize first filename
+       err_fd = ERROUT;                                // Initialize error file descriptor
+       err_flag = 0;                                   // Initialize error flag
+       rgpu = 0;                                               // Initialize GPU assembly flag
+       rdsp = 0;                                               // Initialize DSP assembly flag
+       robjproc = 0;                                   // Initialize OP 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
+       segpadsize = 2;                                 // Initialize segment padding size
+    dsp_orgmap[0].start = 0;           // Initialize 56001 org initial address
+    dsp_orgmap[0].memtype = ORG_P;     // Initialize 56001 org start segment
+       m6502 = 0;                                              // 6502 mode off by default
 
-       // Initialise modules
+       // Initialize modules
        InitSymbolTable();                              // Symbol table
        InitTokenizer();                                // Tokenizer
        InitLineProcessor();                    // Line processor
@@ -276,15 +297,16 @@ int process(int argc, char ** argv)
        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)
+       for(argno=0; argno<argc; argno++)
        {
                if (*argv[argno] == '-')
                {
                        switch (argv[argno][1])
                        {
-                       case 'd':                                       // Define symbol
+                       case 'd':                               // Define symbol
                        case 'D':
                                for(s=argv[argno]+2; *s!=EOS;)
                                {
@@ -311,50 +333,103 @@ int process(int argc, char ** argv)
                                }
 
                                sy->sattr = DEFINED | EQUATED | ABS;
-#if 0
-                               if (*s)
-                                       sy->svalue = (VALUE)atoi(s);
-                               else
-                                       sy->svalue = 0;
-#else
-                               sy->svalue = (*s ? (VALUE)atoi(s) : 0);
-#endif
+                               sy->svalue = (*s ? (uint64_t)atoi(s) : 0);
                                break;
-                       case 'e':                                       // Redirect error message output
+                       case 'e':                               // Redirect error message output
                        case 'E':
                                err_fname = argv[argno] + 2;
                                break;
-                       case 'f':                                       // -f<format>
+                       case 'f':                               // -f<format>
                        case 'F':
                                switch (argv[argno][2])
                                {
                                case EOS:
-                               case 'b':                                 // -fb = BSD (Jaguar Recommended)
+                               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 'l':           // -fl = LOD
+                case 'L':
+                    obj_format = LOD;
+                    break;
+                case 'p':           // -fp = P56
+                case 'P':
+                    obj_format = P56;
+                                       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':                               // Debugging flag
                        case 'G':
                                printf("Debugging flag (-g) not yet implemented\n");
                                break;
-                       case 'i':                                       // Set directory search path
+                       case 'i':                               // Set directory search path
                        case 'I':
                                searchpath = argv[argno] + 2;
                                break;
-                       case 'l':                                       // Produce listing file
+                       case 'l':                               // Produce listing file
                        case 'L':
-                               list_fname = argv[argno] + 2;
+                               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 'm':
+                       case 'M':
+                               if (strcmp(argv[argno] + 2, "68000") == 0)
+                                       d_68000();
+                               else if (strcmp(argv[argno] + 2, "68020") == 0)
+                                       d_68020();
+                               else if (strcmp(argv[argno] + 2, "68030") == 0)
+                                       d_68030();
+                               else if (strcmp(argv[argno] + 2, "68040") == 0)
+                                       d_68040();
+                               else if (strcmp(argv[argno] + 2, "68060") == 0)
+                                       d_68060();
+                               else if (strcmp(argv[argno] + 2, "68881") == 0)
+                                       d_68881();
+                               else if (strcmp(argv[argno] + 2, "68882") == 0)
+                                       d_68882();
+                               else if (strcmp(argv[argno] + 2, "56001") == 0)
+                                       d_56001();
+                               else if (strcmp(argv[argno] + 2, "6502") == 0)
+                                       d_6502();
+                               else if (strcmp(argv[argno] + 2, "tom") == 0)
+                                       d_gpu();
+                               else if (strcmp(argv[argno] + 2, "jerry") == 0)
+                                       d_dsp();
+                               else
+                               {
+                                       printf("Unrecognized CPU '%s'\n", argv[argno] + 2);
+                                       errcnt++;
+                                       return errcnt;
+                               }
+                               break;
+                       case 'o':                               // Direct object file output
                        case 'O':
                                if (argv[argno][2] != EOS)
                                        objfname = argv[argno] + 2;
@@ -366,78 +441,123 @@ int process(int argc, char ** argv)
                                                errcnt++;
                                                return errcnt;
                                        }
+
                                        objfname = argv[argno];
                                }
 
                                break;
-                       case 'r':                                       // Pad seg to requested boundary size
+                       case 'p':               /* -p: generate ".PRG" executable output */
+                       case 'P':
+                               /*
+                                * -p           .PRG generation w/o symbols
+                                * -ps          .PRG generation with symbols
+                                * -px          .PRG generation with extended symbols
+                                */
+                               switch (argv[argno][2])
+                               {
+                                       case EOS:
+                                               prg_flag = 1;
+                                               break;
+
+                                       case 's':
+                                       case 'S':
+                                               prg_flag = 2;
+                                               break;
+
+                                       case 'x':
+                                       case 'X':
+                                               prg_flag = 3;
+                                               break;
+
+                                       default:
+                                               printf("-p: syntax error\n");
+                                               errcnt++;
+                                               return errcnt;
+                               }
+
+                               // 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 '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();
+                               default: segpadsize = 2; break; // Effective autoeven();
                                }
                                break;
-                       case 's':                                       // Warn about possible short branches
+                       case 's':                               // Warn about possible short branches
                        case 'S':
                                sbra_flag = 1;
                                break;
-                       case 'u':                                       // Make undefined symbols .globl
+                       case 'u':                               // Make undefined symbols .globl
                        case 'U':
                                glob_flag = 1;
                                break;
-                       case 'v':                                       // Verbose flag
+                       case 'v':                               // Verbose flag
                        case 'V':
                                verb_flag++;
 
                                if (verb_flag > 1)
-                                       display_version();
+                                       DisplayVersion();
 
                                break;
-                       case 'x':                                       // Turn on debugging
+                       case 'x':                               // Turn on debugging
                        case 'X':
                                debug = 1;
                                printf("~ Debugging ON\n");
                                break;
-                       case 'y':                                       // -y<pagelen>
+                       case 'y':                               // -y<pagelen>
                        case 'Y':
                                pagelen = atoi(argv[argno] + 2);
 
                                if (pagelen < 10)
                                {
                                        printf("-y: bad page length\n");
-                                       ++errcnt;
+                                       errcnt++;
                                        return errcnt;
                                }
 
                                break;
-                       case EOS:                                       // Input is stdin
-                               if (firstfname == NULL)                       // Kludge first filename
+                       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':                               // Display command line usage
                        case 'H':
                        case '?':
-                               display_version();
-                               display_help();
+                               DisplayVersion();
+                               DisplayHelp();
                                errcnt++;
                                break;
-                       case 'n':                                       // Turn off legacy mode
+                       case 'n':                               // Turn off legacy mode
                        case 'N':
                                legacy_flag = 0;
                                printf("Legacy mode OFF\n");
                                break;
                        default:
-                               display_version();
+                               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]);
-                               display_help();
+                               DisplayHelp();
                                errcnt++;
                                break;
                        }
@@ -466,15 +586,19 @@ int process(int argc, char ** argv)
 
        // 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  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).
-       savsect();
+       SaveSection();
+       int temp_section = cursect;
 
        for(i=TEXT; i<=BSS; i<<=1)
        {
-               switchsect(i);
+               SwitchSection(i);
 
                switch(segpadsize)
                {
@@ -485,17 +609,38 @@ int process(int argc, char ** argv)
                case 32: d_qphrase(); break;
                }
 
-               savsect();
+               SaveSection();
        }
 
+       SwitchSection(M6502);
+
+       if (sloc != currentorg[0])
+       {
+               currentorg[1] = sloc;
+               currentorg += 2;
+       }
+
+       // This looks like an awful kludge...  !!! FIX !!!
+       if (temp_section & (M56001P | M56001X | M56001Y))
+       {
+               SwitchSection(temp_section);
+
+               if (chptr != dsp_currentorg->start)
+               {
+                       dsp_currentorg->end = chptr;
+                       dsp_currentorg++;
+               }
+       }
+
+       SwitchSection(TEXT);
+
        if (objfname == NULL)
        {
                if (firstfname == NULL)
                        firstfname = defname;
 
                strcpy(fnbuf, firstfname);
-               //fext(fnbuf, prg_flag ? ".prg" : ".o", 1);
-               fext(fnbuf, ".o", 1);
+               fext(fnbuf, (prg_flag ? ".prg" : ".o"), 1);
                objfname = fnbuf;
        }
 
@@ -506,20 +651,20 @@ int process(int argc, char ** argv)
        // (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
+       StopMark();                                                             // Stop mark tape-recorder
 
        if (errcnt == 0)
        {
                if ((fd = open(objfname, _OPEN_FLAGS, _PERM_MODE)) < 0)
-                       cantcreat(objfname);
+                       CantCreateFile(objfname);
 
                if (verb_flag)
                {
-                       s = "object";
+                       s = (prg_flag ? "executable" : "object");
                        printf("[Writing %s file: %s]\n", s, objfname);
                }
 
-               object((WORD)fd);
+               WriteObject(fd);
                close(fd);
 
                if (errcnt != 0)
@@ -546,9 +691,9 @@ int process(int argc, char ** argv)
 
 
 //
-// Determine Processor Endianess
+// Determine processor endianess
 //
-int get_endianess(void)
+int GetEndianess(void)
 {
        int i = 1;
        char * p = (char *)&i;
@@ -561,24 +706,28 @@ int get_endianess(void)
 
 
 //
-// Application Entry Point; Handle the Command Line
+// Application entry point
 //
 int main(int argc, char ** argv)
 {
        perm_verb_flag = 0;                             // Clobber "permanent" verbose flag
        legacy_flag = 1;                                // Default is legacy mode on (:-P)
-       cmdlnexec = argv[0];                    // Obtain executable name
 
-       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;
+
+       cmdlnexec = argv[0];                    // Obtain executable name
+       endian = GetEndianess();                // Get processor endianess
 
        // If commands were passed in, process them
        if (argc > 1)
-       {
-               return process(argc - 1, argv + 1);              
-       }
+               return Process(argc - 1, argv + 1);
 
-       display_version();
-       display_help();
+       DisplayVersion();
+       DisplayHelp();
 
        return 0;
 }