Roll back TOKENPTR changes and most of the .u32 changes weren't needed.
[rmac] / direct.c
index 54a185f5ccb32890b083536f62b00da4a14ccca8..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
 };
 
+
+//
+// Set the largest alignment seen in the current section
+//
+void SetLargestAlignment(int size)
+{
+       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;
+}
+
+
 //
-// --- .org - Set origin  ---------------------------------------------------------------------------
+// .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");
+               }
+       }
+}
 
-int d_fail(void) {
-   fatal("user abort");
-   return(0);
+
+//
+// .org - Set origin
+//
+int d_org(void)
+{
+       uint64_t address;
+
+       if (!rgpu && !rdsp && !m6502)
+               return error(".org permitted only in gpu/dsp and 6502 sections");
+
+       if (abs_expr(&address) == ERROR)
+       {
+               error("cannot determine org'd address");
+               return ERROR;
+       }
+
+       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);
+
+               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();
+       }
+
+       return 0;
+}
+
+
+//
+// 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
+
+       uint64_t eval;                          // Expression value
+       WORD eattr;                                     // Expression attributes
+       SYM * esym;                                     // External symbol involved in expr.
+       TOKEN r_expr[EXPRSIZE];
+
+       while (*tok != EOL)
+       {
+               switch(*tok)
+               {
+               case STRING:
+                       sprintf(prntstr, "%s", string[tok[1]]);
+                       printf("%s", prntstr);
+
+                       if (list_fd)
+                               unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
+
+                       tok += 2;
+                       break;
+               case '/':
+                       formatting = 1;
+
+                       if (tok[1] != SYMBOL)
+                               goto token_err;
+
+//                     strcpy(prntstr, (char *)tok[2]);
+                       strcpy(prntstr, string[tok[2]]);
+
+                       switch(prntstr[0])
+                       {
+                       case 'l': case 'L': wordlong = 1; break;
+                       case 'w': case 'W': wordlong = 0; break;
+                       case 'x': case 'X': outtype  = 0; break;
+                       case 'd': case 'D': outtype  = 1; break;
+                       case 'u': case 'U': outtype  = 2; break;
+                       default:
+                               error("unknown print format flag");
+                               return ERROR;
+                       }
+
+                       tok += 3;
+                       break;
+               case ',':
+                       tok++;
+                       break;
+               default:
+                       if (expr(r_expr, &eval, &eattr, &esym) != OK)
+                               goto token_err;
+                       else
+                       {
+                               switch(outtype)
+                               {
+                               case 0: strcpy(format, "%X"); break;
+                               case 1: strcpy(format, "%d" ); break;
+                               case 2: strcpy(format, "%u" ); break;
+                               }
+
+                               if (wordlong)
+                                       sprintf(prntstr, format, eval);
+                               else
+                                       sprintf(prntstr, format, eval & 0xFFFF);
+
+                               printf("%s", prntstr);
+
+                               if (list_fd)
+                                       unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
+
+                               formatting = 0;
+                               wordlong = 0;
+                               outtype = 0;
+                       }
+
+                       break;
+               }
+       }
+
+       printf("\n");
+
+       return 0;
+
+token_err:
+       error("illegal print token");
+       return ERROR;
 }
+
+
 //
-// --- .org - Set origin  ---------------------------------------------------------------------------
+// Undefine an equated condition code
 //
