X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=39b8ae67a5dcca8d240f3b81816e475e6b7f8a6d;hp=f7b39e39b8d027ded9bf9b68da12dcd408fd7aa4;hb=02523045dcb28c8f6ad794a84e32beff214be424;hpb=917bfc1503181b7e762b73b9560bb834c12c64fa

diff --git a/rmac.h b/rmac.h
index f7b39e3..39b8ae6 100644
--- a/rmac.h
+++ b/rmac.h
@@ -9,10 +9,19 @@
 #ifndef __RMAC_H__
 #define __RMAC_H__
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 //
 // TARGET SPECIFIC BUILD SETTINGS
 //
 #if defined(WIN32) || defined (WIN64)
+	#include <io.h>
+	#include <fcntl.h>
 	// Release platform - windows
 	#define PLATFORM        "Win32"
 	#define _OPEN_FLAGS     _O_TRUNC|_O_CREAT|_O_BINARY|_O_RDWR
@@ -38,51 +47,32 @@
 	//this is probably going to explode spectacularly. Let's wait for the fireworks!
 	#define DO_PRAGMA(x) _Pragma (#x)
 	#define WARNING(desc) DO_PRAGMA(message (#desc))
+	#define inline __inline
 
 	#endif
-	#include <io.h>
-	#include <fcntl.h>
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include <ctype.h>
-	#include <sys/types.h>
-	#include <sys/stat.h>
 
 #else 
 	#ifdef __GCCUNIX__
+	#include <sys/fcntl.h>
+	#include <unistd.h>
 	// 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_IREAD|S_IWRITE 
+	#define _PERM_MODE      S_IRUSR|S_IWUSR
 	// WARNING WARNING WARNING
 	#define DO_PRAGMA(x) _Pragma (#x)
 	#define WARNING(desc) DO_PRAGMA(message (#desc))
-	#include <sys/fcntl.h>
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include <ctype.h>
-	#include <sys/types.h>
-	#include <sys/stat.h>
-	#include <unistd.h>
 #else
 	// Release platform - not specified 
+	#include <sys/fcntl.h>
 	#define PLATFORM        "Unknown"
 	#define _OPEN_FLAGS     O_TRUNC|O_CREAT|O_RDWR
 	#define _OPEN_INC       O_RDONLY
-	#define _PERM_MODE      S_IREAD|S_IWRITE 
-	// Defined here, even though the platfrom may not support it...
+	#define _PERM_MODE      S_IREAD|S_IWRITE
+	// Defined here, even though the platform may not support it...
 	#define DO_PRAGMA(x) _Pragma (#x)
 	#define WARNING(desc) DO_PRAGMA(message (#desc))
-	#include <sys/fcntl.h>
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include <ctype.h>
-	#include <sys/types.h>
-	#include <sys/stat.h>
 	#endif
 #endif
 
@@ -194,6 +184,16 @@ PTR
 
 //#define RISCSYM      0x00010000
 
+// Optimisation defines
+enum
+{
+	OPT_ABS_SHORT       = 0,
+	OPT_MOVEL_MOVEQ     = 1,
+	OPT_BSR_BCC_S       = 2,
+	OPT_INDIRECT_DISP   = 3,
+	OPT_COUNT   // Dummy, used to count number of optimisation switches
+};
+
 // Globals, externals, etc.
 extern int verb_flag;
 extern int debug;
@@ -211,7 +211,7 @@ extern int sbra_flag;
 extern int obj_format;
 extern int legacy_flag;
 extern LONG PRGFLAGS;
-extern int optim_flag;
+extern int optim_flags[OPT_COUNT];
 
 // Exported functions
 char * fext(char *, char *, int);