X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rln;a=blobdiff_plain;f=rln.c;h=5b3323255551eccfde37216b5e8ce06998fbf5fc;hp=219697c5eb905fd0459cd0044475cd101a509b00;hb=9ab479822c5e31c7cee4cad1496b562b42ee374b;hpb=1614b4cc590514679e0b358e424e168c6e430b02

diff --git a/rln.c b/rln.c
index 219697c..5b33232 100644
--- a/rln.c
+++ b/rln.c
@@ -1,7 +1,6 @@
 //
-// RLN - Reboot's Linker for the Atari Jaguar Console System
-// RLN.C - Application Code
-// Copyright (C) 199x, Allan K. Pratt, 2014 Reboot & Friends
+// RLN - Reboot's Linker for the Atari Jaguar console system
+// Copyright (C) 199x, Allan K. Pratt, 2014-2015 Reboot & Friends
 //
 
 #include "rln.h"
@@ -34,9 +33,7 @@ unsigned dataoffset = 0;			// COF DATA segment offset
 unsigned bssoffset = 0;				// COF BSS segment offset
 unsigned displaybanner = 1;			// Display version banner
 unsigned symoffset = 0;				// Symbol table offset in output file
-unsigned dosymi = 0;				// Dosym() processing iterator
 unsigned dbgsymbase = 0;			// Debug symbol base address
-//unsigned symtrunc = 0;			// Symbol truncation -i and -ii
 int noheaderflag = 0;				// No header flag for ABS files
 int hflags;							// Value of the arg to -h option
 int ttype, dtype, btype;			// Type flag: 0, -1, -2, -3, -4
@@ -54,9 +51,6 @@ struct OFILE * plist = NULL;		// Object image list pointer
 struct OFILE * plast;				// Last object image list pointer
 struct OFILE * olist = NULL;		// Pointer to first object file in list
 struct OFILE * olast;				// Pointer to last object file in list
-char obj_fname[16384][FNLEN];		// Object file names
-unsigned obj_segsize[16384][3];		// Object file seg sizes; TEXT,DATA,BSS
-unsigned obj_index = 0;				// Object file index/count
 char * arPtr[512];
 uint32_t arIndex = 0;
 struct HREC * htable[NBUCKETS];		// Hash table
@@ -68,52 +62,30 @@ char * oststr;						// Output string table
 char * oststr_ptr;					// Output string table; current pointer
 char * oststr_end;					// Output string table; end pointer
 int ost_index = 0;					// Index of next ost addition
-int endian;							// Processor endianess
 uint8_t nullStr[1] = "\x00";		// Empty string
 struct HREC * arSymbol = NULL;		// Pointer to AR symbol table
 
-// Some human readable defines for endianess
-#define ENDIANNESS_BIG     1
-#define ENDIANNESS_LITTLE  0
 
 // Function prototypes
 struct HREC * LookupHREC(char *);
-char * path_tail(char *);
-void display_help(void);
-void display_version(void);
+char * PathTail(char *);
+void ShowHelp(void);
+void ShowVersion(void);
 
 
 //
 // Get a long word from memory
 //
-uint32_t getlong(uint8_t * src)
+static inline uint32_t GetLong(uint8_t * src)
 {
-	uint32_t temp;
-	uint8_t * out = (uint8_t *)&temp;
-
-	if (endian == ENDIANNESS_BIG)
-	{
-		*out++ = src[0];
-		*out++ = src[1];
-		*out++ = src[2];
-		*out = src[3];
-	}
-	else
-	{
-		*out++ = src[3];
-		*out++ = src[2];
-		*out++ = src[1];
-		*out = src[0];
-	}
-
-	return temp;
+	return (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3];
 }
 
 
 //
 // Put a long word into memory
 //
-void putlong(uint8_t * dest, uint32_t val)
+static inline void PutLong(uint8_t * dest, uint32_t val)
 {
 	*dest++ = (uint8_t)(val >> 24);
 	*dest++ = (uint8_t)(val >> 16);
@@ -125,30 +97,16 @@ void putlong(uint8_t * dest, uint32_t val)
 //
 // Get a word from memory
 //
-uint16_t getword(uint8_t * src)
+static inline uint16_t GetWord(uint8_t * src)
 {
-	uint16_t temp;
-	uint8_t * out = (uint8_t *)&temp;
-
-	if (endian == ENDIANNESS_BIG)
-	{
-		out[0] = src[0];
-		out[1] = src[1];
-	}
-	else
-	{
-		out[0] = src[1];
-		out[1] = src[0];
-	}
-
-	return temp;
+	return (src[0] << 8) | src[1];
 }
 
 
 //
 // Put a word into memory
 //
-void putword(uint8_t * dest, uint16_t val)
+static inline void PutWord(uint8_t * dest, uint16_t val)
 {
 	*dest++ = (uint8_t)(val >> 8);
 	*dest = (uint8_t)val;
@@ -179,7 +137,7 @@ int DoSymbols(struct OFILE * ofile)
 	int index;
 	int j;
 	struct HREC * hptr;
-	unsigned tsoSave, dsoSave, bsoSave;
+	uint32_t tsoSave, dsoSave, bsoSave;
 
 	// Point to first symbol record in the object file
 	char * symptr = (ofile->o_image + 32
@@ -191,33 +149,9 @@ int DoSymbols(struct OFILE * ofile)
 	// Point to end of symbol record in the object file
 	char * symend = symptr + ofile->o_header.ssize;
 
-	// Search through object segment size table to accumulated segment sizes to
-	// ensure the correct offsets are used in the resulting COF file.
-	int ssidx = -1;
-	unsigned tsegoffset = 0, dsegoffset = 0, bsegoffset = 0;
-
-	// Search for object file name
-	for(j=0; j<(int)obj_index; j++)
-	{
-		if (!strcmp(ofile->o_name, obj_fname[j]))
-		{
-			// Object file name found
-			ssidx = j;
-			break;
-		}
-
-		// Accumulate segment sizes
-		tsegoffset += obj_segsize[j][0];
-		dsegoffset += obj_segsize[j][1];
-		bsegoffset += obj_segsize[j][2];
-	}
-
-	if (ssidx == -1)
-	{
-		printf("DoSymbols(): Object file missing from obj_fname: %s\n",
-			ofile->o_name);
-		return 1;
-	}
+	uint32_t tsegoffset = ofile->segBase[TEXT];
+	uint32_t dsegoffset = ofile->segBase[DATA];
+	uint32_t bsegoffset = ofile->segBase[BSS];
 
 	// Save segment vars, so we can restore them if needed
 	tsoSave = tsegoffset, dsoSave = dsegoffset, bsoSave = bsegoffset;
@@ -225,9 +159,9 @@ int DoSymbols(struct OFILE * ofile)
 	// Process each record in the object's symbol table
 	for(; symptr!=symend; symptr+=12)
 	{
-		index = getlong(symptr + 0);	// Obtain symbol string index
-		type  = getlong(symptr + 4);	// Obtain symbol type
-		value = getlong(symptr + 8);	// Obtain symbol value
+		index = GetLong(symptr + 0);	// Obtain symbol string index
+		type  = GetLong(symptr + 4);	// Obtain symbol type
+		value = GetLong(symptr + 8);	// Obtain symbol value
 
 		// Global/External symbols have a pre-processing stage
 		// N.B.: This destroys the t/d/bsegoffset discovered above. So if a
@@ -251,49 +185,24 @@ int DoSymbols(struct OFILE * ofile)
 					return 1;
 				}
 
+				if (vflag > 1)
+					printf("DoSymbols(): Skipping symbol '%s' (%s) found in OST...\n", symend + index, ofile->o_name);
+
 				// If the symbol is not in any .a or .o units, it must be one
 				// of the injected ones (_TEXT_E, _DATA_E, or _BSS_E), so skip
-				// it
+				// it [or maybe not? In verbose mode, we see nothing...!]
 				continue;
 			}
 
-			// Search through object segment size table to obtain segment sizes
-			// for the object that has the required external/global as a local
-			// symbol. As each object is interrogated the segment sizes are
-			// accumulated to ensure the correct offsets are used in the
-			// resulting COF file. This is effectively 'done again' only as we
-			// are working with a different object file.
-			ssidx = -1;
-			tsegoffset = dsegoffset = bsegoffset = 0;
-
-			// Search for object filename
-			for(j=0; j<(int)obj_index; j++)
-			{
-				if (!strcmp(hptr->h_ofile->o_name, obj_fname[j]))
-				{
-					ssidx = j;	// Symbol object filename
-					break;
-				}
-
-				// Accumulate segment sizes
-				tsegoffset += obj_segsize[j][0];
-				dsegoffset += obj_segsize[j][1];
-				bsegoffset += obj_segsize[j][2];
-			}
-
-			if (ssidx == -1)
-			{
-				printf("DoSymbols(): Object file missing from obj_fname: '%s:%s' symbol: '%s' (%s)\n",
-					hptr->h_ofile->o_name, hptr->h_ofile->o_arname,
-					symend + index, ofile->o_name);
-				return 1;
-			}
+			tsegoffset = hptr->h_ofile->segBase[TEXT];
+			dsegoffset = hptr->h_ofile->segBase[DATA];
+			bsegoffset = hptr->h_ofile->segBase[BSS];
 
 			// Update type with global type
 			type = hptr->h_type;
 
-			// Remove external flag if absolute
-			if (type == (T_EXT | T_ABS))
+			// Remove global flag if absolute
+			if (type == (T_GLBL | T_ABS))
 				type = T_ABS;
 
 			// If the global/external has a value then update that value in
@@ -315,6 +224,9 @@ int DoSymbols(struct OFILE * ofile)
 						- (hptr->h_ofile->o_header.tsize
 						+ hptr->h_ofile->o_header.dsize);
 					break;
+				default:
+					if (vflag > 1)
+						printf("DoSymbols: No adjustment made for symbol: %s (%s) = %X\n", symend + index, ofile->o_name, hptr->h_value);
 				}
 			}
 		}