+int d_ccundef(void)
+{
+       SYM * ccname;
 
-int d_org(void) {
-   VALUE address;
+       // Check that we are in a RISC section
+       if (!rgpu && !rdsp)
+       {
+               error(".ccundef must be defined in .gpu/.dsp section");
+               return ERROR;
+       }
 
-   if(!rgpu && !rdsp) 
-      return(error(".org permitted only in gpu/dsp section"));
+       if (*tok != SYMBOL)
+       {
+               error("syntax error; expected symbol");
+               return ERROR;
+       }
 
-   orgaddr = 0;
+       ccname = lookup(string[tok[1]], LABEL, 0);
 
-   if(abs_expr(&address) == ERROR) {
-      error("cannot determine org'd address");
-      return(ERROR);
-   }
+       // Make sure symbol is a valid ccdef
+       if (!ccname || !(ccname->sattre & EQUATEDCC))
+       {
+               error("invalid equated condition name specified");
+               return ERROR;
+       }
 
-   orgaddr = address;
-   orgactive = 1;  
+       ccname->sattre |= UNDEF_CC;
 
-   return(0);
+       return 0;
 }
 
+
 //
-// --- NOP Padding Directive -----------------------------------------------------------------------
+// Undefine an equated register
 //
+int d_equrundef(void)
+{
+       SYM * regname;
 
-int d_jpad(void) {
-   jpad = 1;
-   return(0);
-}
+       // Check that we are in a RISC section
+       if (!rgpu && !rdsp)
+               return error(".equrundef/.regundef must be defined in .gpu/.dsp section");
+
+       while (*tok != EOL)
+       {
+               // Skip preceeding or seperating commas (if any)
+               if (*tok == ',')
+                       tok++;
+
+               // Check we are dealing with a symbol
+               if (*tok != SYMBOL)
+                       return error("syntax error; expected symbol");
+
+               // Lookup and undef if equated register
+               regname = lookup(string[tok[1]], LABEL, 0);
 
-int d_nojpad(void) {
-   jpad = 0;
-   return(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;
+       }
+
+       return 0;
 }
 
+
 //
-// --- 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.
-   TOKEN r_expr[EXPRSIZE];
-
-   while(*tok != EOL) {
-      switch(*tok) {
-         case STRING:
-            sprintf(prntstr, "%s", (char*)tok[1]);
-            printf("%s", prntstr);
-            if(list_fd) 
-               write(list_fd, prntstr, (LONG)strlen(prntstr));
-            tok+=2;
-            break;
-         case '/':
-            formatting = 1;
-            if(tok[1] != SYMBOL) goto token_err;
-            strcpy(prntstr, (char*)tok[2]);
-            switch(prntstr[0]) {
-               case 'l': case 'L': wordlong = 1; break;
-               case 'w': case 'W': wordlong = 0; break;
-               case 'x': case 'X': outtype  = 0; break;
-               case 'd': case 'D': outtype  = 1; break;
-               case 'u': case 'U': outtype  = 2; break;
-               default:
-                  error("unknown print format flag");
-                  return(ERROR);
-            }
-            tok += 3;
-            break;
-         case ',':
-            tok++;
-            break;
-         default:
-            if(expr(r_expr, &eval, &eattr, &esym) != OK)
-               goto token_err;
-            else {
-               switch(outtype) {
-                  case 0: strcpy(format, "%X"); break; 
-                  case 1: strcpy(format, "%d" ); break; 
-                  case 2: strcpy(format, "%u" ); break; 
-               }
-               if(wordlong) sprintf(prntstr, format, eval);
-               else sprintf(prntstr, format, eval & 0xFFFF);
-               printf("%s", prntstr);
-               if(list_fd) 
-                  write(list_fd, prntstr, (LONG)strlen(prntstr));
-               formatting = 0;
-               wordlong = 0;
-               outtype = 0;
-            }
-            break;
-      }
-   }
-
-   printf("\n");
-   println("\n");
-
-   return(0);
-
-   token_err:
-   error("illegal print token");
-   return(ERROR);
+// Do not allow use of the CLR.L opcode
+//
+int d_noclear(void)
+{
+       warn("CLR.L opcode ignored...");
+       return 0;
 }
 
+
 //
-// --- Undefine an Equated Condition Code ----------------------------------------------------------
+// Include binary file
 //
+int d_incbin(void)
+{
+       int fd;
+       int bytes = 0;
+       long pos, size, bytesRead;
+       char buf1[256];
+       int i;
 
-int d_ccundef(void) {
-   SYM *ccname;
+       // 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(!rgpu && !rdsp) {                                     // Check that we are in a RISC section
-      error(".ccundef must be defined in .gpu/.dsp section");
-      return(ERROR);
-   }
-   if(*tok != SYMBOL) {
-      error(syntax_error);
-      return(ERROR);
-   }
-   ccname = lookup((char *)tok[1], LABEL, 0);
-   if(!ccname || !(ccname->sattre & EQUATEDCC)) {           // Make sure symbol is a valid ccdef
-      error("invalid equated condition name specified");
-      return(ERROR);
-   }
+       if (*tok != STRING)
+       {
+               error("syntax error; string missing");
+               return ERROR;
+       }
 
-   ccname->sattre |= UNDEF_CC;
+       // 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)
+       {
+               for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
+               {
+                       fd = strlen(buf1);
 
-   return(0);
-}
+                       // Append path char if necessary
+                       if (fd > 0 && buf1[fd - 1] != SLASHCHAR)
+                               strcat(buf1, SLASHSTRING);
 
-//
-// --- Undefine an Equated Register ----------------------------------------------------------------
-//
+                       strcat(buf1, string[tok[1]]);
+
+                       if ((fd = open(buf1, _OPEN_INC)) >= 0)
+                               goto allright;
+               }
+
+               return error("cannot open: \"%s\"", string[tok[1]]);
+       }
 
-int d_equrundef(void) {
-   SYM *regname;
+allright:
 
-   if(!rgpu && !rdsp) {                                     // Check that we are in a RISC section
-      error(".equrundef/.regundef must be defined in .gpu/.dsp section");
-      return(ERROR);
-   }
+       size = lseek(fd, 0L, SEEK_END);
+       pos = lseek(fd, 0L, SEEK_SET);
+       chcheck(size);
 
-   while(*tok != EOL) {
-      if(*tok == ',') tok++;                                // Skip preceeding or seperating commas
+       DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size); }
 
-      if(*tok != SYMBOL) {                                  // Check we are dealing with a symbol
-         error(syntax_error);
-         return(ERROR);
-      }
+       char * fileBuffer = (char *)malloc(size);
+       bytesRead = read(fd, fileBuffer, size);
 
-      regname = lookup((char *)tok[1], LABEL, 0);           // Lookup and undef if equated register
-      if(regname && (regname->sattre & EQUATEDREG))
-         regname->sattre |= UNDEF_EQUR;
+       if (bytesRead != size)
+       {
+               error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
+               return ERROR;
+       }
 
-      tok += 2;                                             // Skip over symbol token and address
-   }
+       memcpy(chptr, fileBuffer, size);
+       chptr += size;
+       sloc += size;
+       ch_size += size;
 
-   return(0);
+       if (orgactive)
+               orgaddr += size;
+
+       free(fileBuffer);
+       close(fd);
+       return 0;
 }
 
+
 //
-// --- Do Not Allow the Use of the CLR.L Opcode ----------------------------------------------------
+// Set RISC register banks
 //
-
-int d_noclear(void) {
-   return(0);
+int d_regbank0(void)
+{
+       // Set active register bank zero
+       regbank = BANK_0;
+       return 0;
 }
 
-// 
-// --- Include Binary File -------------------------------------------------------------------------
-//
-
-int d_incbin(void) {
-   int i, j;
-   int bytes = 0;
-   long pos, size;
-   char buf;
-
-   if(*tok != STRING) {
-      error(syntax_error);
-      return(ERROR);
-   }
-
-   if((j = open((char *)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++) {
-         buf = '\0';
-         bytes = read(j, &buf, 1);
-         D_byte(buf);
-      }
-      
-   } else {
-      errors("cannot open include binary file (%s)", (char*)tok[1]);
-      return(ERROR);
-   }
-
-   close(j);
-   return(0);
-}
-// 
-// --- Set RISC Register Banks ---------------------------------------------------------------------
-//
 
-int d_regbank0(void) {
-   regbank = BANK_0;                                        // Set active register bank zero
-   return(0);
+int d_regbank1(void)
+{
+       // Set active register bank one
+       regbank = BANK_1;
+       return 0;
 }
 
-int d_regbank1(void) {
-   regbank = BANK_1;                                        // Set active register bank one
-   return(0);
-}
 
 //
-// --- Adjust Location to an EVEN Value ------------------------------------------------------------
+// Helper function, to cut down on mistakes & typing
 //
-int d_even(void) {
-   if(sloc & 1) {
-      if((scattr & SBSS) == 0) {
-         chcheck(1);
-         D_byte(0);
-      } else {
-         ++sloc;
-      }
-   }
+static inline void SkipBytes(unsigned bytesToSkip)
+{
+       if (!bytesToSkip)
+               return;
 
-   return(0);
+       if ((scattr & SBSS) == 0)
+       {
+               chcheck(bytesToSkip);
+               D_ZEROFILL(bytesToSkip);
+       }
+       else
+       {
+               sloc += bytesToSkip;
+
+               if (orgactive)
+                       orgaddr += bytesToSkip;
+       }
 }
 
+
 //
-// --- Adjust Location to an LONG Value ------------------------------------------------------------
+// Adjust location to an EVEN value
 //
+int d_even(void)
+{
+       if (m6502)
+               return error(in_6502mode);
+
+       unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
 
-int d_long(void) {
-   unsigned i;
-   unsigned val = 4;
-         
-   i = sloc & ~(val - 1);
-   if(i != sloc) val = val - (sloc - i); 
-   else val = 0;
+       if (skip)
+       {
+               if ((scattr & SBSS) == 0)
+               {
+                       chcheck(1);
+                       D_byte(0);
+               }
+               else
+               {
+                       sloc++;
 
-   if(val) {
-      if((scattr & SBSS) == 0) {
-         chcheck(val);
-         for(i = 0; i < val; i++) 
-            D_byte(0);
-      } else {
-         sloc += val;
-      }
-   }
+                       if (orgactive)
+                               orgaddr++;
+               }
+       }
 
-   return(0);
+       return 0;
 }
 
+
 //
-// --- Adjust Location to an PHRASE Value ----------------------------------------------------------
+// Adjust location to a LONG value
 //
+int d_long(void)
+{
+       unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
+       unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
+       SkipBytes(bytesToSkip);
+       SetLargestAlignment(4);
 
-int d_phrase(void) {
-   unsigned i;
-   unsigned val = 8;
-         
-   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;
-      }
-   }
-
-   return(0);
+       return 0;
 }
 
+
 //
-// --- Adjust Location to an DPHRASE Value ---------------------------------------------------------
+// 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);
 
-int d_dphrase(void) {
-   unsigned i;
-   unsigned val = 16;
-         
-   i = sloc & ~(val - 1);
-   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;
-      }
-   }
 
-   return(0);
+//
+// Adjust location to a DPHRASE value
+//
+int d_dphrase(void)
+{
+       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 lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
+       unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
+       SkipBytes(bytesToSkip);
+       SetLargestAlignment(32);
 
-int d_qphrase(void) {
-   unsigned i;
-   unsigned val = 32;
-         
-   i = sloc & ~(val - 1);
-   if(i != sloc) val = val - (sloc - i); 
-   else val = 0;
+       return 0;
+}
 
-   if(val) {
-      if((scattr & SBSS) == 0) {
-         savsect();
-         chcheck(val);
-         for(i = 0; i < val; i++) 
-            D_byte(0);
-      } else {
-         sloc += val;
-      }
-   }
 
-   return(0);
+//
+// Do auto-even.  This must be called ONLY if 'sloc' is odd.
+//
+// This is made hairy because, if there was a label on the line, we also have
+// to adjust its value. This won't work with more than one label on the line,
+// 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 (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++;
+       }
 }
 
+
 //
-// -------------------------------------------------------------------------------------------------
-// Do auto-even.  This must be called ONLY if 'sloc' is odd.
+// Unimplemened directive error
 //
-// This is made hairy because, if there was a label on the line, we also have to adjust its value.
-// This won't work with more than one label on the line, 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
-// -------------------------------------------------------------------------------------------------
+int d_unimpl(void)
+{
+       return error("unimplemented directive");
+}
+
+
 //
+// Return absolute (not TDB) and defined expression or return an error
+//
+int abs_expr(uint64_t * a_eval)
+{
+       WORD eattr;
+
+       if (expr(exprbuf, a_eval, &eattr, NULL) < 0)
+               return ERROR;
+
+       if (!(eattr & DEFINED))
+               return error(undef_error);
 
-void auto_even(void) {
-   if(scattr & SBSS)
-      ++sloc;                                               // Bump BSS section
-   else {
-      D_byte(0)                                             // Deposit 0.b in non-BSS
-   }
+       if (eattr & TDB)
+               return error(rel_error);
 
-   if(lab_sym != NULL)                                      // Bump label if we have to
-      ++lab_sym->svalue;
+       return OK;
 }
 
+
 //
-// --- Unimplemened Directive Error ----------------------------------------------------------------
+// Hand symbols in a symbol-list to a function (kind of like mapcar...)
 //
+int symlist(int(* func)())
+{
+       const char * em = "symbol list syntax";
+
+       for(;;)
+       {
+               if (*tok != SYMBOL)
+                       return error(em);
+
+               if ((*func)(string[tok[1]]) != OK)
+                       break;
 
-int d_unimpl(void) {
-   return(error("unimplemented directive"));
+               tok += 2;
+
+               if (*tok == EOL)
+                       break;
+
+               if (*tok != ',')
+                       return error(em);
+
+               tok++;
+       }
+
+       return 0;
 }
 
-// 
-// --- Return absolute (not TDB) and defined expression or return an error -------------------------
+
 //
+// .include "filename"
+//
+int d_include(void)
+{
+       int j;
+       int i;
+       char * fn;
+       char buf[128];
+       char buf1[128];
+
+       if (*tok == STRING)                     // Leave strings ALONE
+               fn = string[*++tok];
+       else if (*tok == SYMBOL)        // Try to append ".s" to symbols
+       {
+               strcpy(buf, string[*++tok]);
+               fext(buf, ".s", 0);
+               fn = &buf[0];
+       }
+       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");
+
+       // 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 "-i" option.
+       if ((j = open(fn, 0)) < 0)
+       {
+               for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
+               {
+                       j = strlen(buf1);
+
+                       // Append path char if necessary
+                       if (j > 0 && buf1[j - 1] != SLASHCHAR)
+                               strcat(buf1, SLASHSTRING);
+
+                       strcat(buf1, fn);
+
+                       if ((j = open(buf1, 0)) >= 0)
+                               goto allright;
+               }
+
+               return error("cannot open: \"%s\"", fn);
+       }
+
+allright:
+       include(j, fn);
+       return 0;
+}
 
-int abs_expr(VALUE *a_eval) {
-   WORD eattr;
 
-   if(expr(exprbuf, a_eval, &eattr, NULL) < 0)
-      return(ERROR);
-   if(!(eattr & DEFINED))
-      return(error(undef_error));
-   if(eattr & TDB)
-      return(error(rel_error));
+//
+// .assert expression [, expression...]
+//
+int d_assert(void)
+{
+       WORD eattr;
+       uint64_t eval;
+
+       for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
+       {
+               if (!(eattr & DEFINED))
+                       return error("forward or undefined .assert");
+
+               if (!eval)
+                       return error("assert failure");
 
-   return(OK);
+               if (*tok != ',')
+                       break;
+       }
+
+       at_eol();
+       return 0;
 }
 
+
 //
-// --- Hand symbols in a symbol-list to a function (kind of like mapcar...) ------------------------
+// .globl symbol [, symbol] <<<cannot make local symbols global>>>
 //
+int globl1(char * p)
+{
+       SYM * sy;
+
+       if (*p == '.')
+               return error("cannot .globl local symbol");
 
-int symlist(int(*func)()) {
-   char *em = "symbol list syntax";
+       if ((sy = lookup(p, LABEL, 0)) == NULL)
+       {
+               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
+               sy->sattr |= GLOBAL;
+
+       return OK;
+}
 
-   for(;;) {
-      if(*tok != SYMBOL) return(error(em));
-      if((*func)(tok[1]) != OK) break;
-      tok += 2;
-      if(*tok == EOL) break;
-      if(*tok != ',') return(error(em));
-      ++tok;
-   }
 
-   return(0);
+int d_globl(void)
+{
+       if (m6502)
+               return error(in_6502mode);
+
+       symlist(globl1);
+       return 0;
 }
 
+
 //
-// --- .include "filename" -------------------------------------------------------------------------
-//
-
-int d_include(void) {
-   int j;
-   int i;
-   char *fn;
-   char buf[128];
-   char buf1[128];
-
-   if(*tok == STRING)                                       // Leave strings ALONE 
-      fn = (char *)*++tok;
-   else if(*tok == SYMBOL) {                                // Try to append ".s" to symbols
-      strcpy(buf, (char *)*++tok);
-      fext(buf, ".s", 0);
-      fn = &buf[0];
-   } 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"));
-
-   // 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((j = open(fn, 0)) < 0) {
-      for(i = 0; nthpath("RMACPATH", i, buf1) != 0; ++i) {
-         j = strlen(buf1);
-         if(j > 0 && buf1[j-1] != SLASHCHAR)                // Append path char if necessary 
-            strcat(buf1, SLASHSTRING);
-         strcat(buf1, fn);
-         if((j = open(buf1, 0)) >= 0)
-            goto allright;
-      }
-
-      return(errors("cannot open: \"%s\"", fn));
-   }
-
-   allright:
-
-   include(j, fn);
-   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");
+       }
 }
 
+
 //
-// --- .assert expression [, expression...] --------------------------------------------------------
+// .abs [expression]
 //
+int d_abs(void)
+{
+       uint64_t eval;
 
-int d_assert(void) {
-   WORD eattr;
-   VALUE eval;
+       if (m6502)
+               return error(in_6502mode);
 
-   for(; expr(exprbuf, &eval, &eattr, NULL) == OK; ++tok) {
-      if(!(eattr & DEFINED))
-         return(error("forward or undefined .assert"));
-      if(!eval)
-         return(error("assert failure"));
-      if(*tok != ',')
-         break;
-   }
-   at_eol();
-   return(0);
+       SaveSection();
+
+       if (*tok == EOL)
+               eval = 0;
+       else if (abs_expr(&eval) != OK)
+               return 0;
+
+       SwitchSection(ABS);
+       sloc = (uint32_t)eval;
+       return 0;
 }
 
+
 //
-// --- .globl symbol [, symbol] <<<cannot make local symbols global>>> -----------------------------
+// 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)
+       {
+               SaveSection();
+               SwitchSection(TEXT);
+       }
+
+       return 0;
+}
 
-int globl1(char *p) {
-   SYM *sy;
 
-   if(*p == '.')
-      return(error("cannot .globl local symbol"));
-   if((sy = lookup(p, LABEL, 0)) == NULL) {
-      sy = newsym(p, LABEL, 0);
-      sy->svalue = 0;
-      sy->sattr = GLOBAL;
-   } else 
-      sy->sattr |= GLOBAL;
+int d_data(void)
+{
+       if (rgpu || rdsp)
+               return error("directive forbidden in gpu/dsp mode");
+       else if (m6502)
+               return error(in_6502mode);
 
-   return(OK);
+       if (cursect != DATA)
+       {
+               SaveSection();
+               SwitchSection(DATA);
+       }
+
+       return 0;
 }
 
-int d_globl(void) {
-   symlist(globl1);
-   return(0);
+
+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)
+       {
+               SaveSection();
+               SwitchSection(BSS);
+       }
+
+       return 0;
 }
 
+
 //
-// --- .abs [expression] ---------------------------------------------------------------------------
+// .ds[.size] expression
 //
+int d_ds(WORD siz)
+{
+       DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
+
+       uint64_t eval;
+
+       if (cursect != M6502)
+       {
+               if ((siz != SIZB) && (sloc & 1))        // Automatic .even
+                       auto_even();
+       }
 
-int d_abs(void) {
-   VALUE eval;
+       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) || cursect == M6502)
+       {
+               listvalue((uint32_t)eval);
+               eval *= siz;
+               sloc += (uint32_t)eval;
+
+               if (cursect == M6502)
+                       chptr += eval;
+
+               just_bss = 1;                                   // No data deposited (8-bit CPU mode)
+       }
+       else
+       {
+               dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL);
+       }
+
+       at_eol();
+       return 0;
+}
 
-   savsect();
-   if(*tok == EOL)
-      eval = 0;
-   else
-      if(abs_expr(&eval) != OK)
-         return(0);
 
-   switchsect(ABS);
-   sloc = eval;
-   return(0);
+//
+// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d
+//
+int d_dc(WORD siz)
+{
+       WORD eattr;
+       uint64_t eval;
+       uint8_t * p;
+
+       if ((scattr & SBSS) != 0)
+               return error("illegal initialization of section");
+
+       // 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();
+
+       // 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 == STRINGA8) && (tok[2] == ',' || tok[2] == EOL))
+               {
+                       uint32_t i = strlen(string[tok[1]]);
+
+                       if ((challoc - ch_size) < i)
+                               chcheck(i);
+
+                       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;
+               }
+
+               int movei = 0; // MOVEI flag for dc.i
+
+               if (*tok == DOTI)
+               {
+                       movei = 1;
+                       tok++;
+                       siz = SIZL;
+               }
+
+               // dc.x <expression>
+               SYM * esym = 0;
+
+               if (expr(exprbuf, &eval, &eattr, &esym) != OK)
+                       return 0;
+
+               uint16_t tdb = eattr & TDB;
+               uint16_t defined = eattr & DEFINED;
+
+               if ((challoc - ch_size) < 4)
+                       chcheck(4);
+
+               switch (siz)
+               {
+               case SIZB:
+                       if (!defined)
+                       {
+                               AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
+                               D_byte(0);
+                       }
+                       else
+                       {
+                               if (tdb)
+                                       return error("non-absolute byte value");
+
+                               if (eval + 0x100 >= 0x200)
+                                       return error("%s (value = $%X)", range_error, eval);
+
+                               D_byte(eval);
+                       }
+
+                       break;
+               case SIZW:
+               case SIZN:
+                       if (!defined)
+                       {
+                               AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf);
+                               D_word(0);
+                       }
+                       else
+                       {
+                               if (eval + 0x10000 >= 0x20000)
+                                       return error(range_error);
+
+                               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)
+                                       AddFixup(FU_LONG | FU_MOVEI, sloc, exprbuf);
+                               else
+                                       AddFixup(FU_LONG, sloc, exprbuf);
+
+                               D_long(0);
+                       }
+                       else
+                       {
+                               if (tdb)
+                                       MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);
+
+                               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;
+       }
+
+       at_eol();
+       return 0;
 }
 
+
 //
-// --- Switch Segments -----------------------------------------------------------------------------
+// dcb[.siz] expr1,expr2 - Make 'expr1' copies of 'expr2'
 //
+int d_dcb(WORD siz)
+{
+       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");
+
+       if (abs_expr(&evalc) != OK)
+               return 0;
+
+       if (*tok++ != ',')
+               return error("missing comma");
+
+       if (expr(exprbuf, &eval, &eattr, NULL) < 0)
+               return 0;
 
-int d_text(void) {
-   if(rgpu || rdsp)
-      return(error("directive forbidden in gpu/dsp mode"));
+       if (cursect != M6502 && (siz != SIZB) && (sloc & 1))
+               auto_even();
 
-   if(cursect != TEXT) {
-      savsect();
-      switchsect(TEXT);
-   }
-   return(0);
+       dep_block((uint32_t)evalc, siz, (uint32_t)eval, eattr, exprbuf);
+       return 0;
 }
 
-int d_data(void) {
-   if(rgpu || rdsp)
-      return(error("directive forbidden in gpu/dsp mode"));
 
-   if(cursect != DATA) {
-      savsect();
-      switchsect(DATA);
-   }
-   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
+// may be followed by a size suffix, which overrides the default size.
+//
+int d_init(WORD def_siz)
+{
+       uint64_t count;
+       uint64_t eval;
+       WORD eattr;
+       WORD siz;
+
+       if ((scattr & SBSS) != 0)
+               return error(".init not permitted in BSS or ABS");
+
+       if (rgpu || rdsp)
+               return error("directive forbidden in gpu/dsp mode");
+
+       for(;;)
+       {
+               // Get repeat count (defaults to 1)
+               if (*tok == '#')
+               {
+                       tok++;
+
+                       if (abs_expr(&count) != OK)
+                               return 0;
+
+                       if (*tok++ != ',')
+                               return error(comma_error);
+               }
+               else
+                       count = 1;
+
+               // Evaluate expression to deposit
+               if (expr(exprbuf, &eval, &eattr, NULL) < 0)
+                       return 0;
+
+               switch (*tok++)
+               {                                 // Determine size of object to deposit
+               case DOTB: siz = SIZB; break;
+               case DOTW: siz = SIZB; break;
+               case DOTL: siz = SIZL; break;
+               default:
+                       siz = def_siz;
+                       tok--;
+                       break;
+               }
+
+               dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf);
+
+               switch (*tok)
+               {
+               case EOL:
+                       return 0;
+               case ',':
+                       tok++;
+                       continue;
+               default:
+                       return error(comma_error);
+               }
+       }
 }
 
-int d_bss(void) {
-   if(rgpu || rdsp)
-      return(error("directive forbidden in gpu/dsp mode"));
 
-   if(cursect != BSS) {
-      savsect();
-      switchsect(BSS);
-   }
-   return(0);
+//
+// Deposit 'count' values of size 'siz' in the current (non-BSS) segment
+//
+int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKEN * exprbuf)
+{
+       WORD tdb;
+       WORD defined;
+
+       tdb = (WORD)(eattr & TDB);
+       defined = (WORD)(eattr & DEFINED);
+
+       while (count--)
+       {
+               if ((challoc - ch_size) < 4)
+                       chcheck(4L);
+
+               switch(siz)
+               {
+               case SIZB:
+                       if (!defined)
+                       {
+                               AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
+                               D_byte(0);
+                       }
+                       else
+                       {
+                               if (tdb)
+                                       return error("non-absolute byte value");
+
+                               if (eval + 0x100 >= 0x200)
+                                       return error(range_error);
+
+                               D_byte(eval);
+                       }
+
+                       break;
+               case SIZW:
+               case SIZN:
+                       if (!defined)
+                       {
+                               AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf);
+                               D_word(0);
+                       }
+                       else
+                       {
+                               if (tdb)
+                                       MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
+
+                               if (eval + 0x10000 >= 0x20000)
+                                       return error(range_error);
+
+                               // Deposit 68000 or 6502 (byte-reversed) word
+                               if (cursect != M6502)
+                                       D_word(eval)
+                               else
+                                       D_rword(eval)
+
+                       }
+
+                       break;
+               case SIZL:
+                       if (m6502)
+                               return error(in_6502mode);
+
+                       if (!defined)
+                       {
+                               AddFixup(FU_LONG, sloc, exprbuf);
+                               D_long(0);
+                       }
+                       else
+                       {
+                               if (tdb)
+                                       MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);
+
+                               D_long(eval);
+                       }
+
+                       break;
+               }
+       }
+
+       return 0;
 }
 
+
 //
-// --- .ds[.size] expression -----------------------------------------------------------------------
+// .comm symbol, size
 //
+int d_comm(void)
+{
+       SYM * sym;
+       char * p;
+       uint64_t eval;
+
+       if (m6502)
+               return error(in_6502mode);
+
+       if (*tok != SYMBOL)
+               return error("missing symbol");
+
+       p = string[tok[1]];
+       tok += 2;
 
-int d_ds(WORD siz) {
-   VALUE eval;
+       if (*p == '.')                                                  // Cannot .comm a local symbol
+               return error(locgl_error);
 
-   // 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"));
+       if ((sym = lookup(p, LABEL, 0)) == NULL)
+               sym = NewSymbol(p, LABEL, 0);
+       else
+       {
+               if (sym->sattr & DEFINED)
+                       return error(".comm symbol already defined");
+       }
 
-   if(siz != SIZB && (sloc & 1))                            // Automatic .even 
-      auto_even();
+       sym->sattr = GLOBAL | COMMON | BSS;
 
-   if(abs_expr(&eval) != OK) return(0);
+       if (*tok++ != ',')
+               return error(comma_error);
 
-   // 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)) {
-      listvalue(eval);
-      eval *= siz;
-      sloc += eval;
-      just_bss = 1;                                         // No data deposited (8-bit CPU mode)
-   } else {
-      dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED|ABS), NULL);
-   }
+       if (abs_expr(&eval) != OK)                              // Parse size of common region
+               return 0;
 
