X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=2b71ac7cdfce1c7d7259f53138a50bc243c4bc72;hp=4a4e8b92b97c7b6ed6bd205ec6e773fdfeae753d;hb=5cd8a4814b805f1ef8ce689423eb5eeba12573c5;hpb=2d302cb8c260f92984efbe9b6c8f9871beebeca5

diff --git a/rmac.h b/rmac.h
index 4a4e8b9..2b71ac7 100644
--- a/rmac.h
+++ b/rmac.h
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // RMAC.H - Main Application Code
-// Copyright (C) 199x Landon Dyer, 2011 Reboot & Friends
+// Copyright (C) 199x Landon Dyer, 2017 Reboot & Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -26,7 +26,7 @@
 	#define PLATFORM        "Win32"
 	#define _OPEN_FLAGS     _O_TRUNC|_O_CREAT|_O_BINARY|_O_RDWR
 	#define _OPEN_INC       _O_RDONLY|_O_BINARY
-	#define _PERM_MODE      _S_IREAD|_S_IWRITE 
+	#define _PERM_MODE      _S_IREAD|_S_IWRITE
 	#ifdef _MSC_VER
 		#if _MSC_VER > 1000
 			#pragma warning(disable:4996)
@@ -36,6 +36,7 @@
 	#define STRINGIZE_HELPER(x) #x
 	#define STRINGIZE(x) STRINGIZE_HELPER(x)
 	#define WARNING(desc) __pragma(message(__FILE__ "(" STRINGIZE(__LINE__) ") : Warning: " #desc))
+	#define inline __inline
 
 	// usage:
 	// WARNING(FIXME: Code removed because...)
@@ -48,24 +49,35 @@
 	// for the fireworks!
 	#define DO_PRAGMA(x) _Pragma (#x)
 	#define WARNING(desc) DO_PRAGMA(message (#desc))
-	#define inline __inline
 
 	#endif
 
-#else 
+#else
+
 	#ifdef __GCCUNIX__
+
 	#include <sys/fcntl.h>
 	#include <unistd.h>
-	// Release platform - mac OS-X or linux
+	// Release platform - mac OS-X or Linux
 	#define PLATFORM        "OSX/Linux"
 	#define _OPEN_FLAGS     O_TRUNC|O_CREAT|O_RDWR
 	#define _OPEN_INC       O_RDONLY
 	#define _PERM_MODE      S_IRUSR|S_IWUSR
+
+	#ifdef __MINGW32__
+	#define off64_t long
+	#define off_t long
+	#undef _OPEN_FLAGS
+	#undef _OPEN_INC
+	#define _OPEN_FLAGS     _O_TRUNC|_O_CREAT|_O_BINARY|_O_RDWR
+	#define _OPEN_INC       O_RDONLY|_O_BINARY
+	#endif
+
 	// WARNING WARNING WARNING
 	#define DO_PRAGMA(x) _Pragma (#x)
 	#define WARNING(desc) DO_PRAGMA(message (#desc))
 #else
-	// Release platform - not specified 
+	// Release platform - not specified
 	#include <sys/fcntl.h>
 	#define PLATFORM        "Unknown"
 	#define _OPEN_FLAGS     O_TRUNC|O_CREAT|O_RDWR
@@ -77,6 +89,54 @@
 	#endif
 #endif
 
+//
+// Endian related, for safe handling of endian-sensitive data
+// USAGE: GETBExx() is *always* an rvalue, a = pointer to a uint8_t,
+//        r = offset from 0. SETBExx(), v = value to write into 'a'
+//
+#define GETBE16(a, r) \
+	(((uint16_t)(a)[(r + 0)] << 8) | ((uint16_t)(a)[(r + 1)]))
+
+#define GETBE32(a, r) \
+	(((uint32_t)(a)[(r + 0)] << 24) | ((uint32_t)(a)[(r + 1)] << 16) \
+	| ((uint32_t)(a)[(r + 2)] << 8) | ((uint32_t)(a)[(r + 3)]))
+
+#define GETBE64(a, r) \
+	(((uint64_t)(a)[(r + 0)] << 56) | ((uint64_t)(a)[(r + 1)] << 48) \
+	| ((uint64_t)(a)[(r + 2)] << 40) | ((uint64_t)(a)[(r + 3)] << 32) \
+	| ((uint64_t)(a)[(r + 4)] << 24) | ((uint64_t)(a)[(r + 5)] << 16) \
+	| ((uint64_t)(a)[(r + 6)] << 8) | ((uint64_t)(a)[(r + 7)]))
+
+#define SETBE16(a, r, v) \
+	{ (a)[(r + 0)] = (uint8_t)((v) >> 8); \
+	(a)[(r + 1)] = (uint8_t)((v) & 0xFF); }
+
+#define SETBE32(a, r, v) \
+	{ (a)[(r + 0)] = (uint8_t)((v) >> 24); \
+	(a)[(r + 1)] = (uint8_t)(((v) >> 16) & 0xFF); \
+	(a)[(r + 2)] = (uint8_t)(((v) >> 8) & 0xFF); \
+	(a)[(r + 3)] = (uint8_t)((v) & 0xFF); }
+
+#define SETBE64(a, r, v) \
+	{ (a)[(r + 0)] = (uint8_t)((v) >> 56); \
+	(a)[(r + 1)] = (uint8_t)(((v) >> 48) & 0xFF); \
+	(a)[(r + 2)] = (uint8_t)(((v) >> 40) & 0xFF); \
+	(a)[(r + 3)] = (uint8_t)(((v) >> 32) & 0xFF); \
+	(a)[(r + 4)] = (uint8_t)(((v) >> 24) & 0xFF); \
+	(a)[(r + 5)] = (uint8_t)(((v) >> 16) & 0xFF); \
+	(a)[(r + 6)] = (uint8_t)(((v) >> 8) & 0xFF); \
+	(a)[(r + 7)] = (uint8_t)((v) & 0xFF); }
+
+// In 6502 mode, turns out we need this:
+#define SETLE16(a, r, v) \
+	{ (a)[(r + 0)] = (uint8_t)((v) & 0xFF); \
+	(a)[(r + 1)] = (uint8_t)((v) >> 8); }
+
+// 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 WORDSWAP32(x) ((((x) & 0x0000FFFF) << 16) | (((x) & 0xFFFF0000) >> 16))
+
 //
 // Non-target specific stuff
 //
