Roll back TOKENPTR changes and most of the .u32 changes weren't needed.
[rmac] / direct.c
index 623bae4a0ee7cf0332fa555de412766a613d0e2d..155fa3fb360821bc945bb0e8e3a79ffd6fe973a9 100644 (file)
--- a/direct.c
+++ b/direct.c
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // DIRECT.C - Directive Handling
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
 //
 
 #include "direct.h"
-#include "sect.h"
-#include "risca.h"
+#include "6502.h"
+#include "amode.h"
 #include "error.h"
-#include "token.h"
-#include "procln.h"
 #include "expr.h"
-#include "mach.h"
 #include "listing.h"
+#include "mach.h"
+#include "macro.h"
 #include "mark.h"
+#include "procln.h"
+#include "riscasm.h"
+#include "sect.h"
 #include "symbol.h"
+#include "token.h"
+#include "math.h"
+#include "sect.h"
 
 #define DEF_KW
 #include "kwtab.h"
 
-TOKEN exprbuf[128];                    // Expression buffer 
+
+TOKEN exprbuf[128];                    // Expression buffer
 SYM * symbolPtr[1000000];      // Symbol pointers table
+static long unused;                    // For supressing 'write' warnings
+char buffer[256];                      // Scratch buffer for messages
+int largestAlign[3] = { 2, 2, 2 };     // Largest alignment value seen per section
+
+// Function prototypes
+int d_unimpl(void);
+int d_68000(void);
+int d_68000(void);
+int d_68020(void);
+int d_68030(void);
+int d_68040(void);
+int d_68060(void);
+int d_68881(void);
+int d_68882(void);
+int d_56001(void);
+int d_nofpu(void);
+int d_bss(void);
+int d_data(void);
+int d_text(void);
+int d_abs(void);
+int d_comm(void);
+int d_dc(WORD);
+int d_ds(WORD);
+int d_dcb(WORD);
+int d_globl(void);
+int d_gpu(void);
+int d_dsp(void);
+int d_assert(void);
+int d_include(void);
+int d_list(void);
+int d_nlist(void);
+int d_error(char *);
+int d_warn(char *);
+int d_org(void);
+int d_init(WORD);
+int d_cargs(void);
+int d_undmac(void);
+int d_regbank0(void);
+int d_regbank1(void);
+int d_incbin(void);
+int d_noclear(void);
+int d_equrundef(void);
+int d_ccundef(void);
+int d_print(void);
+int d_gpumain(void);
+int d_jpad(void);
+int d_nojpad(void);
+int d_fail(void);
+int d_cstruct(void);
+int d_prgflags(void);
+int d_opt(void);
+int d_dsp(void);
+void SetLargestAlignment(int);
 
 // Directive handler table
 int (*dirtab[])() = {
-   d_org,                              // 0 org
-   d_even,                             // 1 even
-   d_unimpl,                   // 2 .6502
-   d_68000,                            // 3 .68000 
-   d_bss,                              // 4 bss
-   d_data,                             // 5 data 
-   d_text,                             // 6 text 
-   d_abs,                              // 7 abs 
-   d_comm,                             // 8 comm 
-   d_init,                             // 9 init 
-   d_cargs,                            // 10 cargs 
-   d_goto,                             // 11 goto 
-   d_dc,                               // 12 dc 
-   d_ds,                               // 13 ds 
-   d_undmac,                   // 14 undefmac 
-   d_gpu,                              // 15 .gpu
-   d_dsp,                              // 16 .dsp
-   d_dcb,                              // 17 dcb 
-   d_unimpl,                   // 18* set 
-   d_unimpl,                   // 19* reg 
-   d_unimpl,                   // 20 dump 
-   d_incbin,                   // 21 .incbin //load 
-   d_unimpl,                   // 22 disable 
-   d_unimpl,                   // 23 enable 
-   d_globl,                            // 24 globl 
-   d_regbank0,                 // 25 .regbank0
-   d_regbank1,                 // 26 .regbank1
-   d_unimpl,                   // 27 xdef 
-   d_assert,                   // 28 assert 
-   d_unimpl,                   // 29* if 
-   d_unimpl,                   // 30* endif 
-   d_unimpl,                   // 31* endc 
-   d_unimpl,                   // 32* iif 
-   d_include,                  // 33 include 
-   fpop,                               // 34 end 
-   d_unimpl,                   // 35* macro 
-   exitmac,                            // 36* exitm 
-   d_unimpl,                   // 37* endm 
-   d_list,                             // 38 list 
-   d_nlist,                            // 39 nlist 
-   d_long,                             // 40* rept 
-   d_phrase,                   // 41* endr 
-   d_dphrase,                  // 42 struct 
-   d_qphrase,                  // 43 ends 
-   d_title,                            // 44 title 
-   d_subttl,                   // 45 subttl 
-   eject,                              // 46 eject 
-   d_unimpl,                   // 47 error 
-   d_unimpl,                   // 48 warn 
-   d_noclear,                  // 49 .noclear
-   d_equrundef,                        // 50 .equrundef/.regundef
-   d_ccundef,                  // 51 .ccundef
-   d_print,                            // 52 .print
-   d_gpumain,                  // 53 .gpumain
-   d_jpad,                             // 54 .jpad
-   d_nojpad,                   // 55 .nojpad
-   d_fail,                             // 56 .fail
+       d_org,                          // 0 org
+       d_even,                         // 1 even
+       d_6502,                         // 2 .6502
+       d_68000,                        // 3 .68000
+       d_bss,                          // 4 bss
+       d_data,                         // 5 data
+       d_text,                         // 6 text
+       d_abs,                          // 7 abs
+       d_comm,                         // 8 comm
+       (void *)d_init,         // 9 init
+       d_cargs,                        // 10 cargs
+       (void *)d_goto,         // 11 goto
+       (void *)d_dc,           // 12 dc
+       (void *)d_ds,           // 13 ds
+       d_undmac,                       // 14 undefmac
+       d_gpu,                          // 15 .gpu
+       d_dsp,                          // 16 .dsp
+       (void *)d_dcb,          // 17 dcb
+       d_unimpl,                       // 18* set
+       d_unimpl,                       // 19* reg
+       d_unimpl,                       // 20 dump
+       d_incbin,                       // 21 .incbin //load
+       d_unimpl,                       // 22 disable
+       d_unimpl,                       // 23 enable
+       d_globl,                        // 24 globl
+       d_regbank0,                     // 25 .regbank0
+       d_regbank1,                     // 26 .regbank1
+       d_unimpl,                       // 27 xdef
+       d_assert,                       // 28 assert
+       d_unimpl,                       // 29* if
+       d_unimpl,                       // 30* endif
+       d_unimpl,                       // 31* endc
+       d_unimpl,                       // 32* iif
+       d_include,                      // 33 include
+       fpop,                           // 34 end
+       d_unimpl,                       // 35* macro
+       ExitMacro,                      // 36* exitm
+       d_unimpl,                       // 37* endm
+       d_list,                         // 38 list
+       d_nlist,                        // 39 nlist
+       d_long,                         // 40* rept
+       d_phrase,                       // 41* endr
+       d_dphrase,                      // 42 struct
+       d_qphrase,                      // 43 ends
+       d_title,                        // 44 title
+       d_subttl,                       // 45 subttl
+       eject,                          // 46 eject
+       d_error,                        // 47 error
+       d_warn,                         // 48 warn
+       d_noclear,                      // 49 .noclear
+       d_equrundef,            // 50 .equrundef/.regundef
+       d_ccundef,                      // 51 .ccundef
+       d_print,                        // 52 .print
+       d_cstruct,                      // 53 .cstruct
+       d_jpad,                         // 54 .jpad (deprecated)
+       d_nojpad,                       // 55 .nojpad (deprecated)
+       d_gpumain,                      // 56 .gpumain (deprecated)
+       d_prgflags,                     // 57 .prgflags
+       d_68020,                        // 58 .68020
+       d_68030,                        // 59 .68030
+       d_68040,                        // 60 .68040
+       d_68060,                        // 61 .68060
+       d_68881,                        // 62 .68881
+       d_68882,                        // 63 .68882
+       d_56001,                        // 64 .56001
+       d_nofpu,                        // 65 nofpu
+       d_opt,                          // 58 .opt
 };
 
 
 //
