X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=357d70e7babf507457bcb1c3356a68901946a806;hp=cd7d671f01a9201774e428a0a7a0af0aa5ed2853;hb=821279dcb7b5d069d175767edcd413b833b0cae3;hpb=29fa5dcf504b966803063a1c2891f58f97126d04

diff --git a/rmac.h b/rmac.h
index cd7d671..357d70e 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-2019 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -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
@@ -218,6 +219,7 @@ PTR
 #define EQUATED      0x0800		// Symbol was equated
 #define SDECLLIST    0x0400		// Symbol is on 'sdecl'-order list
 #define FLOAT        0x0200		// Symbol is a floating point value
+#define RISCREG      0x0100		// Symbol is a RISC register
 
 // Expression spaces, ORed with symbol and expression attributes above
 #define ABS          0x0000		// In absolute space
@@ -282,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
 };
 
@@ -309,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
@@ -317,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);