@@ -90,11 +150,11 @@
 
 #define ERROR        (-1)			// Generic error return
 #define EOS          '\0'			// End of string
-#define SPACE        ' '			// ASCII space 
+#define SPACE        ' '			// ASCII space
 #define SLASHCHAR    '/'
 #define SLASHSTRING  "/"
-#define VALUE        LONG			// Assembler value
-#define TOKEN        LONG			// Assembler token
+#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
 #define DEBUG        if (debug)		// Debug conditional
@@ -108,6 +168,7 @@
 #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)
@@ -127,21 +188,28 @@
 #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
 
 // Pointer type that can point to (almost) anything
 #define PTR union _ptr
 PTR
 {
-   char * cp;						// Char
-   WORD * wp;						// WORD
-   LONG * lp;						// LONG
-   LONG lw;							// LONG
+   uint8_t * cp;					// Char
+   uint16_t * wp;					// WORD
+   uint32_t * lp;					// LONG
+   uint32_t lw;						// LONG
    SYM ** sy;						// SYM
    TOKEN * tk;						// TOKEN
 };
@@ -165,14 +233,19 @@ PTR
 #define TEXT         0x0001			// Relative to text
 #define DATA         0x0002			// Relative to data
 #define BSS          0x0004			// Relative to BSS
-//#define M6502        0x0008		// 6502/microprocessor (absolute)
+#define M6502        0x0008			// 6502/microprocessor (absolute)
 #define TDB          (TEXT|DATA|BSS)	// Mask for text+data+bss
 
-// Sizes 
-#define SIZB         0x0001			// .b 
-#define SIZW         0x0002			// .w 
-#define SIZL         0x0004			// .l 
+// Sizes
+#define SIZB         0x0001			// .b
+#define SIZW         0x0002			// .w
+#define SIZL         0x0004			// .l
 #define SIZN         0x0008			// no .(size) specifier
+#define SIZD         0x0010         // .d (quad word or FPU double precision real)
+#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
 
 // RISC register bank definitions (used in extended symbol attributes also)
 #define BANK_N       0x0000			// No register bank specified
@@ -183,34 +256,61 @@ PTR
 #define EQUATEDCC    0x0020
 #define UNDEF_CC     0x0040
 
-//#define RISCSYM      0x00010000
+/* Construct binary constants at compile time
+Code by Tom Torfs */
+
+/* Helper macros */
+#define HEX__(n) 0x##n##LU
+#define B8__(x) ((x&0x0000000FLU)?1:0) \
++((x&0x000000F0LU)?2:0) \
++((x&0x00000F00LU)?4:0) \
++((x&0x0000F000LU)?8:0) \
++((x&0x000F0000LU)?16:0) \
++((x&0x00F00000LU)?32:0) \
++((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) \
++ B8(dlsb))
 
 // Optimisation defines
 enum
 {
-	OPT_ABS_SHORT       = 0,
-	OPT_MOVEL_MOVEQ     = 1,
-	OPT_BSR_BCC_S       = 2,
-	OPT_INDIRECT_DISP   = 3,
+	OPT_ABS_SHORT     = 0,
+	OPT_MOVEL_MOVEQ   = 1,
+	OPT_BSR_BCC_S     = 2,
+	OPT_INDIRECT_DISP = 3,
+    OPT_LEA_ADDQ        = 4,
+    OPT_BASE_DISP       = 5,
 	OPT_COUNT   // Dummy, used to count number of optimisation switches
 };
 
-// Globals, externals, etc.
+// Exported variables
 extern int verb_flag;
 extern int debug;
 extern int rgpu, rdsp;
+extern int dsp56001;
 extern int err_flag;
 extern int err_fd;
 extern int regbank;
 extern char * firstfname;
 extern int list_fd;
+extern int list_pag;
 extern int as68_flag;
+extern int m6502;
 extern int list_flag;
 extern int glob_flag;
 extern int lsym_flag;
 extern int sbra_flag;
 extern int obj_format;
 extern int legacy_flag;
+extern int prg_flag;	// 1 = write ".PRG" relocatable executable
 extern LONG PRGFLAGS;
 extern int optim_flags[OPT_COUNT];