X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=07d6ed162508b4dcf3f93b644ba5ebeab5d16e99;hp=d5775cc4f0e0e4a08f23d2fa0fdd05e0ebbc18d4;hb=9153334781cd2e23750f4dc002e847606c07a1f0;hpb=cfd001aea60f54e49d9beae0f941c513f45c202b

diff --git a/rmac.h b/rmac.h
index d5775cc..07d6ed1 100644
--- a/rmac.h
+++ b/rmac.h
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // RMAC.H - Main Application Code
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -19,7 +19,7 @@
 //
 // TARGET SPECIFIC BUILD SETTINGS
 //
-#if defined(WIN32) || defined (WIN64)
+#if defined(WIN32) || defined(WIN64)
 	#include <io.h>
 	#include <fcntl.h>
 	// Release platform - windows
@@ -27,6 +27,7 @@
 	#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
+
 	#ifdef _MSC_VER
 		#if _MSC_VER > 1000
 			#pragma warning(disable:4996)
@@ -58,8 +59,8 @@
 
 	#include <sys/fcntl.h>
 	#include <unistd.h>
-	// Release platform - mac OS-X or Linux
-	#define PLATFORM        "OSX/Linux"
+	// Release platform - Linux or mac OS-X
+	#define PLATFORM        "Linux/OSX"
 	#define _OPEN_FLAGS     O_TRUNC|O_CREAT|O_RDWR
 	#define _OPEN_INC       O_RDONLY
 	#define _PERM_MODE      S_IRUSR|S_IWUSR
@@ -76,7 +77,9 @@
 	// WARNING WARNING WARNING
 	#define DO_PRAGMA(x) _Pragma (#x)
 	#define WARNING(desc) DO_PRAGMA(message (#desc))
-#else
+
+	#else
+
 	// Release platform - not specified
 	#include <sys/fcntl.h>
 	#define PLATFORM        "Unknown"
@@ -87,8 +90,10 @@
 	#define DO_PRAGMA(x) _Pragma (#x)
 	#define WARNING(desc) DO_PRAGMA(message (#desc))
 	#endif
+
 #endif
 
+
 //
 // Endian related, for safe handling of endian-sensitive data
 // USAGE: GETBExx() is *always* an rvalue, a = pointer to a uint8_t,
@@ -135,6 +140,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 +159,6 @@
 #define SPACE        ' '		// ASCII space
 #define SLASHCHAR    '/'
 #define SLASHSTRING  "/"
-#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
@@ -163,22 +168,34 @@
 #define CREATMASK    0
 
 // 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
+};
+
+// Assembler token
+#define TOKEN	uint32_t
 
 // Pointer type that can point to (almost) anything
 #define PTR union _ptr
 PTR
 {
-	uint8_t * cp;				// Char
-	uint16_t * wp;				// WORD
-	uint32_t * lp;				// LONG
-	uint32_t lw;				// LONG
-	SYM ** sy;					// SYM
-	TOKEN * tk;					// TOKEN
+	uint8_t *  cp;				// Char pointer
+	uint16_t * wp;				// WORD pointer
+	uint32_t * lp;				// LONG pointer
+	uint32_t * u32;				// 32-bit pointer
+	uint64_t * u64;				// 64-bit pointer
+	uint32_t   lw;				// LONG (for some reason)
+	SYM **     sy;				// SYM pointer
+	TOKEN *    tk;				// TOKEN pointer
+	double *   dp;				// Double pointer
+	int64_t *  i64;				// 64-bit signed int pointer
 };
 
 // Symbol spaces
@@ -194,6 +211,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
@@ -208,11 +226,11 @@ PTR
 #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 SIZD         0x0010		// .d (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
+#define SIZQ         0x0100		// .q (quad word)
 
 // RISC register bank definitions (used in extended symbol attributes also)
 #define BANK_N       0x0000		// No register bank specified
@@ -255,6 +273,10 @@ enum
 	OPT_INDIRECT_DISP = 3,
 	OPT_LEA_ADDQ      = 4,
 	OPT_BASE_DISP     = 5,
+	OPT_NULL_BRA      = 6,
+	OPT_CLR_DX        = 7,
+	OPT_ADDA_ADDQ     = 8,
+	OPT_ADDA_LEA      = 9,
 	OPT_COUNT   // Dummy, used to count number of optimisation switches
 };