Slight revamp of the optimisation system, featuring: strengthened flag parser, slight...

[rmac] / rmac.h

diff --git a/rmac.h b/rmac.h
index 52fb92ddd355621645fe812b9f60a6839d74baa2..357d70e7babf507457bcb1c3356a68901946a806 100644 (file)
--- a/rmac.h
+++ b/rmac.h
@@ -153,6 +153,7 @@
 // Non-target specific stuff
 //
 #include <inttypes.h>
+#include <dirent.h>
 #include "symbol.h"
 
 #define BYTE         uint8_t
@@ -177,12 +178,12 @@
 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
+RAW,                           // Output at absolute address
 };
 
 // Assembler token
@@ -283,13 +284,14 @@ enum
        OPT_ABS_SHORT     = 0,
        OPT_MOVEL_MOVEQ   = 1,
        OPT_BSR_BCC_S     = 2,
-       OPT_INDIRECT_DISP = 3,
+       OPT_OUTER_DISP    = 3,
        OPT_LEA_ADDQ      = 4,
-       OPT_BASE_DISP     = 5,
+       OPT_020_DISP      = 5,          // 020+ base and outer displacements (bd, od) absolute long to short
        OPT_NULL_BRA      = 6,
        OPT_CLR_DX        = 7,
        OPT_ADDA_ADDQ     = 8,
        OPT_ADDA_LEA      = 9,
+       OPT_PC_RELATIVE   = 10,         // Enforce PC relative
        OPT_COUNT   // Dummy, used to count number of optimisation switches
 };
 
@@ -310,7 +312,7 @@ extern int m6502;
 extern int list_flag;
 extern int glob_flag;
 extern int lsym_flag;
-extern int sbra_flag;
+extern int optim_warn_flag;
 extern int obj_format;
 extern int legacy_flag;
 extern int prg_flag;   // 1 = write ".PRG" relocatable executable
@@ -318,6 +320,8 @@ extern LONG PRGFLAGS;
 extern int optim_flags[OPT_COUNT];
 extern int activecpu;
 extern int activefpu;
+extern uint32_t org68k_address;
+extern int org68k_active;
 
 // Exported functions
 void strtoupper(char * s);