@@ -324,15 +236,19 @@ int DoSymbols(struct OFILE * ofile)
 
 		// Process and update the value dependent on whether the symbol is a
 		// debug symbol or not
-		// N.B.: These are currently not supported
+		// N.B.: Debug symbols are currently not supported
 		if (type & 0xF0000000)
 		{
 			// DEBUG SYMBOL
 			// Set the correct debug symbol base address (TEXT segment)
+#if 0
 			dbgsymbase = 0;
 
 			for(j=0; (unsigned)j<dosymi; j++)
 				dbgsymbase += obj_segsize[j][0];
+#else
+			dbgsymbase = ofile->segBase[TEXT];
+#endif
 
 			switch (type & 0xFF000000)
 			{
@@ -347,7 +263,7 @@ int DoSymbols(struct OFILE * ofile)
 				break;
 			}
 
-			putlong(symptr + 8, value);
+			PutLong(symptr + 8, value);
 		}
 		else
 		{
@@ -361,26 +277,26 @@ int DoSymbols(struct OFILE * ofile)
 				break;
 			case T_TEXT:
 				value = tbase + tsegoffset + value;
-				putlong(symptr + 8, value);
+				PutLong(symptr + 8, value);
 				break;
 			case T_DATA:
-				if (type & T_EXT)
+				if (type & T_GLBL)
 					value = dbase + dsegoffset + value;
 				else
 					value = dbase + dsegoffset + (value
 						- ofile->o_header.tsize);
 
-				putlong(symptr + 8, value);
+				PutLong(symptr + 8, value);
 				break;
 			case T_BSS:
-				if (type & T_EXT)
+				if (type & T_GLBL)
 					value = bbase + bsegoffset + value;
 				else
 					value = bbase + bsegoffset
 						+ (value - (ofile->o_header.tsize
 						+ ofile->o_header.dsize));
 
-				putlong(symptr + 8, value);
+				PutLong(symptr + 8, value);
 				break;
 			default:
 				break;
@@ -390,6 +306,9 @@ int DoSymbols(struct OFILE * ofile)
 		// Add to output symbol table if global/extern, or local flag is set
 		if (isglobal(type) || lflag)
 		{
+			if (vflag > 1)
+				printf("DoSymbols: Adding symbol: %s (%s) to OST...\n", symend + index, ofile->o_name);
+
 			index = OSTAdd(symend + index, type, value);
 
 			if (index == -1)
@@ -400,9 +319,6 @@ int DoSymbols(struct OFILE * ofile)
 		}
 	}
 
-	// Increment dosymi processsing
-	dosymi++;
-
 	return 0;
 }
 
@@ -434,6 +350,10 @@ void FreeHashes(void)
 //  but then again, we see this in the header:
 //  #define T_COMMON  (T_GLOBAL | T_EXTERN) but that could be just bullshit.]
 //
+// Common symbols have a different number in the "value" field of the symbol
+// table (!0) than purely external symbols do (0). So you have to look at the
+// type (T_GLBL) *and* the value to determine if it's a common symbol.
+//
 long DoCommon(void)
 {
 	struct HREC * hptr;
@@ -451,7 +371,7 @@ long DoCommon(void)
 //	continue;
 
 //Is this true? Couldn't an absolute be exported???
-				if (hptr->h_type == (T_EXT | T_ABS))
+				if (hptr->h_type == (T_GLBL | T_ABS))
 					hptr->h_type = T_ABS;	// Absolutes *can't* be externals
 
 				if (OSTAdd(hptr->h_sym, hptr->h_type, hptr->h_value) == -1)
@@ -495,9 +415,9 @@ int OSTAdd(char * name, int type, long value)
 		ost_ptr = ost;						// Set OST start pointer
 		ost_end = ost + OST_BLOCK;			// Set OST end pointer
 
-		putlong(oststr, 0x00000004);		// Just null long for now
+		PutLong(oststr, 0x00000004);		// Just null long for now
 		oststr_ptr = oststr + 4;			// Skip size of str table long (incl null long)
-		putlong(oststr_ptr, 0x00000000);	// Null terminating long
+		PutLong(oststr_ptr, 0x00000000);	// Null terminating long
 		oststr_end = oststr + OST_BLOCK;
 	}
 	else
@@ -562,12 +482,12 @@ int OSTAdd(char * name, int type, long value)
 		|| (ostresult == -1))
 	{
 		if ((type & 0xF0000000) == 0x40000000)
-			putlong(ost_ptr, 0x00000000);	// Zero string table offset for dbg line
+			PutLong(ost_ptr, 0x00000000);	// Zero string table offset for dbg line
 		else
-			putlong(ost_ptr, (oststr_ptr - oststr));	// String table offset of symbol string
+			PutLong(ost_ptr, (oststr_ptr - oststr));	// String table offset of symbol string
 
-		putlong(ost_ptr + 4, type);
-		putlong(ost_ptr + 8, value);
+		PutLong(ost_ptr + 4, type);
+		PutLong(ost_ptr + 8, value);
 		ost_ptr += 12;
 
 		// If the symbol type is anything but a debug line information
@@ -577,14 +497,12 @@ int OSTAdd(char * name, int type, long value)
 			strcpy(oststr_ptr, name);		// Put symbol name in string table
 			*(oststr_ptr + slen) = '\0';	// Add null terminating character
 			oststr_ptr += (slen + 1);
-			putlong(oststr_ptr, 0x00000000);	// Null terminating long
-			putlong(oststr, (oststr_ptr - oststr));	// Update size of string table
+			PutLong(oststr_ptr, 0x00000000);	// Null terminating long
+			PutLong(oststr, (oststr_ptr - oststr));	// Update size of string table
 		}
 
 		if (vflag > 1)
-		{
 			printf("OSTAdd: (%s), type=$%08X, val=$%08lX\n", name, type, value);
-		}
 
 // is ost_index pointing one past?
 // does this return the same regardless of if its ++n or n++?