-// .fail - User abort
+// Set the largest alignment seen in the current section
 //
-int d_fail(void)
+void SetLargestAlignment(int size)
 {
-       fatal("user abort");
-       return 0;
+       if ((scattr & TEXT) && (largestAlign[0] < size))
+               largestAlign[0] = size;
+       else if ((scattr & DATA) && (largestAlign[1] < size))
+               largestAlign[1] = size;
+       else if ((scattr & BSS) && (largestAlign[2] < size))
+               largestAlign[2] = size;
+}
+
+
+//
+// .error - Abort compilation, printing an error message
+//
+int d_error(char *str)
+{
+       if (*tok == EOL)
+               return error("error directive encountered - aborting assembling");
+       else
+       {
+               switch(*tok)
+               {
+               case STRING:
+                       return error(string[tok[1]]);
+                       break;
+               default:
+                       return error("error directive encountered--aborting assembly");
+               }
+       }
+}
+
+
+//
+// .warn - Just display a warning on screen
+//
+int d_warn(char *str)
+{
+       if (*tok == EOL)
+               return warn("WARNING WARNING WARNING");
+       else
+       {
+               switch(*tok)
+               {
+               case STRING:
+                       return warn(string[tok[1]]);
+                       break;
+               default:
+                       return warn("WARNING WARNING WARNING");
+               }
+       }
 }
 
 
@@ -101,12 +216,10 @@ int d_fail(void)
 //
 int d_org(void)
 {
-       VALUE address;
+       uint64_t address;
 
-       if (!rgpu && !rdsp) 
-               return error(".org permitted only in gpu/dsp section");
-
-       orgaddr = 0;
+       if (!rgpu && !rdsp && !m6502)
+               return error(".org permitted only in gpu/dsp and 6502 sections");
 
        if (abs_expr(&address) == ERROR)
        {
@@ -114,44 +227,51 @@ int d_org(void)
                return ERROR;
        }
 
-       orgaddr = address;
-       orgactive = 1;  
-
-       return 0;
-}
-
+       if (rgpu | rdsp)
+       {
+               orgaddr = address;
+               orgactive = 1;
+       }
+       else
+       {
+               // 6502.  We also kludge `lsloc' so the listing generator doesn't try
+               // to spew out megabytes.
+               if (address > 0xFFFF)
+                       return error(range_error);
 
-//
-// NOP Padding Directive
-//
-int d_jpad(void)
-{
-       jpad = 1;
-       return 0;
-}
+               if (sloc != currentorg[0])
+               {
+                       currentorg[1] = sloc;
+                       currentorg += 2;
+               }
 
+               currentorg[0] = address;
+               ch_size = 0;
+               lsloc = sloc = address;
+               chptr = scode->chptr + address;
+               orgaddr = address;
+               orgactive = 1;
+               at_eol();
+       }
 
-int d_nojpad(void)
-{
-       jpad = 0;
        return 0;
 }
 
 
 //
