Multiple fixes for 020+ mode, including:

[rmac] / object.c

diff --git a/object.c b/object.c
index cbedaab6b0b2cdf5907af53d377a42cb4dc5b8ab..bc3ae229b098035599c0e1518f1e6ad72cfbad75 100644 (file)
--- a/object.c
+++ b/object.c
@@ -1,19 +1,19 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // OBJECT.C - Writing Object Files
-// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
 
 #include "object.h"
+#include "6502.h"
 #include "error.h"
 #include "mark.h"
 #include "riscasm.h"
 #include "sect.h"
 #include "symbol.h"
 
-
 //#define DEBUG_ELF
 
 uint32_t symsize = 0;                  // Size of BSD/ELF symbol table
@@ -57,7 +57,7 @@ See left.             4 & 5   If these bits are set to 0 (PF_PRIVATE), the processes'
 
 
 //
-// Add entry to symbol table
+// Add entry to symbol table (in ALCYON mode)
 // If 'globflag' is 1, make the symbol global
 // If in .PRG mode, adjust symbol values for fake link
 //
@@ -752,6 +752,11 @@ for(int j=0; j<i; j++)
                        free(strtable);
                }
        }
+       else if (obj_format == XEX)
+       {
+               // Just write the object file
+               m6502obj(fd);
+       }
 
        return 0;
 }