@@ -628,7 +546,7 @@ int DoUnresolved(void)
 	// Add to OST while unresolved list is valid
 	while (hptr != NULL)
 	{
-		if (OSTAdd(hptr->h_sym, T_EXT, 0L) == -1)
+		if (OSTAdd(hptr->h_sym, T_GLBL, 0L) == -1)
 			return 1;
 
 		if (vflag > 1)
@@ -674,13 +592,7 @@ int RelocateSegment(struct OFILE * ofile, int flag)
 	// then update the COF TEXT segment offset allowing for the phrase padding
 	if ((flag == T_TEXT) && !ofile->o_header.absrel.reloc.tsize)
 	{
-		// TEXT segment size plus padding
-		pad = ((ofile->o_header.tsize + secalign) & ~secalign);
-		textoffset += (ofile->o_header.tsize + (pad - ofile->o_header.tsize));
-
-		if (vflag > 1)
-			printf("RelocateSegment(%s, TEXT) : No Relocation Data\n", ofile->o_name);
-
+		// SCPCD : we should not increment the textoffset before the end of processing the object file, else data section will point to wrong textoffset
 		return 0;
 	}
 
@@ -689,25 +601,32 @@ int RelocateSegment(struct OFILE * ofile, int flag)
 	// padding
 	if ((flag == T_DATA) && !ofile->o_header.absrel.reloc.dsize)
 	{
+		// SCPCD : the T_DATA is the last section of the file, we can now increment the textoffset, dataoffset and bssoffset
+
+		// TEXT segment size plus padding
+		pad = ((ofile->o_header.tsize + secalign) & ~secalign);
+		textoffset += (ofile->o_header.tsize + (pad - ofile->o_header.tsize));
+
+		if (vflag > 1)
+			printf("RelocateSegment(%s, TEXT) : No relocation data\n", ofile->o_name);
+
 		// DATA segment size plus padding
 		pad = ((ofile->o_header.dsize + secalign) & ~secalign);
 		dataoffset += (ofile->o_header.dsize + (pad - ofile->o_header.dsize));
+
 		// BSS segment size plus padding
 		pad = ((ofile->o_header.bsize + secalign) & ~secalign);
 		bssoffset += (ofile->o_header.bsize + (pad - ofile->o_header.bsize));
 
 		if (vflag > 1)
-			printf("RelocateSegment(%s, DATA) : No Relocation Data\n", ofile->o_name);
+			printf("RelocateSegment(%s, DATA) : No relocation data\n", ofile->o_name);
 
 		return 0;
 	}
 
-	// Verbose mode information
 	if (vflag > 1)
-	{
 		printf("RelocateSegment(%s, %s) : Processing Relocation Data\n",
 			ofile->o_name, flag == T_DATA ? "DATA" : "TEXT");
-	}
 
 	// Obtain pointer to start of symbol table
 	symtab = (ofile->o_image + 32 + ofile->o_header.tsize
@@ -742,8 +661,8 @@ int RelocateSegment(struct OFILE * ofile, int flag)
 	{
 		// Obtain both the relocation address and the relocation flags from the
 		// object file image
-		addr = getlong(rptr);
-		rflg = getlong(rptr + 4);
+		addr = GetLong(rptr);
+		rflg = GetLong(rptr + 4);
 		glblreloc = (rflg & 0x00000010 ? 1 : 0);// Set global relocation flag
 		absreloc = (rflg & 0x00000040 ? 1 : 0); // Set absolute relocation flag
 		relreloc = (rflg & 0x000000A0 ? 1 : 0); // Set relative relocation flag
@@ -755,17 +674,17 @@ int RelocateSegment(struct OFILE * ofile, int flag)
 			// for it in the globals hash table to obtain information on that
 			// symbol. For the hash calculation to work correctly it must be
 			// placed in a 'clean' string before looking it up.
-			symidx = getlong(symtab + ((rflg >> 8) * 12));
+			symidx = GetLong(symtab + ((rflg >> 8) * 12));
 			memset(sym, 0, SYMLEN);
 			strcpy(sym, symbols + symidx);
 			olddata = newdata = 0;   // Initialise old and new segment data
 			ssidx = OSTLookup(sym);
-			newdata = getlong(ost + ((ssidx - 1) * 12) + 8);
+			newdata = GetLong(ost + ((ssidx - 1) * 12) + 8);
 		}
 
 		// Obtain the existing long word segment data and flip words if the
 		// relocation flags indicate it relates to a RISC MOVEI instruction
-		olddata = getlong(sptr + addr);
+		olddata = GetLong(sptr + addr);
 
 		if (rflg & 0x01)
 			olddata = _SWAPWORD(olddata);
@@ -783,10 +702,8 @@ int RelocateSegment(struct OFILE * ofile, int flag)
 			case 0x00000200:          // Absolute Value
 				break;
 			case 0x00000400:          // TEXT segment relocation record
-				if (flag == T_TEXT)   // Is this a TEXT section record?
+				// SCPCD : the symbol point to a text segment, we should use the textoffset
 					newdata = tbase + textoffset + olddata;
-				else
-					newdata = tbase + dataoffset + olddata; // Nope, must be DATA section
 
 				break;
 			case 0x00000600:          // DATA segment relocation record
@@ -817,11 +734,11 @@ int RelocateSegment(struct OFILE * ofile, int flag)
 			if (rflg & 0x01)
 				newdata = _SWAPWORD(newdata);
 
-			putlong(sptr + addr, newdata);
+			PutLong(sptr + addr, newdata);
 		}
 		else if (relreloc)
 		{
-			putword(sptr + addr, newdata - tbase - addr - ofile->o_tbase);
+			PutWord(sptr + addr, newdata - tbase - addr - ofile->o_tbase);
 		}
 
 		// Shamus: Let's output some info to aid in debugging this crap
@@ -833,24 +750,24 @@ int RelocateSegment(struct OFILE * ofile, int flag)
 			if (glblreloc)
 				sprintf(ssiString, " [ssi:%i]", ssidx);
 
-			printf("RelocateSegment($%08X): %s, $%08X: $%08X => $%08X%s\n", rflg, (glblreloc ? sym : "(LOCAL)"), addr, olddata, getlong(sptr + addr), ssiString);
+			printf("RelocateSegment($%08X): %s, $%08X: $%08X => $%08X%s\n", rflg, (glblreloc ? sym : "(LOCAL)"), addr, olddata, GetLong(sptr + addr), ssiString);
 		}
 
 		rptr += 8;     // Point to the next relocation record
 	}
 
 	// Update the COF segment offset allowing for the phrase padding.