-   at_eol();
-   return(0);
+       sym->svalue = (uint32_t)eval;                   // Install common symbol's size
+       at_eol();
+       return 0;
 }
 
+
+//
+// .list - Turn listing on
 //
-// --- dc.b, dc.w / dc, dc.l -----------------------------------------------------------------------
-//
-
-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
-
-   if((scattr & SBSS) != 0)
-      return(error("illegal initialization of section"));
-
-   if((siz != SIZB) && (sloc & 1))
-      auto_even();
-
-   for(;; ++tok) {
-      // dc.b 'string' [,] ...
-      if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL)) {
-         i = strlen((const char*)tok[1]);
-         if((challoc - ch_size) < i) 
-            chcheck(i);
-         for(p = (char *)tok[1]; *p != EOS; ++p)
-            D_byte(*p);
-         tok += 2;
-         goto comma;
-      }
-
-      if(*tok == 'I') {
-         movei = 1;
-         tok++;
-         siz = SIZL;
-      }
-
-      // dc.x <expression>
-      if(expr(exprbuf, &eval, &eattr, NULL) != OK)
-         return(0);
-      tdb = (WORD)(eattr & TDB);
-      defined = (WORD)(eattr & DEFINED);
-      if((challoc - ch_size) < 4)
-         chcheck(4L);
-
-      switch(siz) {
-         case SIZB:
-            if(!defined) {
-               fixup(FU_BYTE|FU_SEXT, sloc, exprbuf);
-               D_byte(0);
-            } else {
-               if(tdb)
-                  return(error("non-absolute byte value"));
-               if(eval + 0x100 >= 0x200)
-                  return(error(range_error));
-               D_byte(eval);
-            }
-            break;
-         case SIZW:
-         case SIZN:
-            if(!defined) {
-               fixup(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);
-            }
-            break;
-         case SIZL:
-            if(!defined) {
-               if(movei)
-                  fixup(FU_LONG|FU_MOVEI, sloc, exprbuf);
-               else
-                  fixup(FU_LONG, sloc, exprbuf);
-               D_long(0);
-            } else {
-               if(tdb)
-                  rmark(cursect, sloc, tdb, MLONG, NULL);
-               if(movei) 
-                  eval = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000);
-               D_long(eval);
-            }  
-            break;
-      }
-      
-      comma:
-
-      if(*tok != ',')
-         break;
-   }
-
-   at_eol();
-   return(0);
+int d_list(void)
+{
+       if (list_flag)
+               listing++;
+
+       return 0;
 }
 
