X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rln;a=blobdiff_plain;f=rln.h;h=ac7e20a9ca2d4b99adf314aac18fc13c227cd25b;hp=aa89ea2752efb5d982f006027b7771c0114d5d78;hb=fd9ba5f319362722d3483da67d987c38cd4b59b7;hpb=cf65d78a03ee8ad1d7d244afb5b1378504fd6f55

diff --git a/rln.h b/rln.h
index aa89ea2..ac7e20a 100644
--- a/rln.h
+++ b/rln.h
@@ -1,17 +1,11 @@
 //
-// RLN - Reboot's Linker for the Atari Jaguar Console System
-// RLN.H - Application Header
-// Copyright (C) 199x Allan K. Pratt, 2011 Reboot & Friends
+// RLN - Reboot's Linker for the Atari Jaguar console system
+// Copyright (C) 199x Allan K. Pratt, 2011-2018 Reboot & Friends
 //
 
 #ifndef __RLN_H__
 #define __RLN_H__
 
-// Required Include Files
-
-// Macro Definitions
-
-// Requirements for Windows Compilation
 
 #ifdef WIN32
 //#define _OPEN_FLAGS  _O_BINARY|_O_RDWR
@@ -33,8 +27,6 @@
 #include <setjmp.h>
 #endif
 
-// Requirements for Mac OS-X or Linux Compilation
-
 #ifdef __GCCUNIX__
 //#define _OPEN_FLAGS  O_RDWR
 #define _OPEN_FLAGS  O_RDONLY
@@ -51,7 +43,7 @@
 #endif
 
 #define MAJOR   1			// Major version number
-#define MINOR   4			// Minor version number
+#define MINOR   6			// Minor version number
 #define PATCH   2			// Patch release number
 
 #ifdef WIN32
@@ -98,22 +90,22 @@ struct OHEADER
 	uint32_t bsize;
 	uint32_t ssize;
 	union {
-		struct {					// For .o 
+		struct {					// For .o
 			uint32_t tsize;			// Text relocation size
 			uint32_t dsize;			// Data relocation size
 			uint8_t reserved[12];
 		} reloc;
-		struct {					// For .abs 
-			uint32_t stksize;		// Unused 
-			uint32_t tstart;		// Start of TEXT 
-			uint32_t rbflag;		// -1 if no fixups at all 
-			uint32_t dstart;		// Start of DATA 
+		struct {					// For .abs
+			uint32_t stksize;		// Unused
+			uint32_t tstart;		// Start of TEXT
+			uint32_t rbflag;		// -1 if no fixups at all
+			uint32_t dstart;		// Start of DATA
 			uint32_t bstart;		// Start of BSS
 		} abs;
 	} absrel;
-	uint8_t * ostbase;				// Base of output symbol table 
+	uint8_t * ostbase;				// Base of output symbol table
 	uint32_t fsize;					// Length of fixups
-	uint8_t * fixups;				// Start of fixups 
+	uint8_t * fixups;				// Start of fixups
 };
 
 #define new_oheader()   (struct OHEADER *)malloc(sizeof(struct OHEADER))
@@ -126,7 +118,7 @@ struct ARHEADER
 	uint8_t a_gid;
 	uint16_t a_fimode;
 	uint32_t a_fsize;
-	uint16_t reserved;				// Two bytes zeroes btwn header & file 
+	uint16_t reserved;				// Two bytes zeroes btwn header & file
 };
 
 #define new_arheader()  (struct ARHEADER *)malloc(sizeof(struct ARHEADER))
@@ -146,7 +138,10 @@ struct OFILE
 	struct OHEADER o_header;			// Header of this file
 	uint8_t * o_image;					// Image of this file
 	uint8_t isArchiveFile;				// Temporary extra flag
-	uint32_t segSize[3];				// Size of TEXT, DATA & BSS
+//These are likely redundant, and can probably be removed with judicious
+//editing of where they are used (in favor of OHEADER vars)
+	uint32_t segSize[3];				// Size of TEXT, DATA & BSS (aligned)
+	uint32_t segBase[3];				// Accumulated base address of TDB
 };
 
 #define new_ofile()  (struct OFILE *)malloc(sizeof(struct OFILE))
@@ -154,6 +149,7 @@ struct OFILE
 // Flags in an Object File's o_flags field
 // O_USED: means this ofile is used or is on the command line or in a -x
 #define O_USED       0x0001
+// N.B.: This is *never* set anywhere in the linker code...
 #define O_ARCHIVE    0x0002			// This is a dummy archive entry
 
 // Symbol Record
@@ -166,7 +162,7 @@ struct OFILE
 
 struct SYMREC
 {
-	uint8_t s_name[SYMLEN];			// Including null terminator 
+	uint8_t s_name[SYMLEN];			// Including null terminator
 	uint16_t s_type;
 	uint32_t s_value;
 	struct SYMREC * s_next;