-	if (flag == T_TEXT)
+	// SCPCD : we should not increment the textoffset before the end of processing the object file, else data section will point to wrong textoffset
+	if (flag == T_DATA)
 	{
 		// TEXT segment plus padding
 		pad = ((ofile->o_header.tsize + secalign) & ~secalign);
 		textoffset += (ofile->o_header.tsize + (pad - ofile->o_header.tsize));
-	}
-	else
-	{
+
 		// DATA segment plus padding
 		pad = ((ofile->o_header.dsize + secalign) & ~secalign);
 		dataoffset += (ofile->o_header.dsize + (pad - ofile->o_header.dsize));
+
 		// BSS segment plus padding
 		pad = ((ofile->o_header.bsize + secalign) & ~secalign);
 		bssoffset += (ofile->o_header.bsize + (pad - ofile->o_header.bsize));
@@ -981,9 +898,9 @@ ok:
 
 
 //
-// Archive File Use, Needs to be Removed [Shamus: NON!]
+// What it says on the tin
 //
-void put_name(struct OFILE * p)
+void WriteARName(struct OFILE * p)
 {
 	int flag = *(p->o_arname);
 	printf("%s%s%s", (flag ? (char *)(p->o_arname) : ""), (flag ? ":" : ""), p->o_name);
@@ -1080,7 +997,7 @@ int DoFile(char * fname, int incFlag, char * sym)
 //
 // Pad TEXT or DATA segment to the requested boundary
 //
-int segmentpad(FILE * fd, long segsize, int value)
+int PadSegment(FILE * fd, long segsize, int value)
 {
 	int i;
 	char padarray[32];
@@ -1097,7 +1014,7 @@ int segmentpad(FILE * fd, long segsize, int value)
 
 		for(i=0; i<16; i++)
 		{
-			putword(padptr, value);
+			PutWord(padptr, value);
 			padptr += 2;
 		}
 
@@ -1115,13 +1032,13 @@ int segmentpad(FILE * fd, long segsize, int value)
 //
 // Write the output file
 //
-int write_ofile(struct OHEADER * header)
+int WriteOutputFile(struct OHEADER * header)
 {
 	unsigned osize;						// Object segment size
 	struct OFILE * otemp;				// Object file pointer
 	int i, j;							// Iterators
 	char himage[0x168];					// Header image (COF = 0xA8)
-	unsigned tsoff, dsoff, bsoff;		// Segment offset values
+	uint32_t tsoff, dsoff, bsoff;		// Segment offset values
 	unsigned index, type, value;		// Symbol table index, type and value
 	short abstype;						// ABS symbol type
 	char symbol[14];					// Symbol record for ABS files
@@ -1156,68 +1073,68 @@ int write_ofile(struct OHEADER * header)
 
 		// Process each object file segment size to obtain a cumulative segment
 		// size for both the TEXT and DATA segments
-		for(i=0; i<(int)obj_index; i++)
+		for(otemp=olist; otemp!=NULL; otemp=otemp->o_next)
 		{
-			dsoff += obj_segsize[i][0];	// Adding TEXT segment sizes
-			bsoff += obj_segsize[i][0] + obj_segsize[i][1];	// Adding TEXT and DATA segment sizes
+			dsoff += otemp->segSize[TEXT];
+			bsoff += otemp->segSize[TEXT] + otemp->segSize[DATA];
 		}
 
 		// Currently this only builds a COF absolute file. Conditionals and
 		// additional code will need to be added for ABS and partial linking.
 
 		// Build the COF_HDR
-		putword(himage + 0,   0x0150               ); // Magic Number (0x0150)
-		putword(himage + 2,   0x0003               ); // Sections Number (3)
-		putlong(himage + 4,   0x00000000           ); // Date (0L)
-		putlong(himage + 8,   dsoff + header->dsize); // Offset to Symbols Section
-		putlong(himage + 12,  ost_index);             // Number of Symbols
-		putword(himage + 16,  0x001C               ); // Size of RUN_HDR (0x1C)
-		putword(himage + 18,  0x0003               ); // Executable Flags (3)
+		PutWord(himage + 0,   0x0150               ); // Magic Number (0x0150)
+		PutWord(himage + 2,   0x0003               ); // Sections Number (3)
+		PutLong(himage + 4,   0x00000000           ); // Date (0L)
+		PutLong(himage + 8,   dsoff + header->dsize); // Offset to Symbols Section
+		PutLong(himage + 12,  ost_index);             // Number of Symbols
+		PutWord(himage + 16,  0x001C               ); // Size of RUN_HDR (0x1C)
+		PutWord(himage + 18,  0x0003               ); // Executable Flags (3)
 
 		// Build the RUN_HDR
-		putlong(himage + 20,  0x00000107           ); // Magic/vstamp
-		putlong(himage + 24,  header->tsize        ); // TEXT size in bytes
-		putlong(himage + 28,  header->dsize        ); // DATA size in bytes
-		putlong(himage + 32,  header->bsize        ); // BSS size in bytes
-		putlong(himage + 36,  tbase                ); // Start of executable, normally @TEXT
-		putlong(himage + 40,  tbase                ); // @TEXT
-		putlong(himage + 44,  dbase                ); // @DATA
+		PutLong(himage + 20,  0x00000107           ); // Magic/vstamp
+		PutLong(himage + 24,  header->tsize        ); // TEXT size in bytes
+		PutLong(himage + 28,  header->dsize        ); // DATA size in bytes
+		PutLong(himage + 32,  header->bsize        ); // BSS size in bytes
+		PutLong(himage + 36,  tbase                ); // Start of executable, normally @TEXT
+		PutLong(himage + 40,  tbase                ); // @TEXT
+		PutLong(himage + 44,  dbase                ); // @DATA
 
 		// Build the TEXT SEC_HDR
-		putlong(himage + 48,  0x2E746578           );
-		putlong(himage + 52,  0x74000000           ); // ".text"
-		putlong(himage + 56,  tbase                ); // TEXT START
-		putlong(himage + 60,  tbase                ); // TEXT START
-		putlong(himage + 64,  header->tsize        ); // TEXT size in bytes
-		putlong(himage + 68,  tsoff                ); // Offset to section data in file
-		putlong(himage + 72,  0x00000000           ); // Offset to section reloc in file (0L)
-		putlong(himage + 76,  0x00000000           ); // Offset to debug lines structures (0L)
-		putlong(himage + 80,  0x00000000           ); // Nreloc/nlnno (0L)
-		putlong(himage + 84,  0x00000020           ); // SEC_FLAGS: STYP_TEXT
+		PutLong(himage + 48,  0x2E746578           );
+		PutLong(himage + 52,  0x74000000           ); // ".text"
+		PutLong(himage + 56,  tbase                ); // TEXT START
+		PutLong(himage + 60,  tbase                ); // TEXT START
+		PutLong(himage + 64,  header->tsize        ); // TEXT size in bytes
+		PutLong(himage + 68,  tsoff                ); // Offset to section data in file
+		PutLong(himage + 72,  0x00000000           ); // Offset to section reloc in file (0L)
+		PutLong(himage + 76,  0x00000000           ); // Offset to debug lines structures (0L)
+		PutLong(himage + 80,  0x00000000           ); // Nreloc/nlnno (0L)
+		PutLong(himage + 84,  0x00000020           ); // SEC_FLAGS: STYP_TEXT
 
 		// Build the DATA SEC_HDR
-		putlong(himage + 88,  0x2E646174           );
-		putlong(himage + 92,  0x61000000           ); // ".data"
-		putlong(himage + 96,  dbase                ); // DATA START
-		putlong(himage + 100, dbase                ); // DATA START
-		putlong(himage + 104, header->dsize        ); // DATA size in bytes
-		putlong(himage + 108, dsoff                ); // Offset to section data in file
-		putlong(himage + 112, 0x00000000           ); // Offset to section reloc in file (0L)
-		putlong(himage + 116, 0x00000000           ); // Offset to debugging lines structures (0L)
-		putlong(himage + 120, 0x00000000           ); // Nreloc/nlnno (0L)
-		putlong(himage + 124, 0x00000040           ); // SEC_FLAGS: STYP_DATA
+		PutLong(himage + 88,  0x2E646174           );
+		PutLong(himage + 92,  0x61000000           ); // ".data"
+		PutLong(himage + 96,  dbase                ); // DATA START
+		PutLong(himage + 100, dbase                ); // DATA START
+		PutLong(himage + 104, header->dsize        ); // DATA size in bytes
+		PutLong(himage + 108, dsoff                ); // Offset to section data in file
+		PutLong(himage + 112, 0x00000000           ); // Offset to section reloc in file (0L)
+		PutLong(himage + 116, 0x00000000           ); // Offset to debugging lines structures (0L)
+		PutLong(himage + 120, 0x00000000           ); // Nreloc/nlnno (0L)
+		PutLong(himage + 124, 0x00000040           ); // SEC_FLAGS: STYP_DATA
 
 		// Build the BSS SEC_HDR
-		putlong(himage + 128, 0x2E627373           );
-		putlong(himage + 132, 0x00000000           ); // ".bss"
-		putlong(himage + 136, bbase                ); // BSS START
-		putlong(himage + 140, bbase                ); // BSS START
-		putlong(himage + 144, header->bsize        ); // BSS size in bytes
-		putlong(himage + 148, bsoff                ); // Offset to section data in file
-		putlong(himage + 152, 0x00000000           ); // Offset to section reloc in file (0L)
-		putlong(himage + 156, 0x00000000           ); // Offset to debugging lines structures (0L)
-		putlong(himage + 160, 0x00000000           ); // Nreloc/nlnno (0L)
-		putlong(himage + 164, 0x00000080           ); // SEC_FLAGS: STYP_BSS
+		PutLong(himage + 128, 0x2E627373           );
+		PutLong(himage + 132, 0x00000000           ); // ".bss"
+		PutLong(himage + 136, bbase                ); // BSS START
+		PutLong(himage + 140, bbase                ); // BSS START
+		PutLong(himage + 144, header->bsize        ); // BSS size in bytes
+		PutLong(himage + 148, bsoff                ); // Offset to section data in file
+		PutLong(himage + 152, 0x00000000           ); // Offset to section reloc in file (0L)
+		PutLong(himage + 156, 0x00000000           ); // Offset to debugging lines structures (0L)
+		PutLong(himage + 160, 0x00000000           ); // Nreloc/nlnno (0L)
+		PutLong(himage + 164, 0x00000080           ); // SEC_FLAGS: STYP_BSS
 
 		symoffset = 168;                              // Update symbol offset
 	}
@@ -1225,16 +1142,16 @@ int write_ofile(struct OHEADER * header)
 	else
 	{
 		// Build the ABS header
-		putword(himage + 0,   0x601B               ); // Magic Number (0x601B)
-		putlong(himage + 2,   header->tsize        ); // TEXT segment size
-		putlong(himage + 6,   header->dsize        ); // DATA segment size
-		putlong(himage + 10,  header->bsize        ); // BSS segment size
-		putlong(himage + 14,  ost_index * 14       ); // Symbol table size (?)
-		putlong(himage + 18,  0x00000000           ); //
-		putlong(himage + 22,  tbase                ); // TEXT base address
-		putword(himage + 26,  0xFFFF               ); // Flags (?)
-		putlong(himage + 28,  dbase                ); // DATA base address
-		putlong(himage + 32,  bbase                ); // BSS base address
+		PutWord(himage + 0,   0x601B               ); // Magic Number (0x601B)
+		PutLong(himage + 2,   header->tsize        ); // TEXT segment size
+		PutLong(himage + 6,   header->dsize        ); // DATA segment size
+		PutLong(himage + 10,  header->bsize        ); // BSS segment size
+		PutLong(himage + 14,  ost_index * 14       ); // Symbol table size (?)
+		PutLong(himage + 18,  0x00000000           ); //
+		PutLong(himage + 22,  tbase                ); // TEXT base address
+		PutWord(himage + 26,  0xFFFF               ); // Flags (?)
+		PutLong(himage + 28,  dbase                ); // DATA base address
+		PutLong(himage + 32,  bbase                ); // BSS base address
 
 		symoffset = 36;                               // Update symbol offset
 	}
@@ -1269,7 +1186,7 @@ int write_ofile(struct OHEADER * header)
 				goto werror;
 
 			// Pad to required alignment boundary
-			if (segmentpad(fd, osize, 0x0000))
+			if (PadSegment(fd, osize, 0x0000))
 				goto werror;
 
 			symoffset += osize;
@@ -1291,7 +1208,7 @@ int write_ofile(struct OHEADER * header)
 				goto werror;
 
 			// Pad to required alignment boundary
-			if (segmentpad(fd, osize, 0))
+			if (PadSegment(fd, osize, 0))
 				goto werror;
 
 			symoffset += osize;
@@ -1328,15 +1245,15 @@ int write_ofile(struct OHEADER * header)
 				memset(symbol, 0, 14);		// Initialise symbol record
 				abstype = 0;				// Initialise ABS symbol type
 				slen = 0;					// Initialise symbol string length
-				index = getlong(ost + (i * 12));	// Get symbol index
-				type  = getlong((ost + (i * 12)) + 4);	// Get symbol type
+				index = GetLong(ost + (i * 12));	// Get symbol index
+				type  = GetLong((ost + (i * 12)) + 4);	// Get symbol type
 
 				// Skip debug symbols
 				if (type & 0xF0000000)
 					continue;
 
 				// Get symbol value
-				value = getlong((ost + (i * 12)) + 8);
+				value = GetLong((ost + (i * 12)) + 8);
 				slen = strlen(oststr + index);
 
 				// Get symbol string (maximum 8 chars)
@@ -1362,13 +1279,13 @@ int write_ofile(struct OHEADER * header)
 				case 0x08000000: abstype = (short)ABST_DEFINED | ABST_BSS;                break;
 				case 0x09000000: abstype = (short)ABST_DEFINED | ABST_GLOBAL | ABST_BSS;  break;
 				default:
-					printf("warning (write_ofile): ABS, cannot determine symbol type ($%08X)\n", type);
-					type = 0;
+					printf("warning (WriteOutputFile): ABS, cannot determine symbol type ($%08X) [%s]\n", type, symbol);
+//					type = 0;
 					break;
 				}
 
-				putword(symbol + 8, abstype);	// Write back new ABS type
-				putlong(symbol + 10, value);	// Write back value
+				PutWord(symbol + 8, abstype);	// Write back new ABS type
+				PutLong(symbol + 10, value);	// Write back value
 
 				// Write symbol record
 				if (fwrite(symbol, 14, 1, fd) != 1)
@@ -1377,10 +1294,9 @@ int write_ofile(struct OHEADER * header)
 		}
 	}
 
-	// Close the file
 	if (fclose(fd))
 	{
-		printf("Close error on output file %s\n",ofile);
+		printf("Close error on output file %s\n", ofile);
 		return 1;
 	}
 
