X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=48317499ddf7114a71efdf67555b736a25b20ac6;hp=0519dc2f71bdedfc3d7b56d9ffcf281917728487;hb=29b32d134bc12831a8ddd098bf9aeeda26dcfe7c;hpb=eace4e1b294ccec54a5c476619f616f5da0bf8a9

diff --git a/rmac.h b/rmac.h
index 0519dc2..4831749 100644
--- a/rmac.h
+++ b/rmac.h
@@ -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))
 
 //
@@ -189,6 +194,8 @@ PTR
 	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
@@ -266,6 +273,8 @@ enum
 	OPT_INDIRECT_DISP = 3,
 	OPT_LEA_ADDQ      = 4,
 	OPT_BASE_DISP     = 5,
+	OPT_NULL_BRA      = 6,
+	OPT_CLR_DX        = 7,
 	OPT_COUNT   // Dummy, used to count number of optimisation switches
 };