-// Print Directive
+// Print directive
 //
 int d_print(void)
 {
-       char prntstr[LNSIZ];                                     // String for PRINT directive
-       char format[LNSIZ];                                      // Format for PRINT directive
-       int formatting = 0;                                      // Formatting on/off
-       int wordlong = 0;                                        // WORD = 0, LONG = 1
-       int outtype = 0;                                         // 0:hex, 1:decimal, 2:unsigned
-
-       VALUE eval;                                              // Expression value
-       WORD eattr;                                              // Expression attributes
-       SYM * esym;                                              // External symbol involved in expr.
+       char prntstr[LNSIZ];            // String for PRINT directive
+       char format[LNSIZ];                     // Format for PRINT directive
+       int formatting = 0;                     // Formatting on/off
+       int wordlong = 0;                       // WORD = 0, LONG = 1
+       int outtype = 0;                        // 0:hex, 1:decimal, 2:unsigned
+
+       uint64_t eval;                          // Expression value
+       WORD eattr;                                     // Expression attributes
+       SYM * esym;                                     // External symbol involved in expr.
        TOKEN r_expr[EXPRSIZE];
 
        while (*tok != EOL)
@@ -159,12 +279,11 @@ int d_print(void)
                switch(*tok)
                {
                case STRING:
-//                     sprintf(prntstr, "%s", (char *)tok[1]);
                        sprintf(prntstr, "%s", string[tok[1]]);
                        printf("%s", prntstr);
 
-                       if (list_fd) 
-                               write(list_fd, prntstr, (LONG)strlen(prntstr));
+                       if (list_fd)
+                               unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
 
                        tok += 2;
                        break;
@@ -201,9 +320,9 @@ int d_print(void)
                        {
                                switch(outtype)
                                {
-                               case 0: strcpy(format, "%X"); break; 
-                               case 1: strcpy(format, "%d" ); break; 
-                               case 2: strcpy(format, "%u" ); break; 
+                               case 0: strcpy(format, "%X"); break;
+                               case 1: strcpy(format, "%d" ); break;
+                               case 2: strcpy(format, "%u" ); break;
                                }
 
                                if (wordlong)
@@ -213,8 +332,8 @@ int d_print(void)
 
                                printf("%s", prntstr);
 
-                               if (list_fd) 
-                                       write(list_fd, prntstr, (LONG)strlen(prntstr));
+                               if (list_fd)
+                                       unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
 
                                formatting = 0;
                                wordlong = 0;
@@ -226,7 +345,6 @@ int d_print(void)
        }
 
        printf("\n");
-       println("\n");
 
        return 0;
 
@@ -237,7 +355,7 @@ token_err:
 
 
 //
-// Undefine an Equated Condition Code
+// Undefine an equated condition code
 //
 int d_ccundef(void)
 {
@@ -252,11 +370,10 @@ int d_ccundef(void)
 
        if (*tok != SYMBOL)
        {
-               error(syntax_error);
+               error("syntax error; expected symbol");
                return ERROR;
        }
 
-//     ccname = lookup((char *)tok[1], LABEL, 0);
        ccname = lookup(string[tok[1]], LABEL, 0);
 
        // Make sure symbol is a valid ccdef
@@ -273,7 +390,7 @@ int d_ccundef(void)
 
 
 //
-// Undefine an Equated Register
+// Undefine an equated register
 //
 int d_equrundef(void)
 {
@@ -281,30 +398,28 @@ int d_equrundef(void)
 
        // Check that we are in a RISC section
        if (!rgpu && !rdsp)
-       {
-               error(".equrundef/.regundef must be defined in .gpu/.dsp section");
-               return ERROR;
-       }
+               return error(".equrundef/.regundef must be defined in .gpu/.dsp section");
 
        while (*tok != EOL)
        {
-               // Skip preceeding or seperating commas
+               // Skip preceeding or seperating commas (if any)
                if (*tok == ',')
                        tok++;
 
                // Check we are dealing with a symbol
                if (*tok != SYMBOL)
-               {
-                       error(syntax_error);
-                       return ERROR;
-               }
+                       return error("syntax error; expected symbol");
 
                // Lookup and undef if equated register
-//             regname = lookup((char *)tok[1], LABEL, 0);
                regname = lookup(string[tok[1]], LABEL, 0);
 
                if (regname && (regname->sattre & EQUATEDREG))
+               {
+                       // Reset the attributes of this symbol...
+                       regname->sattr = 0;
+                       regname->sattre &= ~(EQUATEDREG | BANK_0 | BANK_1);
                        regname->sattre |= UNDEF_EQUR;
+               }
 
                // Skip over symbol token and address
                tok += 2;
@@ -315,122 +430,157 @@ int d_equrundef(void)
 
 
 //
-// Do Not Allow the Use of the CLR.L Opcode
+// Do not allow use of the CLR.L opcode
 //
 int d_noclear(void)
 {
+       warn("CLR.L opcode ignored...");
        return 0;
 }
 
 
-// 
-// Include Binary File
+//
+// Include binary file
 //
 int d_incbin(void)
 {
-       int i, j;
+       int fd;
        int bytes = 0;
-       long pos, size;
-       char buf;
+       long pos, size, bytesRead;
+       char buf1[256];
+       int i;
+
+       // Check to see if we're in BSS, and, if so, throw an error
+       if (scattr & SBSS)
+       {
+               error("cannot include binary file \"%s\" in BSS section", string[tok[1]]);
+               return ERROR;
+       }
 
        if (*tok != STRING)
        {
-               error(syntax_error);
+               error("syntax error; string missing");
                return ERROR;
        }
 
-//     if ((j = open((char *)tok[1],  _OPEN_INC)) >= 0)
-       if ((j = open(string[tok[1]],  _OPEN_INC)) >= 0)
+       // Attempt to open the include file in the current directory, then (if that
+       // failed) try list of include files passed in the enviroment string or by
+       // the "-d" option.
+       if ((fd = open(string[tok[1]], _OPEN_INC)) < 0)
        {
-               size = lseek(j, 0L, SEEK_END);
-               chcheck(size);
-               pos = lseek(j, 0L, SEEK_SET);
-               
-               for(i=0; i<size; i++)
+               for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
                {
-                       buf = '\0';
-                       bytes = read(j, &buf, 1);
-                       D_byte(buf);
+                       fd = strlen(buf1);
+
+                       // Append path char if necessary
+                       if (fd > 0 && buf1[fd - 1] != SLASHCHAR)
+                               strcat(buf1, SLASHSTRING);
+
+                       strcat(buf1, string[tok[1]]);
+
+                       if ((fd = open(buf1, _OPEN_INC)) >= 0)
+                               goto allright;
                }
+
+               return error("cannot open: \"%s\"", string[tok[1]]);
        }
-       else
+
+allright:
+
+       size = lseek(fd, 0L, SEEK_END);
+       pos = lseek(fd, 0L, SEEK_SET);
+       chcheck(size);
+
+       DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size); }
+
+       char * fileBuffer = (char *)malloc(size);
+       bytesRead = read(fd, fileBuffer, size);
+
+       if (bytesRead != size)
        {
-//             errors("cannot open include binary file (%s)", (char *)tok[1]);
-               errors("cannot open include binary file (%s)", string[tok[1]]);
+               error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
                return ERROR;
        }
 
-       close(j);
+       memcpy(chptr, fileBuffer, size);
+       chptr += size;
+       sloc += size;
+       ch_size += size;
+
+       if (orgactive)
+               orgaddr += size;
+
+       free(fileBuffer);
+       close(fd);
        return 0;
 }
 
 
-// 
-// Set RISC Register Banks
+//
+// Set RISC register banks
 //
 int d_regbank0(void)
 {
-       regbank = BANK_0;                                        // Set active register bank zero
+       // Set active register bank zero
+       regbank = BANK_0;
        return 0;
 }
 
 
 int d_regbank1(void)
 {
-       regbank = BANK_1;                                        // Set active register bank one
+       // Set active register bank one
+       regbank = BANK_1;
        return 0;
 }
 
 
 //
-// Adjust Location to an EVEN Value
+// Helper function, to cut down on mistakes & typing
 //
-int d_even(void)
+static inline void SkipBytes(unsigned bytesToSkip)
 {
-       if (sloc & 1)
+       if (!bytesToSkip)
+               return;
+
+       if ((scattr & SBSS) == 0)
        {
-               if ((scattr & SBSS) == 0)
-               {
-                       chcheck(1);
-                       D_byte(0);
-               }
-               else
-               {
-                       ++sloc;
-               }
+               chcheck(bytesToSkip);
+               D_ZEROFILL(bytesToSkip);
        }
+       else
+       {
+               sloc += bytesToSkip;
 
-       return 0;
+               if (orgactive)
+                       orgaddr += bytesToSkip;
+       }
 }
 
 
 //
-// Adjust Location to an LONG Value
+// Adjust location to an EVEN value
 //
-int d_long(void)
+int d_even(void)
 {
-       unsigned i;
-       unsigned val = 4;
-                       
-       i = sloc & ~(val - 1);
+       if (m6502)
+               return error(in_6502mode);
 
-       if (i != sloc)
-               val = val - (sloc - i); 
-       else
-               val = 0;
+       unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
 
-       if (val)
+       if (skip)
        {
                if ((scattr & SBSS) == 0)
                {
-                       chcheck(val);
-
-                       for(i=0; i<val; i++) 
-                               D_byte(0);
+                       chcheck(1);
+                       D_byte(0);
                }
                else
                {
-                       sloc += val;
+                       sloc++;
+
+                       if (orgactive)
+                               orgaddr++;
                }
        }
 
@@ -439,103 +589,65 @@ int d_long(void)
 
 
 //
-// Adjust Location to an PHRASE Value
+// Adjust location to a LONG value
 //
-int d_phrase(void)
+int d_long(void)
 {
-       unsigned i;
-       unsigned val = 8;
-                       
-       i = sloc & ~(val - 1);
+       unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
+       unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
+       SkipBytes(bytesToSkip);
+       SetLargestAlignment(4);
 
-       if (i != sloc)
-               val = val - (sloc - i); 
-       else
-               val = 0;
+       return 0;
+}
 
-       if (val)
-       {
-               if ((scattr & SBSS) == 0)
-               {
-                       chcheck(val);
 
-                       for(i=0; i<val; i++) 
-                               D_byte(0);
-               }
-               else
-               {
-                       sloc += val;
-               }
-       }
+//
+// Adjust location to a PHRASE value
+//
+// N.B.: We have to handle the GPU/DSP cases separately because you can embed
+//       RISC code in the middle of a regular 68K section. Also note that all
+//       of the alignment pseudo-ops will have to be fixed this way.
+//
+// This *must* behave differently when in a RISC section, as following sloc
+// (instead of orgaddr) will fuck things up royally. Note that we do it this
+// way because you can embed RISC code in a 68K section, and have the origin
+// pointing to a different alignment in the RISC section than the 68K section.
+//
+int d_phrase(void)
+{
+       unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07;
+       unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07;
+       SkipBytes(bytesToSkip);
+       SetLargestAlignment(8);
 
        return 0;
 }
 
 
 //
-// Adjust Location to an DPHRASE Value
+// Adjust location to a DPHRASE value
 //
 int d_dphrase(void)
 {
-       unsigned i;
-       unsigned val = 16;
-                       
-       i = sloc & ~(val - 1);
-
-       if (i != sloc)
-               val = val - (sloc - i); 
-       else
-               val = 0;
-
-       if (val)
-       {
-               if ((scattr & SBSS) == 0)
-               {
-                       chcheck(val);
-
-                       for(i=0; i<val; i++) 
-                               D_byte(0);
-               }
-               else
-               {
-                       sloc += val;
-               }
-       }
+       unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F;
+       unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F;
+       SkipBytes(bytesToSkip);
+       SetLargestAlignment(16);
 
        return 0;
 }
 
 
 //
-// Adjust Location to an QPHRASE Value
+// Adjust location to a QPHRASE value
 //
 int d_qphrase(void)
 {
-       unsigned i;
-       unsigned val = 32;
-                       
-       i = sloc & ~(val - 1);
-
-       if (i != sloc)
-               val = val - (sloc - i); 
-       else
-               val = 0;
-
-       if (val)
-       {
-               if ((scattr & SBSS) == 0)
-               {
-                       savsect();
-                       chcheck(val);
-
-                       for(i=0; i<val; i++) 
-                               D_byte(0);
-               }
-               else
-               {
-                       sloc += val;
-               }
-       }
+       unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
+       unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
+       SkipBytes(bytesToSkip);
+       SetLargestAlignment(32);
 
        return 0;
 }
@@ -549,20 +661,25 @@ int d_qphrase(void)
 // which is OK since multiple labels are only allowed in AS68 kludge mode, and
 // the C compiler is VERY paranoid and uses ".even" whenever it can
 //
+// N.B.: This probably needs the same fixes as above...
+//
 void auto_even(void)
 {
-       if (scattr & SBSS)
-               ++sloc;                                               // Bump BSS section
-       else
-               D_byte(0)                                             // Deposit 0.b in non-BSS
+       if (cursect != M6502)
+       {
+               if (scattr & SBSS)
+                       sloc++;                         // Bump BSS section
+               else
+                       D_byte(0);                      // Deposit 0.b in non-BSS
 
-       if (lab_sym != NULL)                                      // Bump label if we have to
-               ++lab_sym->svalue;
+               if (lab_sym != NULL)    // Bump label if we have to
+                       lab_sym->svalue++;
+       }
 }
 
 
 //
-// Unimplemened Directive Error
+// Unimplemened directive error
 //
 int d_unimpl(void)
 {
@@ -570,10 +687,10 @@ int d_unimpl(void)
 }
 
 
-// 
+//
 // Return absolute (not TDB) and defined expression or return an error
 //
-int abs_expr(VALUE * a_eval)
+int abs_expr(uint64_t * a_eval)
 {
        WORD eattr;
 
@@ -595,18 +712,14 @@ int abs_expr(VALUE * a_eval)
 //
 int symlist(int(* func)())
 {
-       char * em = "symbol list syntax";
+       const char * em = "symbol list syntax";
 
        for(;;)
        {
                if (*tok != SYMBOL)
                        return error(em);
 
-#if 0
-               if ((*func)(tok[1]) != OK)
-#else
                if ((*func)(string[tok[1]]) != OK)
-#endif
                        break;
 
                tok += 2;
@@ -617,7 +730,7 @@ int symlist(int(* func)())
                if (*tok != ',')
                        return error(em);
 
-               ++tok;
+               tok++;
        }
 
        return 0;
@@ -635,40 +748,33 @@ int d_include(void)
        char buf[128];
        char buf1[128];
 
-       if (*tok == STRING)                                                     // Leave strings ALONE 
-#if 0
-               fn = (char *)*++tok;
-#else
+       if (*tok == STRING)                     // Leave strings ALONE
                fn = string[*++tok];
-#endif
-       else if (*tok == SYMBOL)                                        // Try to append ".s" to symbols
+       else if (*tok == SYMBOL)        // Try to append ".s" to symbols
        {
-#if 0
-               strcpy(buf, (char *)*++tok);
-#else
                strcpy(buf, string[*++tok]);
-#endif
                fext(buf, ".s", 0);
                fn = &buf[0];
        }
-       else                                                                            // Punt if no STRING or SYMBOL 
+       else                                            // Punt if no STRING or SYMBOL
                return error("missing filename");
 
        // Make sure the user didn't try anything like:
        // .include equates.s
        if (*++tok != EOL)
-               return error("extra stuff after filename -- enclose it in quotes");
+               return error("extra stuff after filename--enclose it in quotes");
 
        // Attempt to open the include file in the current directory, then (if that
        // failed) try list of include files passed in the enviroment string or by
-       // the "-d" option.
+       // the "-i" option.
        if ((j = open(fn, 0)) < 0)
        {
-               for(i=0; nthpath("RMACPATH", i, buf1)!=0; ++i)
+               for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
                {
                        j = strlen(buf1);
 
-                       if (j > 0 && buf1[j-1] != SLASHCHAR)    // Append path char if necessary 
+                       // Append path char if necessary
+                       if (j > 0 && buf1[j - 1] != SLASHCHAR)
                                strcat(buf1, SLASHSTRING);
 
                        strcat(buf1, fn);
@@ -677,7 +783,7 @@ int d_include(void)
                                goto allright;
                }
 
-               return errors("cannot open: \"%s\"", fn);
+               return error("cannot open: \"%s\"", fn);
        }
 
 allright:
@@ -692,7 +798,7 @@ allright:
 int d_assert(void)
 {
        WORD eattr;
-       VALUE eval;
+       uint64_t eval;
 
        for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
        {
@@ -716,7 +822,7 @@ int d_assert(void)
 //
 int globl1(char * p)
 {
-       SYM *sy;
+       SYM * sy;
 
        if (*p == '.')
                return error("cannot .globl local symbol");
@@ -726,8 +832,9 @@ int globl1(char * p)
                sy = NewSymbol(p, LABEL, 0);
                sy->svalue = 0;
                sy->sattr = GLOBAL;
+//printf("glob1: Making global symbol: attr=%04X, eattr=%08X, %s\n", sy->sattr, sy->sattre, sy->sname);
        }
-       else 
+       else
                sy->sattr |= GLOBAL;
 
        return OK;
@@ -736,44 +843,72 @@ int globl1(char * p)
 
 int d_globl(void)
 {
+       if (m6502)
+               return error(in_6502mode);
+
        symlist(globl1);
        return 0;
 }
 
 
+//
+// .prgflags expression
+//
+int d_prgflags(void)
+{
+       uint64_t eval;
+
+       if (*tok == EOL)
+               return error("PRGFLAGS requires value");
+       else if (abs_expr(&eval) == OK)
+       {
+               PRGFLAGS = (uint32_t)eval;
+               return 0;
+       }
+       else
+       {
+               return error("PRGFLAGS requires value");
+       }
+}
+
+
 //
 // .abs [expression]
 //
 int d_abs(void)
 {
-       VALUE eval;
+       uint64_t eval;
+
+       if (m6502)
+               return error(in_6502mode);
 
-       savsect();
+       SaveSection();
 
        if (*tok == EOL)
                eval = 0;
        else if (abs_expr(&eval) != OK)
                return 0;
 
-       switchsect(ABS);
-       sloc = eval;
+       SwitchSection(ABS);
+       sloc = (uint32_t)eval;
        return 0;
 }
 
 
 //
-// Switch Segments
+// Switch segments
 //
-
 int d_text(void)
 {
        if (rgpu || rdsp)
                return error("directive forbidden in gpu/dsp mode");
+       else if (m6502)
+               return error(in_6502mode);
 
        if (cursect != TEXT)
        {
-               savsect();
-               switchsect(TEXT);
+               SaveSection();
+               SwitchSection(TEXT);
        }
 
        return 0;
@@ -784,11 +919,13 @@ int d_data(void)
 {
        if (rgpu || rdsp)
                return error("directive forbidden in gpu/dsp mode");
+       else if (m6502)
+               return error(in_6502mode);
 
        if (cursect != DATA)
        {
-               savsect();
-               switchsect(DATA);
+               SaveSection();
+               SwitchSection(DATA);
        }
 
        return 0;
@@ -799,11 +936,13 @@ int d_bss(void)
 {
        if (rgpu || rdsp)
                return error("directive forbidden in gpu/dsp mode");
+       else if (m6502)
+               return error(in_6502mode);
 
        if (cursect != BSS)
        {
-               savsect();
-               switchsect(BSS);
+               SaveSection();
+               SwitchSection(BSS);
        }
 
        return 0;
@@ -815,34 +954,43 @@ int d_bss(void)
 //
 int d_ds(WORD siz)
 {
-       VALUE eval;
+       DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
 
-       // This gets kind of stupid.  This directive is disallowed in normal 68000
-       // mode ("for your own good!"), but is permitted for 6502 and Alcyon-
-       // compatibility modes. For obvious reasons, no auto-even is done in 8-bit
-       // processor modes.
-       if (as68_flag == 0 && (scattr & SBSS) == 0)
-               return error(".ds permitted only in BSS");
+       uint64_t eval;
 
-       if (siz != SIZB && (sloc & 1))                            // Automatic .even 
-               auto_even();
+       if (cursect != M6502)
+       {
+               if ((siz != SIZB) && (sloc & 1))        // Automatic .even
+                       auto_even();
+       }
 
        if (abs_expr(&eval) != OK)
                return 0;
 
+       // Check to see if the value being passed in is negative (who the hell does
+       // that?--nobody does; it's the code gremlins, or rum, that does it)
+       // N.B.: Since 'eval' is of type uint32_t, if it goes negative, it will have
+       //       its high bit set.
+       if (eval & 0x80000000)
+               return error("negative sizes not allowed");
+
        // In non-TDB section (BSS, ABS and M6502) just advance the location
        // counter appropriately. In TDB sections, deposit (possibly large) chunks
-       //of zeroed memory....
-       if ((scattr & SBSS))
+       // of zeroed memory....
+       if ((scattr & SBSS) || cursect == M6502)
        {
-               listvalue(eval);
+               listvalue((uint32_t)eval);
                eval *= siz;
-               sloc += eval;
-               just_bss = 1;                                         // No data deposited (8-bit CPU mode)
+               sloc += (uint32_t)eval;
+
+               if (cursect == M6502)
+                       chptr += eval;
+
+               just_bss = 1;                                   // No data deposited (8-bit CPU mode)
        }
        else
        {
-               dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED|ABS), NULL);
+               dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL);
        }
 
        at_eol();
@@ -851,43 +999,60 @@ int d_ds(WORD siz)
 
 
 //
-// dc.b, dc.w / dc, dc.l
+// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d
 //
 int d_dc(WORD siz)
 {
        WORD eattr;
-       VALUE eval;
-       WORD tdb;
-       WORD defined;
-       LONG i;
-       char * p;
-       int movei = 0; // movei flag for dc.i
+       uint64_t eval;
+       uint8_t * p;
 
        if ((scattr & SBSS) != 0)
                return error("illegal initialization of section");
 
-       if ((siz != SIZB) && (sloc & 1))
+       // Do an auto_even if it's not BYTE sized (hmm, should we be doing this???)
+       if (cursect != M6502 && (siz != SIZB) && (sloc & 1))
                auto_even();
 
-       for(;; ++tok)
+       // Check to see if we're trying to set LONGS on a non 32-bit aligned
+       // address in a GPU or DSP section, in their local RAM
+       if ((siz == SIZL) && (orgaddr & 0x03)
+               && ((rgpu && (orgaddr >= 0xF03000) && (orgaddr <= 0xF03FFFF))
+               || (rdsp && (orgaddr >= 0xF1B000) && (orgaddr <= 0xF1CFFFF))))
+               warn("depositing LONGs on a non-long address in local RAM");
+
+       for(;; tok++)
        {
                // dc.b 'string' [,] ...
-               if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL))
+               if (siz == SIZB && (*tok == STRING || *tok == STRINGA8) && (tok[2] == ',' || tok[2] == EOL))
                {
-//                     i = strlen((const char*)tok[1]);
-                       i = strlen(string[tok[1]]);
+                       uint32_t i = strlen(string[tok[1]]);
 
-                       if ((challoc - ch_size) < i) 
+                       if ((challoc - ch_size) < i)
                                chcheck(i);
 
-                       for(p=string[tok[1]]; *p!=EOS; ++p)
-                               D_byte(*p);
+                       if (*tok == STRING)
+                       {
+                               for(p=string[tok[1]]; *p!=EOS; p++)
+                                       D_byte(*p);
+                       }
+                       else if(*tok == STRINGA8)
+                       {
+                               for(p=string[tok[1]]; *p!=EOS; p++)
+                                       D_byte(strtoa8[*p]);
+                       }
+                       else
+                       {
+                               error("String format not supported... yet");
+                       }
 
                        tok += 2;
                        goto comma;
                }
 
-               if (*tok == 'I')
+               int movei = 0; // MOVEI flag for dc.i
+
+               if (*tok == DOTI)
                {
                        movei = 1;
                        tok++;
@@ -895,11 +1060,13 @@ int d_dc(WORD siz)
                }
 
                // dc.x <expression>
-               if (expr(exprbuf, &eval, &eattr, NULL) != OK)
+               SYM * esym = 0;
+
+               if (expr(exprbuf, &eval, &eattr, &esym) != OK)
                        return 0;
 
-               tdb = (WORD)(eattr & TDB);
-               defined = (WORD)(eattr & DEFINED);
+               uint16_t tdb = eattr & TDB;
+               uint16_t defined = eattr & DEFINED;
 
                if ((challoc - ch_size) < 4)
                        chcheck(4);
@@ -909,7 +1076,7 @@ int d_dc(WORD siz)
                case SIZB:
                        if (!defined)
                        {
-                               fixup(FU_BYTE|FU_SEXT, sloc, exprbuf);
+                               AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
                                D_byte(0);
                        }
                        else
@@ -918,7 +1085,7 @@ int d_dc(WORD siz)
                                        return error("non-absolute byte value");
 
                                if (eval + 0x100 >= 0x200)
-                                       return error(range_error);
+                                       return error("%s (value = $%X)", range_error, eval);
 
                                D_byte(eval);
                        }
@@ -928,45 +1095,123 @@ int d_dc(WORD siz)
                case SIZN:
                        if (!defined)
                        {
-                               fixup(FU_WORD|FU_SEXT, sloc, exprbuf);
+                               AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf);
                                D_word(0);
                        }
                        else
                        {
-                               if (tdb)
-                                       rmark(cursect, sloc, tdb, MWORD, NULL);
-
                                if (eval + 0x10000 >= 0x20000)
                                        return error(range_error);
 
-                               // Deposit 68000 or 6502 (byte-reversed) word 
-                               D_word(eval);
+                               if (tdb)
+                                       MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
+
+                               // Deposit 68000 or 6502 (byte-reversed) word
+                               if (cursect != M6502)
+                                       D_word(eval)
+                               else
+                                       D_rword(eval)
                        }
 
                        break;
                case SIZL:
+                       // Shamus: Why can't we do longs in 6502 mode?
+                       if (m6502)
+                               return error(in_6502mode);
+
                        if (!defined)
                        {
                                if (movei)
-                                       fixup(FU_LONG|FU_MOVEI, sloc, exprbuf);
+                                       AddFixup(FU_LONG | FU_MOVEI, sloc, exprbuf);
                                else
-                                       fixup(FU_LONG, sloc, exprbuf);
+                                       AddFixup(FU_LONG, sloc, exprbuf);
 
                                D_long(0);
                        }
                        else
                        {
                                if (tdb)
-                                       rmark(cursect, sloc, tdb, MLONG, NULL);
+                                       MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);
 
-                               if (movei) 
-                                       eval = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000);
+                               if (movei)
+                                       eval = WORDSWAP32(eval);
 
                                D_long(eval);
                        }
+                       break;
+               case SIZQ:
+                       // 64-bit size
+                       if (m6502)
+                               return error(in_6502mode);
+
+                       // Shamus: We only handle DC.Q type stuff, will have to add fixups
+                       //         and stuff later (maybe... might not be needed...)
+                       D_quad(eval);
+                       break;
+               case SIZS:
+                       if (m6502)
+                               return error(in_6502mode);
+
+                       if (!defined)
+                       {
+                               float vv = 0;
+                               AddFixup(FU_FLOATSING, sloc, exprbuf);
+
+                               D_single(vv);
+                       }
+                       else
+                       {
+                               if (tdb)
+                                       MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
+
+                               D_single(eval);
+                       }
+
+                       break;
+               case SIZD:
+                       if (m6502)
+                               return error(in_6502mode);
+
+                       if (!defined)
+                       {
+                               double vv = 0;
+                               AddFixup(FU_FLOATDOUB, sloc, exprbuf);
+
+                               D_double(vv);
+                       }
+                       else
+                       {
+                               if (tdb)
+                                       MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
+
+                               double vv = *(double *)&eval;
+                               D_double(vv);
+                       }
+
+                       break;
+               case SIZX:
+                       if (m6502)
+                               return error(in_6502mode);
+
+                       if (!defined)
+                       {
+                               double vv = 0;
+                               AddFixup(FU_FLOATEXT, sloc, exprbuf);
+
+                               D_extend(vv);
+                       }
+                       else
+                       {
+                               if (tdb)
+                                       MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+
+                               float vv = *(double *)&eval;
+                               D_extend(vv);
+                       }
+
                        break;
                }
-               
+
 comma:
                if (*tok != ',')
                        break;
@@ -982,9 +1227,11 @@ comma:
 //
 int d_dcb(WORD siz)
 {
-       VALUE evalc, eval;
+       uint64_t evalc, eval;
        WORD eattr;
 
+       DEBUG { printf("dcb: section is %s%s%s (scattr=$%X)\n", (cursect & TEXT ? "TEXT" : ""), (cursect & DATA ? " DATA" : ""), (cursect & BSS ? "BSS" : ""), scattr); }
+
        if ((scattr & SBSS) != 0)
                return error("illegal initialization of section");
 
@@ -997,19 +1244,19 @@ int d_dcb(WORD siz)
        if (expr(exprbuf, &eval, &eattr, NULL) < 0)
                return 0;
 
-       if ((siz != SIZB) && (sloc & 1))
+       if (cursect != M6502 && (siz != SIZB) && (sloc & 1))
                auto_even();
 
-       dep_block(evalc, siz, eval, eattr, exprbuf);
+       dep_block((uint32_t)evalc, siz, (uint32_t)eval, eattr, exprbuf);
        return 0;
 }
 
 
 //
 // Generalized initialization directive
-// 
+//
 // .init[.siz] [#count,] expression [.size] , ...
-// 
+//
 // The size suffix on the ".init" directive becomes the default size of the
 // objects to deposit. If an item is preceeded with a sharp (immediate) sign
 // and an expression, it specifies a repeat count. The value to be deposited
@@ -1017,8 +1264,8 @@ int d_dcb(WORD siz)
 //
 int d_init(WORD def_siz)
 {
-       VALUE count;
-       VALUE eval;
+       uint64_t count;
+       uint64_t eval;
        WORD eattr;
        WORD siz;
 
@@ -1033,7 +1280,7 @@ int d_init(WORD def_siz)
                // Get repeat count (defaults to 1)
                if (*tok == '#')
                {
-                       ++tok;
+                       tok++;
 
                        if (abs_expr(&count) != OK)
                                return 0;
@@ -1048,25 +1295,25 @@ int d_init(WORD def_siz)
                if (expr(exprbuf, &eval, &eattr, NULL) < 0)
                        return 0;
 
-               switch ((int)*tok++)
+               switch (*tok++)
                {                                 // Determine size of object to deposit
                case DOTB: siz = SIZB; break;
                case DOTW: siz = SIZB; break;
                case DOTL: siz = SIZL; break;
-               default: 
+               default:
                        siz = def_siz;
-                       --tok;
+                       tok--;
                        break;
                }
 
-               dep_block(count, siz, eval, eattr, exprbuf);
+               dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf);
 
-               switch ((int)*tok)
+               switch (*tok)
                {
                case EOL:
                        return 0;
                case ',':
-                       ++tok;
+                       tok++;
                        continue;
                default:
                        return error(comma_error);
@@ -1078,7 +1325,7 @@ int d_init(WORD def_siz)
 //
 // Deposit 'count' values of size 'siz' in the current (non-BSS) segment
 //
-int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
+int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKEN * exprbuf)
 {
        WORD tdb;
        WORD defined;
@@ -1096,7 +1343,7 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
                case SIZB:
                        if (!defined)
                        {
-                               fixup(FU_BYTE|FU_SEXT, sloc, exprbuf);
+                               AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
                                D_byte(0);
                        }
                        else
@@ -1115,32 +1362,39 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
                case SIZN:
                        if (!defined)
                        {
-                               fixup(FU_WORD|FU_SEXT, sloc, exprbuf);
+                               AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf);
                                D_word(0);
                        }
                        else
                        {
                                if (tdb)
-                                       rmark(cursect, sloc, tdb, MWORD, NULL);
+                                       MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
 
                                if (eval + 0x10000 >= 0x20000)
                                        return error(range_error);
 
                                // Deposit 68000 or 6502 (byte-reversed) word
-                               D_word(eval);
+                               if (cursect != M6502)
+                                       D_word(eval)
+                               else
+                                       D_rword(eval)
+
                        }
 
                        break;
                case SIZL:
+                       if (m6502)
+                               return error(in_6502mode);
+
                        if (!defined)
                        {
-                               fixup(FU_LONG, sloc, exprbuf);
+                               AddFixup(FU_LONG, sloc, exprbuf);
                                D_long(0);
                        }
                        else
                        {
                                if (tdb)
-                                       rmark(cursect, sloc, tdb, MLONG, NULL);
+                                       MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);
 
                                D_long(eval);
                        }
@@ -1160,12 +1414,14 @@ int d_comm(void)
 {
        SYM * sym;
        char * p;
-       VALUE eval;
+       uint64_t eval;
+
+       if (m6502)
+               return error(in_6502mode);
 
        if (*tok != SYMBOL)
                return error("missing symbol");
 
-//     p = (char *)tok[1];
        p = string[tok[1]];
        tok += 2;
 
@@ -1188,7 +1444,7 @@ int d_comm(void)
        if (abs_expr(&eval) != OK)                              // Parse size of common region
                return 0;
 
-       sym->svalue = eval;                                             // Install common symbol's size
+       sym->svalue = (uint32_t)eval;                   // Install common symbol's size
        at_eol();
        return 0;
 }
@@ -1200,7 +1456,7 @@ int d_comm(void)
 int d_list(void)
 {
        if (list_flag)
-               ++listing;
+               listing++;
 
        return 0;
 }
@@ -1212,7 +1468,7 @@ int d_list(void)
 int d_nlist(void)
 {
        if (list_flag)
-               --listing;
+               listing--;
 
        return 0;
 }
@@ -1224,73 +1480,130 @@ int d_nlist(void)
 int d_68000(void)
 {
        rgpu = rdsp = 0;
-       in_main = 0;
        // Switching from gpu/dsp sections should reset any ORG'd Address
-       orgactive = 0;                               
+       orgactive = 0;
        orgwarning = 0;
-       savsect();
-       switchsect(TEXT);
+       SaveSection();
+       SwitchSection(TEXT);
+       activecpu = CPU_68000;
        return 0;
 }
 
 
 //
-// .gpu - Switch to GPU Assembler
+// .68020 - Back to 68000 TEXT segment and select 68020
 //
-int d_gpu(void)
+int d_68020(void)
 {
-       if ((cursect != TEXT) && (cursect != DATA))
-       {
-               error(".gpu can only be used in the TEXT or DATA segments");
-               return ERROR;
-       }
+       d_68000();
+       activecpu = CPU_68020;
+       return 0;
+}
 
-       // If previous section was dsp or 68000 then we need to reset ORG'd Addresses
-       if (!rgpu)
-       {
-               orgactive = 0;
-               orgwarning = 0;
-       }
 
-       rgpu = 1;                                                // Set GPU assembly
-       rdsp = 0;                                                // Unset DSP assembly
-       regbank = BANK_N;                                        // Set no default register bank
-       in_main = 0;
-       jpad = 0;
+//
+// .68030 - Back to 68000 TEXT segment and select 68030
+//
+int d_68030(void)
+{
+       d_68000();
+       activecpu = CPU_68030;
        return 0;
 }
 
 
 //
-// GPU Main Code Directive
+// .68040 - Back to 68000 TEXT segment and select 68040
 //
+int d_68040(void)
+{
+       d_68000();
+       activecpu = CPU_68040;
+       activefpu = FPU_68040;
+       return 0;
+}
 
-int d_gpumain(void)
+
+//
+// .68060 - Back to 68000 TEXT segment and select 68060
+//
+int d_68060(void)
+{
+       d_68000();
+       activecpu = CPU_68060;
+       activefpu = FPU_68040;
+       return 0;
+}
+
+
+//
+// .68881 - Back to 68000 TEXT segment and select 68881 FPU
+//
+int d_68881(void)
+{
+       d_68000();
+       activefpu = FPU_68881;
+       return 0;
+}
+
+
+//
+// .68882 - Back to 68000 TEXT segment and select 68882 FPU
+//
+int d_68882(void)
+{
+       d_68000();
+       activefpu = FPU_68881;
+       return 0;
+}
+
+
+//
+// nofpu - Deselect FPUs.
+//
+int d_nofpu(void)
+{
+       activefpu = FPU_NONE;
+       return 0;
+}
+
+
+//
+// DSP56001
+//
+int d_56001(void)
+{
+       return error("Not yet, child. Be patient.");
+}
+
+
+//
+// .gpu - Switch to GPU assembler
+//
+int d_gpu(void)
 {
        if ((cursect != TEXT) && (cursect != DATA))
        {
-               error(".gpumain can only be used in the TEXT or DATA segments");
+               error(".gpu can only be used in the TEXT or DATA segments");
                return ERROR;
        }
 
-       // If previous section was dsp or 68000 then we need to reset ORG'd Addresses
+       // If previous section was DSP or 68000 then we need to reset ORG'd Addresses
        if (!rgpu)
        {
                orgactive = 0;
                orgwarning = 0;
        }
 
-       rgpu = 1;                                                // Set GPU assembly
-       rdsp = 0;                                                // Unset DSP assembly
-       regbank = BANK_N;                                        // Set no default register bank
-       in_main = 1;                                             // Enable main code execution rules
-       jpad = 0;
+       rgpu = 1;                       // Set GPU assembly
+       rdsp = 0;                       // Unset DSP assembly
+       regbank = BANK_N;       // Set no default register bank
        return 0;
 }
 
 
 //
-// .dsp - Switch to DSP Assembler
+// .dsp - Switch to DSP assembler
 //
 int d_dsp(void)
 {
@@ -1307,30 +1620,29 @@ int d_dsp(void)
                orgwarning = 0;
        }
 
-       rdsp = 1;                                                // Set DSP assembly
-       rgpu = 0;                                                // Unset GPU assembly
-       regbank = BANK_N;                                        // Set no default register bank
-       in_main = 0;
-       jpad = 0;
+       rdsp = 1;                       // Set DSP assembly
+       rgpu = 0;                       // Unset GPU assembly
+       regbank = BANK_N;       // Set no default register bank
        return 0;
 }
 
 
 //
 // .cargs [#offset], symbol[.size], ...
-// 
+//
 // Lists of registers may also be mentioned; they just take up space. Good for
-// "documentation" purposes.
-// 
-// .cargs a6,.arg1, .arg2, .arg3...
-// 
-// The symbols are ABS and EQUATED.
+// "documentation" purposes:
+//
+// .cargs a6, .arg1, .arg2, .arg3...
+//
+// Symbols thus created are ABS and EQUATED.
 //
 int d_cargs(void)
 {
-       VALUE eval;
+       uint64_t eval = 4;      // Default to 4 if no offset specified (to account for
+                                               // return address)
        WORD rlist;
-       SYM * sy;
+       SYM * symbol;
        char * p;
        int env;
        int i;
@@ -1340,93 +1652,222 @@ int d_cargs(void)
 
        if (*tok == '#')
        {
-               ++tok;
+               tok++;
 
                if (abs_expr(&eval) != OK)
                        return 0;
 
-               if (*tok == ',')                                        // Eat comma if it's there
-                       ++tok;
+               // Eat the comma, if it's there
+               if (*tok == ',')
+                       tok++;
        }
-       else 
-               eval = 4;
 
        for(;;)
        {
                if (*tok == SYMBOL)
                {
-//                     p = (char *)tok[1];
                        p = string[tok[1]];
 
-                       if (*p == '.')
-                               env = curenv;
-                       else
-                               env = 0;
-
-                       sy = lookup(p, LABEL, env);
+                       // Set env to either local (dot prefixed) or global scope
+                       env = (*p == '.' ? curenv : 0);
+                       symbol = lookup(p, LABEL, env);
 
-                       if (sy == NULL)
+                       if (symbol == NULL)
                        {
-                               sy = NewSymbol(p, LABEL, env);
-                               sy->sattr = 0;
+                               symbol = NewSymbol(p, LABEL, env);
+                               symbol->sattr = 0;
                        }
-                       else if (sy->sattr & DEFINED)
-                               return errors("multiply-defined label '%s'", p);
+                       else if (symbol->sattr & DEFINED)
+                               return error("multiply-defined label '%s'", p);
 
                        // Put symbol in "order of definition" list
-                       if (!(sy->sattr & SDECLLIST))
-                               sym_decl(sy);
+                       AddToSymbolDeclarationList(symbol);
 
-                       sy->sattr |= ABS|DEFINED|EQUATED;
-                       sy->svalue = eval;
+                       symbol->sattr |= (ABS | DEFINED | EQUATED);
+                       symbol->svalue = (uint32_t)eval;
                        tok += 2;
 
-                       switch((int)*tok)
+                       // What this does is eat any dot suffixes attached to a symbol. If
+                       // it's a .L, it adds 4 to eval; if it's .W or .B, it adds 2. If
+                       // there is no dot suffix, it assumes a size of 2.
+                       switch ((int)*tok)
                        {
                        case DOTL:
                                eval += 2;
                        case DOTB:
                        case DOTW:
-                               ++tok;
+                               tok++;
                        }
 
                        eval += 2;
                }
-               else 
+               else if (*tok >= KW_D0 && *tok <= KW_A7)
+               {
+                       if (reglist(&rlist) < 0)
+                               return 0;
+
+                       for(i=0; i<16; i++, rlist>>=1)
+                       {
+                               if (rlist & 1)
+                                       eval += 4;
+                       }
+               }
+               else
                {
-                       if (*tok >= KW_D0 && *tok <= KW_A7)
+                       switch ((int)*tok)
                        {
-                               if (reglist(&rlist) < 0)
-                                       return 0;
+                       case KW_USP:
+                       case KW_SSP:
+                       case KW_PC:
+                               eval += 2;
+                               // FALLTHROUGH
+                       case KW_SR:
+                       case KW_CCR:
+                               eval += 2;
+                               tok++;
+                               break;
+                       case EOL:
+                               return 0;
+                       default:
+                               return error(".cargs syntax");
+                       }
+               }
+
+               // Eat commas in between each argument, if they exist
+               if (*tok == ',')
+                       tok++;
+       }
+}
+
 
-                               for(i=0; i++<16; rlist>>=1)
-                                       if (rlist & 1)
-                                               eval += 4;
+//
+// .cstruct [#offset], symbol[.size], ...
+//
+// Lists of registers may also be mentioned; they just take up space. Good for
+// "documentation" purposes:
+//
+// .cstruct a6, .arg1, .arg2, .arg3...
+//
+// Symbols thus created are ABS and EQUATED. Note that this is for
+// compatibility with VBCC and the Remover's library. Thanks to GroovyBee for
+// the suggestion.
+//
+int d_cstruct(void)
+{
+       uint64_t eval = 0;      // Default, if no offset specified, is zero
+       WORD rlist;
+       SYM * symbol;
+       char * symbolName;
+       int env;
+       int i;
+
+       if (rgpu || rdsp)
+               return error("directive forbidden in gpu/dsp mode");
+
+       if (*tok == '#')
+       {
+               tok++;
+
+               if (abs_expr(&eval) != OK)
+                       return 0;
+
+               // Eat the comma, if it's there
+               if (*tok == ',')
+                       tok++;
+       }
+
+       for(;;)
+       {
+               if (*tok == SYMBOL)
+               {
+                       symbolName = string[tok[1]];
+
+                       // Set env to either local (dot prefixed) or global scope
+                       env = (symbolName[0] == '.' ? curenv : 0);
+                       symbol = lookup(symbolName, LABEL, env);
+
+                       // If the symbol wasn't found, then define it. Otherwise, throw an
+                       // error.
+                       if (symbol == NULL)
+                       {
+                               symbol = NewSymbol(symbolName, LABEL, env);
+                               symbol->sattr = 0;
                        }
-                       else
+                       else if (symbol->sattr & DEFINED)
+                               return error("multiply-defined label '%s'", symbolName);
+
+                       // Put symbol in "order of definition" list
+                       AddToSymbolDeclarationList(symbol);
+
+                       tok += 2;
+
+                       // Adjust label start address if it's a word or a long, as a byte
+                       // label might have left us on an odd address.
+                       switch ((int)*tok)
                        {
-                               switch((int)*tok)
-                               {
-                               case KW_USP:
-                               case KW_SSP:
-                               case KW_PC:
-                                       eval += 2;
-                                       // FALLTHROUGH
-                               case KW_SR:
-                               case KW_CCR:
-                                       eval += 2;
-                                       ++tok;
-                                       break;
-                               case EOL:
-                                       return 0;
-                               default:
-                                       return error(".cargs syntax");
-                               }
+                       case DOTW:
+                       case DOTL:
+                               eval += eval & 0x01;
+                       }
+
+                       symbol->sattr |= (ABS | DEFINED | EQUATED);
+                       symbol->svalue = (uint32_t)eval;
+
+                       // Check for dot suffixes and adjust space accordingly (longs and
+                       // words on an odd boundary get bumped to the next word aligned
+                       // address). If no suffix, then throw an error.
+                       switch ((int)*tok)
+                       {
+                       case DOTL:
+                               eval += 4;
+                               break;
+                       case DOTW:
+                               eval += 2;
+                               break;
+                       case DOTB:
+                               eval += 1;
+                               break;
+                       default:
+                               return error("Symbol missing dot suffix in .cstruct construct");
                        }
 
-                       if (*tok == ',')
-                               ++tok;
+                       tok++;
+               }
+               else if (*tok >= KW_D0 && *tok <= KW_A7)
+               {
+                       if (reglist(&rlist) < 0)
+                               return 0;
+
+                       for(i=0; i<16; i++, rlist>>=1)
+                       {
+                               if (rlist & 1)
+                                       eval += 4;
+                       }
+               }
+               else
+               {
+                       switch ((int)*tok)
+                       {
+                       case KW_USP:
+                       case KW_SSP:
+                       case KW_PC:
+                               eval += 2;
+                               // FALLTHROUGH
+                       case KW_SR:
+                       case KW_CCR:
+                               eval += 2;
+                               tok++;
+                               break;
+                       case EOL:
+                               return 0;
+                       default:
+                               return error(".cstruct syntax");
+                       }
                }
+
+               // Eat commas in between each argument, if they exist
+               if (*tok == ',')
+                       tok++;
        }
 }
 
@@ -1436,11 +1877,11 @@ int d_cargs(void)
 //
 int undmac1(char * p)
 {
-       SYM * sy;
+       SYM * symbol = lookup(p, MACRO, 0);
 
-       // If the macro symbol exists, cause it to dissappear
-       if ((sy = lookup(p, MACRO, 0)) != NULL)
-               sy->stype = (BYTE)SY_UNDEF;
+       // If the macro symbol exists, cause it to disappear
+       if (symbol != NULL)
+               symbol->stype = (BYTE)SY_UNDEF;
 
        return OK;
 }
@@ -1451,3 +1892,122 @@ int d_undmac(void)
        symlist(undmac1);
        return 0;
 }
+
+
+int d_jpad(void)
+{
+       warn("JPAD directive is deprecated/non-functional");
+       return OK;
+}
+
+
+int d_nojpad(void)
+{
+       warn("NOJPAD directive is deprecated/non-functional");
+       return OK;
+}
+
+
+int d_gpumain(void)
+{
+       return error("What the hell? Do you think we adhere to the Goof standard?");
+}
+
+
+//
+// .opt - turn a specific (or all) optimisation on or off
+//
+int d_opt(void)
+{
+       while (*tok != EOL)
+       {
+               if (*tok == STRING)
+               {
+                       tok++;
+                       char * tmpstr = string[*tok++];
+
+                       if (ParseOptimization(tmpstr) != OK)
+                               return error("unknown optimization flag '%s'", tmpstr);
+               }
+               else
+                       return error(".opt directive needs every switch enclosed inside quotation marks");
+       }
+
+       return OK;
+}
+
+
+//
+// .if, Start conditional assembly
+//
+int d_if(void)
+{
+       WORD eattr;
+       uint64_t eval;
+       SYM * esym;
+       IFENT * rif = f_ifent;
+
+       // Alloc an IFENTRY
+       if (rif == NULL)
+               rif = (IFENT *)malloc(sizeof(IFENT));
+       else
+               f_ifent = rif->if_prev;
+
+       rif->if_prev = ifent;
+       ifent = rif;
+
+       if (!disabled)
+       {
+               if (expr(exprbuf, &eval, &eattr, &esym) != OK)
+                       return 0;
+
+               if ((eattr & DEFINED) == 0)
+                       return error(undef_error);
+
+               disabled = !eval;
+       }
+
+       rif->if_state = (WORD)disabled;
+       return 0;
+}
+
+
+//
+// .else, Do alternate case for .if
+//
+int d_else(void)
+{
+       IFENT * rif = ifent;
+
+       if (rif->if_prev == NULL)
+               return error("mismatched .else");
+
+       if (disabled)
+               disabled = rif->if_prev->if_state;
+       else
+               disabled = 1;
+
+       rif->if_state = (WORD)disabled;
+       return 0;
+}
+
+
+//
+// .endif, End of conditional assembly block
+// This is also called by fpop() to pop levels of IFENTs in case a macro or
+// include file exits early with `exitm' or `end'.
+//
+int d_endif(void)
+{
+       IFENT * rif = ifent;
+
+       if (rif->if_prev == NULL)
+               return error("mismatched .endif");
+
+       ifent = rif->if_prev;
+       disabled = rif->if_prev->if_state;
+       rif->if_prev = f_ifent;
+       f_ifent = rif;
+       return 0;
+}
+