@@ -1394,9 +1310,9 @@ werror:
 
 
 //
-// Display the Symbol Load Map
+// Display the symbol load map
 //
-int write_map(struct OHEADER * header)
+int ShowSymbolLoadMap(struct OHEADER * header)
 {
 	unsigned i, o;			// Inner and outer loop iterators
 	unsigned c;				// Column number
@@ -1431,9 +1347,9 @@ int write_map(struct OHEADER * header)
 		// Inner loop to process each record in the symbol table
 		for(i=0; i<(unsigned)ost_index; i++)
 		{
-			index  = getlong(ost + (i * 12));		// Get symbol string index
-			type   = getlong(ost + (i * 12) + 4);	// Get symbol type
-			value  = getlong(ost + (i * 12) + 8);	// Get symbol value
+			index  = GetLong(ost + (i * 12));		// Get symbol string index
+			type   = GetLong(ost + (i * 12) + 4);	// Get symbol type
+			value  = GetLong(ost + (i * 12) + 8);	// Get symbol value
 			symbol = oststr + index;				// Get symbol string
 
 			// Display only three columns
@@ -1534,9 +1450,9 @@ int GetHexValue(char * string, int * value)
 // Create one big .o file from the images already in memory, returning a
 // pointer to an OHEADER. Note that the oheader is just the header for the
 // output (plus some other information). The text, data, and fixups are all
-// still in the ofile images hanging off the global `olist'.
+// still in the ofile images hanging off the global 'olist'.
 //
-struct OHEADER * make_ofile()
+struct OHEADER * MakeOutputObject()
 {
 	unsigned tptr, dptr, bptr;	// Bases in runtime model
 	int ret = 0;				// Return value
@@ -1549,68 +1465,49 @@ struct OHEADER * make_ofile()
 	// those object files which are unused
 	struct OFILE * oprev = NULL;	// Init previous obj file list ptr
 	struct OFILE * otemp = olist;	// Set temp pointer to object file list
-	int i = 0;
 
 	while (otemp != NULL)
 	{
-		// UNUSED !!!!! (it's !O_ARCHIVE, so this code executes.)
-		if (!(otemp->o_flags & O_ARCHIVE))
+		// If the object is unused, discard it...
+		if ((otemp->o_flags & O_USED) == 0)
 		{
-			if ((otemp->o_flags & O_USED) == 0)
+			if (wflag)
 			{
-				if (wflag)
-				{
-					printf("Unused object file ");
-					put_name(otemp);
-					printf(" discarded.\n");
-				}
-
-				if (oprev == NULL)
-					olist = otemp->o_next;
-				else
-					oprev->o_next = otemp->o_next;
-
-				struct OFILE * ohold = otemp;
-
-				if (!ohold->isArchiveFile)
-					free(ohold->o_image);
-
-				// Also need to remove them from the obj_* tables too :-P
-				// N.B.: Would probably be worthwhile to remove crap like this
-				//       and stuff it into the OFILE structure...
-				if (wflag)
-					printf("»-> removing %s... (index == %i, len == %i)\n", obj_fname[i], i, obj_index - 1);
+				printf("Unused object file ");
+				WriteARName(otemp);
+				printf(" discarded.\n");
+			}
 
-				int k;
+			// Drop the entry from the linked list
+			if (oprev == NULL)
+				olist = otemp->o_next;
+			else
+				oprev->o_next = otemp->o_next;
 
-				for(k=i; k<obj_index-1; k++)
-				{
-					memcpy(obj_fname[k], obj_fname[k + 1], FNLEN);
-					obj_segsize[k][0] = obj_segsize[k + 1][0];
-					obj_segsize[k][1] = obj_segsize[k + 1][1];
-					obj_segsize[k][2] = obj_segsize[k + 1][2];
-				}
+			// Free the object entry if it's not an archive file
+			if (!otemp->isArchiveFile)
+				free(otemp->o_image);
+		}
+		else
+		{
+			// Save accumulated addresses in the object
+			otemp->segBase[TEXT] = textsize;
+			otemp->segBase[DATA] = datasize;
+			otemp->segBase[BSS]  = bsssize;
 
-				obj_index--;
-				i--;
-			}
-			else
-			{
-				// Increment total of segment sizes ensuring requested
-				// alignment
-				textsize += (otemp->o_header.tsize + secalign) & ~secalign;
-				datasize += (otemp->o_header.dsize + secalign) & ~secalign;
-				bsssize  += (otemp->o_header.bsize + secalign) & ~secalign;
-				oprev = otemp;
-			}
+			// Increment total of segment sizes ensuring requested alignment
+			textsize += (otemp->o_header.tsize + secalign) & ~secalign;
+			datasize += (otemp->o_header.dsize + secalign) & ~secalign;
+			bsssize  += (otemp->o_header.bsize + secalign) & ~secalign;
+			oprev = otemp;
 		}
 
 		// Go to next object file list pointer
 		otemp = otemp->o_next;
-		i++;
 	}
 
-	// Update base addresses and create symbols _TEXT_E, _DATA_E and _BSS_E
+	// Update base addresses and inject the symbols _TEXT_E, _DATA_E and _BSS_E
+	// into the OST
 	tbase = tval;
 
 	if (!dval)
@@ -1627,7 +1524,7 @@ struct OHEADER * make_ofile()
 	}
 	else
 	{
-		// DATA is independant of TEXT
+		// DATA is independent of TEXT
 		dbase = dval;
 
 		if (!bval)
@@ -1638,6 +1535,7 @@ struct OHEADER * make_ofile()
 			bbase = bval;
 	}
 
+	// Inject segment end labels, for C compilers that expect this shite
 	OSTAdd("_TEXT_E", 0x05000000, tbase + textsize);
 	OSTAdd("_DATA_E", 0x07000000, dbase + datasize);
 	OSTAdd("_BSS_E",  0x09000000, bbase + bsssize);
@@ -1659,16 +1557,11 @@ struct OHEADER * make_ofile()
 	while (otemp != NULL)
 	{
 		otemp->o_tbase = tptr;
-
-		// Do rest only for non-ARCHIVE markers
-		if (!(otemp->o_flags & O_ARCHIVE))
-		{
-			otemp->o_dbase = dptr;
-			otemp->o_bbase = bptr;
-			tptr += (otemp->o_header.tsize + secalign) & ~secalign;
-			dptr += (otemp->o_header.dsize + secalign) & ~secalign;
-			bptr += (otemp->o_header.bsize + secalign) & ~secalign;
-		}
+		otemp->o_dbase = dptr;
+		otemp->o_bbase = bptr;
+		tptr += (otemp->o_header.tsize + secalign) & ~secalign;
+		dptr += (otemp->o_header.dsize + secalign) & ~secalign;
+		bptr += (otemp->o_header.bsize + secalign) & ~secalign;
 
 		// For each symbol, (conditionally) add it to the ost
 		// For ARCHIVE markers, this adds the symbol for the file & returns
@@ -1677,27 +1570,7 @@ struct OHEADER * make_ofile()
 		if (DoSymbols(otemp))
 			return NULL;
 
-		if (otemp->o_flags & O_ARCHIVE)
-		{
-			// Now that the archive is marked, remove it from list
-			if (oprev == NULL)
-				olist = otemp->o_next;
-			else
-				oprev->o_next = otemp->o_next;
-
-			struct OFILE * ohold = otemp;
-
-			if (ohold->o_image)
-				if (!ohold->isArchiveFile)
-					free(ohold->o_image);
-
-			free(ohold);
-		}
-		else
-		{
-			oprev = otemp;
-		}
-
+		oprev = otemp;
 		otemp = otemp->o_next;
 	}
 
@@ -1710,7 +1583,7 @@ struct OHEADER * make_ofile()
 
 	if (header == NULL)
 	{
-		printf("make_ofile: out of memory!\n");
+		printf("MakeOutputObject: out of memory!\n");
 		return NULL;
 	}
 
@@ -1728,11 +1601,8 @@ struct OHEADER * make_ofile()
 	// with the error condition
 	for(otemp=olist; otemp!=NULL; otemp=otemp->o_next)
 	{
-		if (!(otemp->o_flags & O_ARCHIVE))
-		{
-			ret |= RelocateSegment(otemp, T_TEXT); // TEXT segment relocations
-			ret |= RelocateSegment(otemp, T_DATA); // DATA segment relocations
-		}
+		ret |= RelocateSegment(otemp, T_TEXT); // TEXT segment relocations
+		ret |= RelocateSegment(otemp, T_DATA); // DATA segment relocations
 	}
 
 	// Done with global symbol hash tables
@@ -1879,7 +1749,7 @@ struct HREC * LookupHREC(char * symbol)
 //
 struct HREC * LookupARHREC(char * symbol)
 {
-	struct HREC * hptr = arSymbol;//htable[GetHash(symbol)];
+	struct HREC * hptr = arSymbol;
 
 	while (hptr != NULL)
 	{
@@ -1900,13 +1770,27 @@ struct HREC * LookupARHREC(char * symbol)
 //
 // Change old-style commons (type == T_EXTERN, value != 0) to new-style ones
 // (type == (T_GLOBAL | T_EXTERN)). [??? O_o]
+// [N.B.: Whoever wrote the above didn't know what the fuck they were talking
+//        about. Commons (globals) are exactly what they are calling 'old
+//        style'. Also note, that there is no "T_GLOBAL" or "T_EXTERN" symbols
+//        defined anywhere in the code.]
 //
 int AddSymbols(struct OFILE * Ofile)
 {
 	struct HREC * hptr;			// Hash record pointer
 
 	if (vflag > 1)
-		printf("Add symbols for file %s\n", Ofile->o_name);
+	{
+		printf("AddSymbols: for file %s\n", Ofile->o_name);
+		printf("            t_bbase = $%X\n", Ofile->o_tbase);
+		printf("            d_bbase = $%X\n", Ofile->o_dbase);
+		printf("            o_bbase = $%X\n", Ofile->o_bbase);
+		printf("            tsize = $%X\n", Ofile->o_header.tsize);
+		printf("            dsize = $%X\n", Ofile->o_header.dsize);
+		printf("            bsize = $%X\n", Ofile->o_header.bsize);
+		printf("            reloc.tsize = $%X\n", Ofile->o_header.absrel.reloc.tsize);
+		printf("            reloc.dsize = $%X\n", Ofile->o_header.absrel.reloc.dsize);
+	}
 
 	// Get base pointer, start of sym fixups
 	char * ptr = Ofile->o_image + 32
@@ -1920,28 +1804,50 @@ int AddSymbols(struct OFILE * Ofile)
 
 	while (nsymbols)
 	{
-		long index = getlong(sfix);				// Get symbol string index
-		long type  = getlong(sfix + 4);			// Get symbol type
-		long value = getlong(sfix + 8);			// Get symbol value
+		long index = GetLong(sfix);				// Get symbol string index
+		long type  = GetLong(sfix + 4);			// Get symbol type
+		long value = GetLong(sfix + 8);			// Get symbol value
 
 		if ((Ofile->isArchiveFile) && !(Ofile->o_flags & O_USED))
 		{
-			if ((type & T_EXT) && (type & (T_SEG | T_ABS)))
+			if ((type & T_GLBL) && (type & (T_SEG | T_ABS)))
 				if (AddARSymbol(sstr + index, Ofile))
 					return 1;
 		}
-		else if (type == T_EXT)
+		else if (type == T_GLBL)
 		{
-			// External symbol that is *not* in the current unit
+			// Global symbol that may or may not be in the current unit
 			hptr = LookupHREC(sstr + index);
 
 			if (hptr != NULL)
 				hptr->h_ofile->o_flags |= O_USED;	// Mark .o file as used
-			// Otherwise add to unresolved list
+			// Otherwise, *maybe* add to unresolved list
 			else
 			{
-				// Check for built-in externals...
-				if ((strcmp(sstr + index, "_TEXT_E") != 0)
+				// Check to see if this is a common symbol; if so, add it to
+				// the hash list...
+				if (value != 0)
+				{
+					// Actually, we need to convert this to a BSS symbol,
+					// increase the size of the BSS segment for this object, &
+					// add it to the hash list
+					uint32_t bssLocation = Ofile->o_header.tsize + Ofile->o_header.dsize + Ofile->o_header.bsize;
+					Ofile->o_header.bsize += value;
+					Ofile->segSize[BSS] += value;
+					type |= T_BSS;
+					value = bssLocation;
+					PutLong(sfix + 4, type);
+					PutLong(sfix + 8, value);
+
+					if (vflag > 1)
+						printf("AddSymbols: Resetting common label to BSS label\n");
+
+					if (AddSymbolToHashList(&htable[GetHash(sstr + index)],
+						sstr + index, Ofile, value, type))
+						return 1;				// Error if addition failed
+				}
+				// Make sure it's not a built-in external...
+				else if ((strcmp(sstr + index, "_TEXT_E") != 0)
 					&& (strcmp(sstr + index, "_DATA_E") != 0)
 					&& (strcmp(sstr + index, "_BSS_E") != 0))
 				{
@@ -1950,13 +1856,8 @@ int AddSymbols(struct OFILE * Ofile)
 				}
 			}
 		}
-		else if ((type & T_EXT) && (type & (T_SEG | T_ABS)))
+		else if ((type & T_GLBL) && (type & (T_SEG | T_ABS)))
 		{
-#if 0
-			// Symbol in the current unit that is also EXPORTED
-			if (DealWithSymbol(sstr + index, type, value, Ofile))
-				return 1;				// Error if addition failed
-#else
 			hptr = LookupHREC(sstr + index);
 
 			// Symbol isn't in the table, so try to add it:
@@ -1969,15 +1870,17 @@ int AddSymbols(struct OFILE * Ofile)
 			else
 			{
 				// Symbol already exists, decide what to do about it
+				// [N.B.: This isn't a check for a common symbol...
+				//        BEWARE OF BAD INTERPRETATIONS!!]
 				if (iscommon(hptr->h_type))
 				{
 					// Mismatch: common came first; warn and keep the global
 					if (wflag)
 					{
 						printf("Warning: %s: global from ", sstr + index);
-						put_name(Ofile);
+						WriteARName(Ofile);
 						printf(" used, common from ");
-						put_name(hptr->h_ofile);
+						WriteARName(hptr->h_ofile);
 						printf(" discarded.\n");
 					}
 
@@ -1992,19 +1895,18 @@ int AddSymbols(struct OFILE * Ofile)
 					if (wflag)
 					{
 						printf("Duplicate symbol %s: ", sstr + index);
-						put_name(hptr->h_ofile);
+						WriteARName(hptr->h_ofile);
 						printf(" used, ");
-						put_name(Ofile);
+						WriteARName(Ofile);
 						printf(" discarded\n");
 					}
 
 					// Set the global in this unit to pure external
 					// (is this a good idea? what if the other one is a ref to
 					// this one???)
-					putlong(sfix + 4, T_EXT);
+					PutLong(sfix + 4, T_GLBL);
 				}
 			}
-#endif
 		}
 
 		sfix += 12;			// Increment symbol fixup pointer
@@ -2031,7 +1933,7 @@ int DoItem(struct OFILE * obj)
 	}
 
 	// Starting after all pathnames, etc., copy .o file name to Ofile
-	char * temp = path_tail(obj->o_name);
+	char * temp = PathTail(obj->o_name);
 
 	// Check filename length
 	if (strlen(temp) > FNLEN - 1)
@@ -2041,7 +1943,7 @@ int DoItem(struct OFILE * obj)
 	}
 
 	// Check archive name length
-	if (strlen(obj->o_arname) > FNLEN - 1)
+	if (strlen(obj->o_arname) > (FNLEN - 1))
 	{
 		printf("Archive name too long: %s\n", obj->o_arname);
 		return 1;
@@ -2058,45 +1960,42 @@ int DoItem(struct OFILE * obj)
 	Ofile->o_flags = obj->o_flags;
 	Ofile->o_image = obj->o_image;
 	Ofile->isArchiveFile = obj->isArchiveFile;
+	Ofile->segSize[TEXT] = obj->segSize[TEXT];
+	Ofile->segSize[DATA] = obj->segSize[DATA];
+	Ofile->segSize[BSS]  = obj->segSize[BSS];
 	char * ptr = obj->o_image;
 
-	// Don't do anything if this is just an ARCHIVE marker, just add the file
-	// to the olist
-	// (Shamus: N.B.: it does no such ARCHIVE thing ATM)
-	if (!(obj->o_flags & O_ARCHIVE))
-	{
-		Ofile->o_header.magic = getlong(ptr);
-		Ofile->o_header.tsize = getlong(ptr + 4);
-		Ofile->o_header.dsize = getlong(ptr + 8);
-		Ofile->o_header.bsize = getlong(ptr + 12);
-		Ofile->o_header.ssize = getlong(ptr + 16);
-		Ofile->o_header.absrel.reloc.tsize = getlong(ptr + 24);
-		Ofile->o_header.absrel.reloc.dsize = getlong(ptr + 28);
-
-		// Round BSS off to alignment boundary
-		Ofile->o_header.bsize = (Ofile->o_header.bsize + secalign) & ~secalign;
+	Ofile->o_header.magic = GetLong(ptr);
+	Ofile->o_header.tsize = GetLong(ptr + 4);
+	Ofile->o_header.dsize = GetLong(ptr + 8);
+	Ofile->o_header.bsize = GetLong(ptr + 12);
+	Ofile->o_header.ssize = GetLong(ptr + 16);
+	Ofile->o_header.absrel.reloc.tsize = GetLong(ptr + 24);
+	Ofile->o_header.absrel.reloc.dsize = GetLong(ptr + 28);
 
-		if ((Ofile->o_header.dsize & 7) && wflag)
-		{
-			printf("Warning: data segment size of ");
-			put_name(Ofile);
-			printf(" is not a phrase multiple\n");
-		}
+	// Round BSS off to alignment boundary (??? isn't this already done ???)
+	Ofile->o_header.bsize = (Ofile->o_header.bsize + secalign) & ~secalign;
 
-		// Check for odd segment sizes
-		if ((Ofile->o_header.tsize & 1) || (Ofile->o_header.dsize & 1)
-			|| (Ofile->o_header.bsize & 1))
-		{
-			printf("Error: odd-sized segment in ");
-			put_name(Ofile);
-			printf("; link aborted.\n");
-			return 1;
-		}
+	if ((Ofile->o_header.dsize & 7) && wflag)
+	{
+		printf("Warning: data segment size of ");
+		WriteARName(Ofile);
+		printf(" is not a phrase multiple\n");
+	}
 
-		if (AddSymbols(Ofile))
-			return 1;
+	// Check for odd segment sizes
+	if ((Ofile->o_header.tsize & 1) || (Ofile->o_header.dsize & 1)
+		|| (Ofile->o_header.bsize & 1))
+	{
+		printf("Error: odd-sized segment in ");
+		WriteARName(Ofile);
+		printf("; link aborted.\n");
+		return 1;
 	}
 
+	if (AddSymbols(Ofile))
+		return 1;
+
 	// Add this file to the olist
 	if (olist == NULL)
 		olist = Ofile;
@@ -2207,7 +2106,7 @@ int ProcessLists(void)
 //
 // Extract filename from path
 //
-char * path_tail(char * name)
+char * PathTail(char * name)
 {
 	// Find last occurance of PATH_DELIMETER
 	char * temp = strrchr(name, PATH_DELIMITER);
@@ -2223,7 +2122,7 @@ char * path_tail(char * name)
 //
 // Add input file to processing list
 //
-int AddToProcessingList(char * ptr, char * fname, char * arname, uint8_t arFile)
+int AddToProcessingList(char * ptr, char * fname, char * arname, uint8_t arFile, uint32_t tSize, uint32_t dSize, uint32_t bSize)
 {
 	if (plist == NULL)
 	{
@@ -2244,19 +2143,19 @@ int AddToProcessingList(char * ptr, char * fname, char * arname, uint8_t arFile)
 		return 1;
 	}
 
-	fname = path_tail(fname);
-	arname = path_tail(arname);
+	// Discard paths from filenames...
+	fname = PathTail(fname);
+	arname = PathTail(arname);
 
-	if (strlen(fname) > FNLEN - 1)
+	// Check for filename length errors...
+	if (strlen(fname) > (FNLEN - 1))
 	{
-		// Error on excessive filename length
 		printf("File name too long: %s (sorry!)\n", fname);
 		return 1;
 	}
 
-	if (strlen(arname) > FNLEN - 1)
+	if (strlen(arname) > (FNLEN - 1))
 	{
-		// Error on excessive filename length
 		printf("AR file name too long: %s (sorry!)\n", arname);
 		return 1;
 	}
@@ -2267,6 +2166,9 @@ int AddToProcessingList(char * ptr, char * fname, char * arname, uint8_t arFile)
 	plast->o_flags = (arFile ? 0 : O_USED);	// File is used if NOT in archive
 	plast->o_next = NULL;				// Initialise next record pointer
 	plast->isArchiveFile = arFile;		// Shamus: Temp until can sort it out
+	plast->segSize[TEXT] = tSize;
+	plast->segSize[DATA] = dSize;
+	plast->segSize[BSS]  = bSize;
 
 	return 0;							// Return without errors
 }
@@ -2280,8 +2182,8 @@ int AddToProcessingList(char * ptr, char * fname, char * arname, uint8_t arFile)
 // Image size for include files is:
 // Header ....... 32 bytes
 // Data ......... dsize
-// Sym Fixups ... 2 * 12 bytes
-// Symbol Size .. 4 bytes (Value to include symbols and terminating null)
+// Sym fixups ... 2 * 12 bytes
+// Symbol size .. 4 bytes (Value to include symbols and terminating null)
 // Symbols ...... (strlen(sym1) + 1) + (strlen(sym2) + 1)
 // Terminate .... 4 bytes (0x00000000)
 //
@@ -2290,6 +2192,7 @@ int LoadInclude(char * fname, int handle, char * sym1, char * sym2, int segment)
 	char * ptr, * sptr;
 	int i;
 	unsigned symtype = 0;
+	uint32_t tSize = 0, dSize = 0, bSize = 0;
 
 	long fsize = FileSize(handle);		// Get size of include file
 	long dsize = (fsize + secalign) & ~secalign;	// Align size to boundary
@@ -2317,50 +2220,42 @@ int LoadInclude(char * fname, int handle, char * sym1, char * sym2, int segment)
 
 	close(handle);
 
-	strcpy(obj_fname[obj_index], path_tail(fname));
-
 	// Build this image's dummy header
-	putlong(ptr, 0x00000107);              // Magic number
+	PutLong(ptr, 0x00000107);              // Magic number
 
 	if (segment)
 	{
-		putlong(ptr+4, dsize);             // Text size
-		putlong(ptr+8, 0L);                // Data size
+		PutLong(ptr+4, dsize);             // Text size
+		PutLong(ptr+8, 0L);                // Data size
 		symtype = 0x05000000;
-		obj_segsize[obj_index][0] = dsize;
-		obj_segsize[obj_index][1] = 0;
-		obj_segsize[obj_index][2] = 0;
+		tSize = dsize;
 	}
 	else
 	{
-		putlong(ptr+4, 0L);                // Text size
-		putlong(ptr+8, dsize);             // Data size
+		PutLong(ptr+4, 0L);                // Text size
+		PutLong(ptr+8, dsize);             // Data size
 		symtype = 0x07000000;
-		obj_segsize[obj_index][0] = 0;
-		obj_segsize[obj_index][1] = dsize;
-		obj_segsize[obj_index][2] = 0;
+		dSize = dsize;
 	}
 
-	obj_index++;                           // Increment object count
-
-	putlong(ptr+12, 0L);                   // BSS size
-	putlong(ptr+16, 24);                   // Symbol table size
-	putlong(ptr+20, 0L);                   // Entry point
-	putlong(ptr+24, 0L);                   // TEXT relocation size
-	putlong(ptr+28, 0L);                   // DATA relocation size
+	PutLong(ptr+12, 0L);                   // BSS size
+	PutLong(ptr+16, 24);                   // Symbol table size
+	PutLong(ptr+20, 0L);                   // Entry point
+	PutLong(ptr+24, 0L);                   // TEXT relocation size
+	PutLong(ptr+28, 0L);                   // DATA relocation size
 
 	sptr = ptr + 32 + dsize;               // Set sptr to symbol table location
 
-	putlong(sptr,    4L);                  // String offset of symbol1
-	putlong(sptr+4,  symtype);             // Symbol type
-	putlong(sptr+8,  0x00000000);          // Symbol has no value (START)
-	putlong(sptr+12, 4L + (sym2len - 1));  // String offset of symbol2
-	putlong(sptr+16, symtype);             // Symbol type
-	putlong(sptr+20, dsize);               // Symbol is data size (END)
+	PutLong(sptr,    4L);                  // String offset of symbol1
+	PutLong(sptr+4,  symtype);             // Symbol type
+	PutLong(sptr+8,  0x00000000);          // Symbol has no value (START)
+	PutLong(sptr+12, 4L + (sym2len - 1));  // String offset of symbol2
+	PutLong(sptr+16, symtype);             // Symbol type
+	PutLong(sptr+20, dsize);               // Symbol is data size (END)
 
 	sptr = ptr + 32 + dsize + 24;          // Set sptr to symbol table size loc
 
-	putlong(sptr, sym1len + 4L);           // Size of symbol table
+	PutLong(sptr, sym1len + 4L);           // Size of symbol table
 
 	sptr = ptr + 32 + dsize + 24 + 4;      // Set sptr to symbol table location
 
@@ -2378,9 +2273,9 @@ int LoadInclude(char * fname, int handle, char * sym1, char * sym2, int segment)
 	*sptr = '\0';                          // Terminate symbol string
 	sptr += 1;                             // Step past termination
 
-	putlong(sptr, 0L);                     // Terminating long for object file
+	PutLong(sptr, 0L);                     // Terminating long for object file
 
-	return AddToProcessingList(ptr, fname, nullStr, 0);
+	return AddToProcessingList(ptr, fname, nullStr, 0, tSize, dSize, bSize);
 }
 
 
@@ -2393,6 +2288,8 @@ int LoadInclude(char * fname, int handle, char * sym1, char * sym2, int segment)
 //
 int LoadObject(char * fname, int fd, char * ptr)
 {
+	uint32_t tSize = 0, dSize = 0, bSize = 0;
+
 	if (ptr == NULL)
 	{
 		long size = FileSize(fd);
@@ -2416,19 +2313,14 @@ int LoadObject(char * fname, int fd, char * ptr)
 			return 1;
 		}
 
-		// SCPCD: get the name of the file instead of all pathname
-		strcpy(obj_fname[obj_index], path_tail(fname));
-		obj_segsize[obj_index][0] = (getlong(ptr + 4) + secalign) & ~secalign;
-		obj_segsize[obj_index][1] = (getlong(ptr + 8) + secalign) & ~secalign;
-		obj_segsize[obj_index][2] = (getlong(ptr + 12) + secalign) & ~secalign;
-		obj_index++;
-
-		close(fd);                                            // Close file
+		tSize = (GetLong(ptr + 4)  + secalign) & ~secalign;
+		dSize = (GetLong(ptr + 8)  + secalign) & ~secalign;
+		bSize = (GetLong(ptr + 12) + secalign) & ~secalign;
+		close(fd);
 	}
 
 	// Now add this image to the list of pending ofiles (plist)
-	// This routine is shared by LoadInclude after it builds the image
-	return AddToProcessingList(ptr, fname, nullStr, 0);
+	return AddToProcessingList(ptr, fname, nullStr, 0, tSize, dSize, bSize);
 }
 
 
@@ -2542,13 +2434,11 @@ int LoadArchive(char * fname, int fd)
 				objName[lastChar] = 0;
 
 //printf("Processing object \"%s\" (size == %i, obj_index == %i)...\n", objName, atoi(objSize), obj_index);
-			strcpy(obj_fname[obj_index], objName);
-			obj_segsize[obj_index][0] = (getlong(ptr + 60 + 4) + secalign) & ~secalign;
-			obj_segsize[obj_index][1] = (getlong(ptr + 60  + 8) + secalign) & ~secalign;
-			obj_segsize[obj_index][2] = (getlong(ptr + 60  + 12) + secalign) & ~secalign;
-			obj_index++;
+			uint32_t tSize = (GetLong(ptr + 60 + 4)  + secalign) & ~secalign;
+			uint32_t dSize = (GetLong(ptr + 60 + 8)  + secalign) & ~secalign;
+			uint32_t bSize = (GetLong(ptr + 60 + 12) + secalign) & ~secalign;
 
-			if (AddToProcessingList(ptr + 60, objName, fname, 1))
+			if (AddToProcessingList(ptr + 60, objName, fname, 1, tSize, dSize, bSize))
 				return 1;
 		}
 
@@ -2590,7 +2480,7 @@ int ProcessFiles(void)
 			lseek(handle[i], 0L, 0);	// Reset to start of input file
 
 			// Look for RMAC/MAC/GCC (a.out) object files
-			if ((getlong(magic) & 0xFFFF) == 0x0107)
+			if ((GetLong(magic) & 0xFFFF) == 0x0107)
 			{
 				// Process input object file
 				if (LoadObject(name[i], handle[i], 0L))
@@ -2708,7 +2598,7 @@ int parse(char * buf, char * newargv[])
 
 
 //
-// Process in a Link Command File
+// Process in a link command file
 //
 int docmdfile(char * fname)
 {
@@ -2786,7 +2676,7 @@ int docmdfile(char * fname)
 
 
 //
-// Take an Argument List and Parse the Command Line
+// Take an argument list and parse the command line
 //
 int doargs(int argc, char * argv[])
 {
@@ -2803,7 +2693,7 @@ int doargs(int argc, char * argv[])
 			if (!argv[i][1])
 			{
 				printf("Illegal option argument: %s\n\n", argv[i]);
-				display_help();
+				ShowHelp();
 				return 1;
 			}
 
@@ -2815,8 +2705,8 @@ int doargs(int argc, char * argv[])
 			case '?':					// Display usage information
 			case 'h':
 			case 'H':
-				display_version();
-				display_help();
+				ShowVersion();
+				ShowHelp();
 				return 1;
 			case 'a':
 			case 'A':					// Set absolute linking on
@@ -2946,8 +2836,8 @@ int doargs(int argc, char * argv[])
 				// handle -i (Truncation)
 				else
 				{
-					if (strlen(isym) > 7)
-						isym[7] = '\0';
+					if (strlen(isym) > 8)
+						isym[8] = '\0';
 				}
 
 				// Place include files in the DATA segment only
@@ -3030,7 +2920,7 @@ int doargs(int argc, char * argv[])
 			case 'V':					// Verbose information
 				if (!vflag && !versflag)
 				{
-					display_version();
+					ShowVersion();
 				}
 
 				vflag++;
@@ -3080,23 +2970,29 @@ int doargs(int argc, char * argv[])
 
 
 //
-// Display Version Information
+// Display version information
 //
-void display_version(void)
+void ShowVersion(void)
 {
 	if (displaybanner)// && vflag)
 	{
-		printf("\nReboot's Linker for Atari Jaguar\n");
-		printf("Copyright (c) 199x Allan K. Pratt, 2014 Reboot\n");
-		printf("V%i.%i.%i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
+		printf(
+		"      _\n"
+		" _ __| |_ ___\n"
+		"| '__| | '_  \\\n"
+		"| |  | | | | |\n"
+		"|_|  |_|_| |_|\n"
+		"\nReboot's Linker for Atari Jaguar\n"
+		"Copyright (c) 199x Allan K. Pratt, 2014-2015 Reboot\n"
+		"V%i.%i.%i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
 	}
 }
 
 
 //
-// Display Command Line Help
+// Display command line help
 //
-void display_help(void)
+void ShowHelp(void)
 {
 	printf("Usage:\n");
 	printf("    %s [-options] file(s)\n", cmdlnexec);
@@ -3133,12 +3029,11 @@ void display_help(void)
 
 
 //
-// Application Exit
+// Application exit
 //
-void rln_exit(void)
+void ExitLinker(void)
 {
 	char tempbuf[128];
-	char * c;
 
 	// Display link status if verbose mode
 	if (vflag)
@@ -3148,42 +3043,19 @@ void rln_exit(void)
 	if (waitflag)
 	{
 		printf("\nPress the [RETURN] key to continue. ");
-		c = fgets(tempbuf, 128, stdin);
+		char * c = fgets(tempbuf, 128, stdin);
 	}
 
 	exit(errflag);
 }
 
 
-//
-// Determine Processor Endianess
-//
-int get_endianess(void)
-{
-	int i = 1;
-	char * p = (char *)&i;
-
-	if (p[0] == 1)
-		return ENDIANNESS_LITTLE;
-
-	return ENDIANNESS_BIG;
-}
-
-
-//
-// Application Code Starts Here
-//
 int main(int argc, char * argv[])
 {
-	char * s = NULL;				// String pointer for "getenv"
-	struct HREC * utemp;			// Temporary hash record pointer
-	struct OHEADER * header;		// Pointer to output header structure
-
-	endian = get_endianess();		// Get processor endianess
 	cmdlnexec = argv[0];			// Obtain executable name
-	s = getenv("RLNPATH");
+	char * s = getenv("RLNPATH");	// Attempt to obtain env variable
 
-	if (s)							// Attempt to obtain env variable
+	if (s)
 		strcpy(libdir, s);			// Store it if found
 
 	// Initialize some vars
@@ -3194,12 +3066,12 @@ int main(int argc, char * argv[])
 	if (doargs(argc, argv))
 	{
 		errflag = 1;
-		rln_exit();
+		ExitLinker();
 	}
 
 	if (!zflag && !vflag)
 	{
-		display_version();			// Display version information
+		ShowVersion();				// Display version information
 		versflag = 1;				// We've dumped the version banner
 	}
 
@@ -3207,21 +3079,21 @@ int main(int argc, char * argv[])
 	if (ProcessFiles())
 	{
 		errflag = 1;
-		rln_exit();
+		ExitLinker();
 	}
 
 	// Work in items in processing list & deal with unresolved list
 	if (ProcessLists())
 	{
 		errflag = 1;
-		rln_exit();
+		ExitLinker();
 	}
 
 	// Check that there is something to link
 	if (olist == NULL)
 	{
-		display_help();
-		rln_exit();
+		ShowHelp();
+		ExitLinker();
 	}
 
 	// Report unresolved externals
@@ -3232,12 +3104,12 @@ int main(int argc, char * argv[])
 		// Don't list them if two -u's or more
 		if (uflag < 2)
 		{
-			utemp = unresolved;
+			struct HREC * utemp = unresolved;
 
 			while (utemp != NULL)
 			{
-				printf("\t%s (",utemp->h_sym);
-				put_name(utemp->h_ofile);
+				printf("\t%s (", utemp->h_sym);
+				WriteARName(utemp->h_ofile);
 				printf(")\n");
 				utemp = utemp->h_next;
 			}
@@ -3246,54 +3118,47 @@ int main(int argc, char * argv[])
 		if (!uflag)
 		{
 			errflag = 1;
-			rln_exit();
+			ExitLinker();
 		}
 	}
 
-	// Make one output file from input objs
-	header = make_ofile();
+	// Make one output object from input objects
+	struct OHEADER * header = MakeOutputObject();
 
 	if (header == NULL)
 	{
 		errflag = 1;
-		rln_exit();
+		ExitLinker();
 	}
 
 	// Partial linking
 	if (pflag)
 	{
-		printf("TO DO:Partial linking\n");
+		printf("TO DO: Partial linking\n");
 		errflag = 1;
 	}
 	// Relocatable linking
 	else if (!aflag)
 	{
-		printf("TO DO:Relocatable linking\n");
+		printf("TO DO: Relocatable linking\n");
 		errflag = 1;
 	}
 	// Absolute linking
 	else
 	{
 		if (vflag)
-		{
-			printf("Absolute linking ");
-
-			if (cflag)
-				printf("(COF)\n"); 
-			else
-				printf("(ABS)\n");
-		}
+			printf("Absolute linking (%s)\n", (cflag ? "COF" : "ABS"));
 
 		if (vflag > 1)
 			printf("Header magic is 0x%04X\n", (unsigned int)header->magic);
 
-		if (write_ofile(header))
+		if (WriteOutputFile(header))
 			errflag = 1;
 	}
 
 	// Display the loaded symbols map
 	if (mflag)
-		if (write_map(header))
+		if (ShowSymbolLoadMap(header))
 			errflag = 1;
 
 	// Display segment size summary
@@ -3307,9 +3172,7 @@ int main(int argc, char * argv[])
 		printf("+---------+----------+----------+----------+\n\n");
 	}
 
-//printf("BIG_ENDIAN = %i, LITTLE_ENDIAN = %i\n", BIG_ENDIAN, LITTLE_ENDIAN);
-
 	free(header);
-	rln_exit();
+	ExitLinker();
 }