X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=0f92d796b9a6b60a2a32970d8299f9079b4e35ee;hp=30880a30ee24717ad59c61e5d058b4dc657693f7;hb=582df8950c285e1746d0c4a9e3ead6545c962dc8;hpb=5f23454f7155f0c77ea1bede3f9e60b39da99fa8

diff --git a/rmac.h b/rmac.h
index 30880a3..0f92d79 100644
--- a/rmac.h
+++ b/rmac.h
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // RMAC.H - Main Application Code
-// Copyright (C) 199x Landon Dyer, 2017 Reboot & 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
 //
@@ -135,6 +135,7 @@
 // Byteswap crap
 #define BYTESWAP16(x) ((((x) & 0x00FF) << 8) | (((x) & 0xFF00) >> 8))
 #define BYTESWAP32(x) ((((x) & 0x000000FF) << 24) | (((x) & 0x0000FF00) << 8) | (((x) & 0x00FF0000) >> 8) | (((x) & 0xFF000000) >> 24))
+#define BYTESWAP64(x) (BYTESWAP32(x>>32)|BYTESWAP32((x&0xffffffff)<<32))
 #define WORDSWAP32(x) ((((x) & 0x0000FFFF) << 16) | (((x) & 0xFFFF0000) >> 16))
 
 //
@@ -153,7 +154,6 @@
 #define SPACE        ' '		// ASCII space
 #define SLASHCHAR    '/'
 #define SLASHSTRING  "/"
-#define VALUE        uint32_t	// Assembler value
 #define TOKEN        uint32_t	// Assembler token
 #define FNSIZ        128		// Maximum size of a filename
 #define OK           0			// OK return
@@ -163,44 +163,17 @@
 #define ERROUT       2			// Error output
 #define CREATMASK    0
 
-// (Normally) non-printable tokens
-#define COLON        ':'		// : (grumble: GNUmacs hates ':')
-#define CONST        'a'		// CONST <value>
-#define ACONST       'A'		// ACONST <value> <attrib>
-#define STRING       'b'		// STRING <address>
-#define STRINGA8     'S'		// Atari 800 internal STRING <address>
-#define SYMBOL       'c'		// SYMBOL <address>
-#define EOL          'e'		// End of line
-#define TKEOF        'f'		// End of file (or macro)
-#define DEQUALS      'g'		// ==
-#define SET          149		// set
-#define REG          'R'		// reg
-#define EQUREG       148		// equreg
-#define CCDEF        183		// ccdef
-#define DCOLON       'h'		// ::
-#define GE           'i'		// >=
-#define LE           'j'		// <=
-#define NE           'k'		// <> or !=
-#define SHR          'l'		// >>
-#define SHL          'm'		// <<
-#define UNMINUS      'n'		// Unary '-'
-#define DOTB         'B'		// .b or .B or .s or .S
-#define DOTW         'W'		// .w or .W
-#define DOTL         'L'		// .l or .L
-#define DOTI         'I'		// .i or .I
-#define DOTD         'D'		// .d or .D
-#define DOTS         'S'		// .s or .S (FPU Single)
-#define DOTQ         'Q'		// .q oe .Q (FPU Quad)
-#define DOTX         'X'		// .x or .X (FPU Extended)
-#define DOTP         'P'		// .p or .P (FPU Packed)
-#define ENDEXPR      'E'		// End of expression
-
 // Object code formats
-#define ALCYON       0			// Alcyon/DRI C object format
-#define MWC          1			// Mark Williams object format
-#define BSD          2			// BSD object format
-#define ELF          3			// ELF object format
-#define XEX          4			// COM/EXE/XEX/whatever a8 object format
+enum
+{
+ALCYON,			// Alcyon/DRI C object format
+MWC, 				// Mark Williams object format
+BSD, 				// BSD object format
+ELF, 				// ELF object format
+LOD,				// DSP 56001 object format
+P56,				// DSP 56001 object format
+XEX, 				// COM/EXE/XEX/whatever a8 object format
+};
 
 // Pointer type that can point to (almost) anything
 #define PTR union _ptr
@@ -227,6 +200,7 @@ PTR
 #define REFERENCED   0x1000		// Symbol has been referenced
 #define EQUATED      0x0800		// Symbol was equated
 #define SDECLLIST    0x0400		// Symbol is on 'sdecl'-order list
+#define FLOAT        0x0200		// Symbol is a floating point value
 
 // Expression spaces, ORed with symbol and expression attributes above
 #define ABS          0x0000		// In absolute space
@@ -245,7 +219,7 @@ PTR
 #define SIZS         0x0020		// .s (FPU single precision real)
 #define SIZX         0x0040		// .x (FPU extended precision real)
 #define SIZP         0x0080		// .p (FPU pakced decimal real)
-#define SIZQ         SIZD
+#define SIZQ         0x0100		// .q
 
 // RISC register bank definitions (used in extended symbol attributes also)
 #define BANK_N       0x0000		// No register bank specified
@@ -256,12 +230,13 @@ PTR
 #define EQUATEDCC    0x0020
 #define UNDEF_CC     0x0040
 
-/* Construct binary constants at compile time
-Code by Tom Torfs */
+// Construct binary constants at compile time
+// Code by Tom Torfs
 
-/* Helper macros */
+// Helper macros
 #define HEX__(n) 0x##n##LU
-#define B8__(x) ((x&0x0000000FLU)?1:0) \
+#define B8__(x) \
+ ((x&0x0000000FLU)?1:0) \
 +((x&0x000000F0LU)?2:0) \
 +((x&0x00000F00LU)?4:0) \
 +((x&0x0000F000LU)?8:0) \
@@ -270,13 +245,12 @@ Code by Tom Torfs */
 +((x&0x0F000000LU)?64:0) \
 +((x&0xF0000000LU)?128:0)
 
-/* User macros */
-#define B8(d) ((unsigned char)B8__(HEX__(d)))
-#define B16(dmsb,dlsb) (((unsigned short)B8(dmsb)<<8) \
-+ B8(dlsb))
-#define B32(dmsb,db2,db3,dlsb) (((unsigned long)B8(dmsb)<<24) \
-+ ((unsigned long)B8(db2)<<16) \
-+ ((unsigned long)B8(db3)<<8) \
+// User macros
+#define B8(d) ((uint8_t)B8__(HEX__(d)))
+#define B16(dmsb,dlsb) (((uint16_t)B8(dmsb)<<8) + B8(dlsb))
+#define B32(dmsb,db2,db3,dlsb) (((uint32_t)B8(dmsb)<<24) \
++ ((uint32_t)B8(db2)<<16) \
++ ((uint32_t)B8(db3)<<8) \
 + B8(dlsb))
 
 // Optimisation defines