X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=f282460176f9cdd1ed547ffd38d310245a7567f9;hp=bba14d71b29bda02c06117f8e2831d10fe010877;hb=66b362fa203d0850e8dce8045adb454e354c22ce;hpb=f3c7d186a15b89c39e360b9cc89545a0d24bd6a4

diff --git a/rmac.h b/rmac.h
index bba14d7..f282460 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,7 +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 BYTESWAP64(x) (BYTESWAP32(x >> 32) | (BYTESWAP32(x & 0xFFFFFFFF) << 32))
 #define WORDSWAP32(x) ((((x) & 0x0000FFFF) << 16) | (((x) & 0xFFFF0000) >> 16))
 
 //
@@ -177,24 +182,20 @@ XEX, 				// COM/EXE/XEX/whatever a8 object format
 // Assembler token
 #define TOKEN	uint32_t
 
-// Token pointer type is a union because we have 64-bit sized tokens now :-P
-#define TOKENPTR union _tokenptr
-TOKENPTR
-{
-	uint32_t * u32;
-	uint64_t * u64;
-};
-
 // 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
-	TOKENPTR   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
@@ -272,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
 };
 
@@ -279,6 +284,7 @@ enum
 extern int verb_flag;
 extern int debug;
 extern int rgpu, rdsp;
+extern int robjproc;
 extern int dsp56001;
 extern int err_flag;
 extern int err_fd;
@@ -301,6 +307,7 @@ extern int activecpu;
 extern int activefpu;
 
 // Exported functions
+void strtoupper(char * s);
 char * fext(char *, char *, int);
 int nthpath(char *, int, char *);
 int ParseOptimization(char * optstring);