+
 //
-// --- dcb[.siz] expr1,expr2 - Make 'expr1' copies of 'expr2' --------------------------------------
+// .nlist - Turn listing off
 //
+int d_nlist(void)
+{
+       if (list_flag)
+               listing--;
 
-int d_dcb(WORD siz) {
-   VALUE evalc, eval;
-   WORD eattr;
+       return 0;
+}
 
-   if((scattr & SBSS) != 0)
-      return(error("illegal initialization of section"));
 
-   if(abs_expr(&evalc) != OK)
-      return(0);
+//
+// .68000 - Back to 68000 TEXT segment
+//
+int d_68000(void)
+{
+       rgpu = rdsp = 0;
+       // Switching from gpu/dsp sections should reset any ORG'd Address
+       orgactive = 0;
+       orgwarning = 0;
+       SaveSection();
+       SwitchSection(TEXT);
+       activecpu = CPU_68000;
+       return 0;
+}
 
-   if(*tok++ != ',')
-      return(error("missing comma"));
 
-   if(expr(exprbuf, &eval, &eattr, NULL) < 0)
-      return(0);
+//
+// .68020 - Back to 68000 TEXT segment and select 68020
+//
+int d_68020(void)
+{
+       d_68000();
+       activecpu = CPU_68020;
+       return 0;
+}
 
-   if((siz != SIZB) && (sloc & 1))
-      auto_even();
 
-   dep_block(evalc, siz, eval, eattr, exprbuf);
-   return(0);
+//
+// .68030 - Back to 68000 TEXT segment and select 68030
+//
+int d_68030(void)
+{
+       d_68000();
+       activecpu = CPU_68030;
+       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 may be followed by a size suffix, which overrides the 
-// default size.
-// -------------------------------------------------------------------------------------------------
-//
-
-int d_init(WORD def_siz) {
-   VALUE count;
-   VALUE eval;
-   WORD eattr;
-   WORD siz;
-
-   if((scattr & SBSS) != 0)
-      return(error(".init not permitted in BSS or ABS"));
-
-   if(rgpu || rdsp)
-      return(error("directive forbidden in gpu/dsp mode"));
-
-   for(;;) {
-      // Get repeat count (defaults to 1)
-      if(*tok == '#') {
-         ++tok;
-         if(abs_expr(&count) != OK)
-            return(0);
-         if(*tok++ != ',')
-            return(error(comma_error));
-      } else 
-         count = 1;
-
-      // Evaluate expression to deposit
-      if(expr(exprbuf, &eval, &eattr, NULL) < 0)
-         return(0);
-
-      switch((int)*tok++) {                                 // Determine size of object to deposit
-         case DOTB: siz = SIZB; break;
-         case DOTW: siz = SIZB; break;
-         case DOTL: siz = SIZL; break;
-         default: 
-            siz = def_siz;
-            --tok;
-            break;
-      }
-
-      dep_block(count, siz, eval, eattr, exprbuf);
-
-      switch((int)*tok) {
-         case EOL:
-            return(0);
-         case ',':
-            ++tok;
-            continue;
-         default:
-            return(error(comma_error));
-      }
-   }
+// .68040 - Back to 68000 TEXT segment and select 68040
+//
+int d_68040(void)
+{
+       d_68000();
+       activecpu = CPU_68040;
+       activefpu = FPU_68040;
+       return 0;
 }
 
+
+//
+// .68060 - Back to 68000 TEXT segment and select 68060
 //
-// --- 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) {
-   WORD tdb;
-   WORD defined;
-
-   tdb = (WORD)(eattr & TDB);
-   defined = (WORD)(eattr & DEFINED);
-
-   while(count--) {
-      if((challoc - ch_size) < 4)
-         chcheck(4L);
-
-      switch(siz) {
-         case SIZB:
-            if(!defined) {
-               fixup(FU_BYTE|FU_SEXT, sloc, exprbuf);
-               D_byte(0);
-            } else {
-               if(tdb)
-                  return(error("non-absolute byte value"));
-               if(eval + 0x100 >= 0x200)
-                  return(error(range_error));
-               D_byte(eval);
-            }
-            break;
-         case SIZW:
-         case SIZN:
-            if(!defined) {
-               fixup(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);
-            }
-            break;
-         case SIZL:
-            if(!defined) {
-               fixup(FU_LONG, sloc, exprbuf);
-               D_long(0);
-            } else {
-               if(tdb)
-                  rmark(cursect, sloc, tdb, MLONG, NULL);
-               D_long(eval);
-            }  
-            break;
-      }
-   }
-   return(0);
+int d_68060(void)
+{
+       d_68000();
+       activecpu = CPU_68060;
+       activefpu = FPU_68040;
+       return 0;
 }
 
+
 //
-// --- .comm symbol, size --------------------------------------------------------------------------
+// .68881 - Back to 68000 TEXT segment and select 68881 FPU
 //
+int d_68881(void)
+{
+       d_68000();
+       activefpu = FPU_68881;
+       return 0;
+}
 
-int d_comm(void) {
-   SYM *sym;
-   char *p;
-   VALUE eval;
 
-   if(*tok != SYMBOL)
-      return(error("missing symbol"));
-   p = (char *)tok[1];
-   tok += 2;
+//
+// .68882 - Back to 68000 TEXT segment and select 68882 FPU
+//
+int d_68882(void)
+{
+       d_68000();
+       activefpu = FPU_68881;
+       return 0;
+}
 
-   if(*p == '.')                                            // Cannot .comm a local symbol
-      return(error(locgl_error));
 
-   if((sym = lookup(p, LABEL, 0)) == NULL)
-      sym = newsym(p, LABEL, 0);
-   else {
-      if(sym->sattr & DEFINED)
-         return(error(".comm symbol already defined"));
-   }
+//
+// nofpu - Deselect FPUs.
+//
+int d_nofpu(void)
+{
+       activefpu = FPU_NONE;
+       return 0;
+}
 
-   sym->sattr = GLOBAL|COMMON|BSS;
-   if(*tok++ != ',')
-      return(error(comma_error));
 
-   if(abs_expr(&eval) != OK)                                // Parse size of common region
-      return(0);
-   sym->svalue = eval;                                      // Install common symbol's size
-   at_eol();
-   return(0);
+//
+// DSP56001
+//
+int d_56001(void)
+{
+       return error("Not yet, child. Be patient.");
 }
 
+
 //
-// --- .list - Turn listing on  --------------------------------------------------------------------
+// .gpu - Switch to GPU assembler
 //
+int d_gpu(void)
+{
+       if ((cursect != TEXT) && (cursect != DATA))
+       {
+               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 (!rgpu)
+       {
+               orgactive = 0;
+               orgwarning = 0;
+       }
 
-int d_list(void) {
-   if(list_flag)
-      ++listing;
-   return(0);
+       rgpu = 1;                       // Set GPU assembly
+       rdsp = 0;                       // Unset DSP assembly
+       regbank = BANK_N;       // Set no default register bank
+       return 0;
 }
 
+
 //
-// --- .nlist - Turn listing off -------------------------------------------------------------------
+// .dsp - Switch to DSP assembler
 //
+int d_dsp(void)
+{
+       if ((cursect != TEXT) && (cursect != DATA))
+       {
+               error(".dsp can only be used in the TEXT or DATA segments");
+               return ERROR;
+       }
 
-int d_nlist(void) {
-   if(list_flag)
-      --listing;
-   return(0);
+       // If previous section was gpu or 68000 then we need to reset ORG'd Addresses
+       if (!rdsp)
+       {
+               orgactive = 0;
+               orgwarning = 0;
+       }
+
+       rdsp = 1;                       // Set DSP assembly
+       rgpu = 0;                       // Unset GPU assembly
+       regbank = BANK_N;       // Set no default register bank
+       return 0;
 }
 
+
 //
-// --- .68000 - Back to 68000 TEXT segment ---------------------------------------------------------
+// .cargs [#offset], symbol[.size], ...
 //
-
-int d_68000(void) {
-   rgpu = rdsp = 0;
-   in_main = 0;
-   // Switching from gpu/dsp sections should reset any ORG'd Address
-   orgactive = 0;                               
-   orgwarning = 0;
-   savsect();
-   switchsect(TEXT);
-   return(0);
+// Lists of registers may also be mentioned; they just take up space. Good for
+// "documentation" purposes:
+//
+// .cargs a6, .arg1, .arg2, .arg3...
+//
+// Symbols thus created are ABS and EQUATED.
+//
+int d_cargs(void)
+{
+       uint64_t eval = 4;      // Default to 4 if no offset specified (to account for
+                                               // return address)
+       WORD rlist;
+       SYM * symbol;
+       char * p;
+       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)
+               {
+                       p = string[tok[1]];
+
+                       // Set env to either local (dot prefixed) or global scope
+                       env = (*p == '.' ? curenv : 0);
+                       symbol = lookup(p, LABEL, env);
+
+                       if (symbol == NULL)
+                       {
+                               symbol = NewSymbol(p, LABEL, env);
+                               symbol->sattr = 0;
+                       }
+                       else if (symbol->sattr & DEFINED)
+                               return error("multiply-defined label '%s'", p);
+
+                       // Put symbol in "order of definition" list
+                       AddToSymbolDeclarationList(symbol);
+
+                       symbol->sattr |= (ABS | DEFINED | EQUATED);
+                       symbol->svalue = (uint32_t)eval;
+                       tok += 2;
+
+                       // 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++;
+                       }
+
+                       eval += 2;
+               }
+               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(".cargs syntax");
+                       }
+               }
+
+               // Eat commas in between each argument, if they exist
+               if (*tok == ',')
+                       tok++;
+       }
 }
 
+
 //
-// --- .gpu - Switch to GPU Assembler --------------------------------------------------------------
-//
-
-int d_gpu(void) {
-   if((cursect != TEXT) && (cursect != DATA)) {
-      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(!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;
-   return(0);
+// .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 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)
+                       {
+                       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");
+                       }
+
+                       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++;
+       }
 }
 
+
+//
+// Undefine a macro - .undefmac macname [, macname...]
 //
-// --- GPU Main Code Directive ---------------------------------------------------------------------
-//
-
-int d_gpumain(void) {
-   if((cursect != TEXT) && (cursect != DATA)) {
-      error(".gpumain 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(!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;
-   return(0);
+int undmac1(char * p)
+{
+       SYM * symbol = lookup(p, MACRO, 0);
+
+       // If the macro symbol exists, cause it to disappear
+       if (symbol != NULL)
+               symbol->stype = (BYTE)SY_UNDEF;
+
+       return OK;
+}
+
+
+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
 //
-// --- .dsp - Switch to DSP Assembler --------------------------------------------------------------
-//
-
-int d_dsp(void) {
-   if((cursect != TEXT) && (cursect != DATA)) {
-      error(".dsp can only be used in the TEXT or DATA segments");
-      return(ERROR);
-   }
-   // If previous section was gpu or 68000 then we need to reset ORG'd Addresses
-   if(!rdsp) {
-      orgactive = 0;
-      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;
-   return(0);
+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;
 }
 
+
 //
-// -------------------------------------------------------------------------------------------------
-// .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.
-// -------------------------------------------------------------------------------------------------
-//
-
-int d_cargs(void) {
-   VALUE eval;
-   WORD rlist;
-   SYM *sy;
-   char *p;
-   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);
-      if(*tok == ',')                                       // Eat comma if it's there
-         ++tok;
-   } else 
-      eval = 4;
-
-   for(;;) {
-      if(*tok == SYMBOL) {
-         p = (char *)tok[1];
-         if(*p == '.')
-            env = curenv;
-         else
-            env = 0;
-
-         sy = lookup(p, LABEL, env);
-         if(sy == NULL) {
-            sy = newsym(p, LABEL, env);
-            sy->sattr = 0;
-         } else 
-            if(sy->sattr & DEFINED)
-               return(errors("multiply-defined label '%s'", p));
-
-         // Put symbol in "order of definition" list
-         if(!(sy->sattr & SDECLLIST)) sym_decl(sy);
-
-         sy->sattr |= ABS|DEFINED|EQUATED;
-         sy->svalue = eval;
-         tok += 2;
-
-         switch((int)*tok) {
-            case DOTL:
-               eval += 2;
-            case DOTB:
-            case DOTW:
-               ++tok;
-         }
-         eval += 2;
-      } else 
-         if(*tok >= KW_D0 && *tok <= KW_A7) {
-            if(reglist(&rlist) < 0)
-               return(0);
-            for(i = 0; i++ < 16; 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(".cargs syntax"));
-            }
-
-         if(*tok == ',')
-            ++tok;
-   }
+// .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;
 }
 
+
 //
-// --- Undefine a macro - .undefmac macname [, macname...] -----------------------------------------
+// .else, Do alternate case for .if
 //
+int d_else(void)
+{
+       IFENT * rif = ifent;
+
+       if (rif->if_prev == NULL)
+               return error("mismatched .else");
 
-int undmac1(char *p) {
-   SYM *sy;
+       if (disabled)
+               disabled = rif->if_prev->if_state;
+       else
+               disabled = 1;
 
-   // If the macro symbol exists, cause it to dissappear
-   if((sy = lookup(p, MACRO, 0)) != NULL) sy->stype = (BYTE)SY_UNDEF;
-      return(OK);
+       rif->if_state = (WORD)disabled;
+       return 0;
 }
 
-int d_undmac(void) {
-   symlist(undmac1);
-   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;
 }
+