Fix a small buglet in the last patch. :-)

[rmac] / rmac.h

diff --git a/rmac.h b/rmac.h
index cd7d671f01a9201774e428a0a7a0af0aa5ed2853..3d23ed55573b8c73554f5aeb0bc78f656a500f51 100644 (file)
--- 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
@@ -315,8 +317,11 @@ extern int legacy_flag;
 extern int prg_flag;   // 1 = write ".PRG" relocatable executable
 extern LONG PRGFLAGS;
 extern int optim_flags[OPT_COUNT];
+extern int optim_pc;
 extern int activecpu;
 extern int activefpu;
+extern uint32_t org68k_address;
+extern int org68k_active;
 
 // Exported functions
 void strtoupper(char * s);