]> Shamusworld >> Repos - rln/blobdiff - rln.c
Added preliminary ar (*.a) archive support.
[rln] / rln.c
diff --git a/rln.c b/rln.c
index e41042fb6b7079da3c32e6fd347b8a64d7224c46..97c2cd2fcbeca30338e6d97e8e23a42adbc68382 100644 (file)
--- a/rln.c
+++ b/rln.c
@@ -1,84 +1,91 @@
 //
 // RLN - Reboot's Linker for the Atari Jaguar Console System
 // RLN.C - Application Code
-// Copyright (C) 199x, Allan K. Pratt, 2011 Reboot & Friends
+// Copyright (C) 199x, Allan K. Pratt, 2014 Reboot & Friends
 //
 
 #include "rln.h"
 
-unsigned errflag = 0;                  // Error flag, goes TRUE on error
-unsigned waitflag = 0;                  // Wait for any keypress flag
-unsigned versflag = 0;                  // Version banner has been shown flag
-unsigned aflag = 0;                     // Absolute linking flag
-unsigned bflag = 0;                     // Don't remove mulitply def locals flag
-unsigned cflag = 0;                     // COF executable
-unsigned dflag = 0;                     // Wait for key after link flag
-unsigned gflag = 0;                     // Source level debug include flag
-unsigned lflag = 0;                     // Add local symbols to output flag
-unsigned mflag = 0;                     // Produce symbol load map flag
-unsigned oflag = 0;                     // Output filename specified
-unsigned rflag = 0;                     // Segment alignment size flag
-unsigned sflag = 0;                     // Output only global symbols
-unsigned vflag = 0;                     // Verbose flag
-unsigned zflag = 0;                     // Suppress banner flag
-unsigned pflag, uflag, wflag;           // Unimplemented flags
-unsigned hd = 0;                        // Index of next file handle to fill 
-unsigned secalign = 7;                  // Section Alignment (8=phrase)
-unsigned tbase = 0;                     // TEXT base address
-unsigned dbase = 0;                     // DATA base address
-unsigned bbase = 0;                     // BSS base address
-unsigned textoffset = 0;                // COF TEXT segment offset
-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 
-int tval, dval, bval;                   // Values of these abs bases 
-int hflag[NHANDLES];                    // True for include files
-int handle[NHANDLES];                   // Open file handles 
-int textsize, datasize, bsssize;        // Cumulative segment sizes 
-char libdir[FARGSIZE * 3];              // Library directory to search
-char ofile[FARGSIZE];                   // Output file name (.o) 
-char * name[NHANDLES];                  // Associated file names 
-char * cmdlnexec = NULL;                // Executable name - pointer to ARGV[0]
-char * hsym1[SYMLEN];                   // First symbol for include files 
-char * hsym2[SYMLEN];                   // Second symbol for include files 
-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[512][FNLEN];             // Object file names
-unsigned obj_segsize[512][3];           // Object file seg sizes; TEXT,DATA,BSS
-unsigned obj_index = 0;                 // Object file index/count   
-struct HREC * htable[NBUCKETS];         // Hash table 
-struct HREC * unresolved = NULL;        // Pointer to unresolved hash list
-struct HREC * lookup(char *);           // Hash lookup
-char * ost;                             // Output symbol table
-char * ost_ptr;                         // Output symbol table; current pointer
-char * ost_end;                         // Output symbol table; end pointer
-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
+unsigned errflag = 0;                          // Error flag, goes TRUE on error
+unsigned waitflag = 0;                         // Wait for any keypress flag
+unsigned versflag = 0;                         // Version banner has been shown flag
+unsigned aflag = 0;                                    // Absolute linking flag
+unsigned bflag = 0;                                    // Don't remove mulitply def locals flag
+unsigned cflag = 0;                                    // COF executable
+unsigned dflag = 0;                                    // Wait for key after link flag
+unsigned gflag = 0;                                    // Source level debug include flag
+unsigned lflag = 0;                                    // Add local symbols to output flag
+unsigned mflag = 0;                                    // Produce symbol load map flag
+unsigned oflag = 0;                                    // Output filename specified
+unsigned rflag = 0;                                    // Segment alignment size flag
+unsigned sflag = 0;                                    // Output only global symbols
+unsigned vflag = 0;                                    // Verbose flag
+unsigned wflag = 0;                                    // Show warnings flag
+unsigned zflag = 0;                                    // Suppress banner flag
+unsigned pflag, uflag;                         // Unimplemented flags
+unsigned hd = 0;                                       // Index of next file handle to fill
+unsigned secalign = 7;                         // Section Alignment (8=phrase)
+unsigned tbase = 0;                                    // TEXT base address
+unsigned dbase = 0;                                    // DATA base address
+unsigned bbase = 0;                                    // BSS base address
+unsigned textoffset = 0;                       // COF TEXT segment offset
+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
+int tval, dval, bval;                          // Values of these abs bases
+int hflag[NHANDLES];                           // True for include files
+int handle[NHANDLES];                          // Open file handles
+int textsize, datasize, bsssize;       // Cumulative segment sizes
+char libdir[FARGSIZE * 3];                     // Library directory to search
+char ofile[FARGSIZE];                          // Output file name (.o)
+char * name[NHANDLES];                         // Associated file names
+char * cmdlnexec = NULL;                       // Executable name - pointer to ARGV[0]
+char * hsym1[SYMLEN];                          // First symbol for include files
+char * hsym2[SYMLEN];                          // Second symbol for include files
+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[2048][FNLEN];           // Object file names
+unsigned obj_segsize[2048][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
+struct HREC * unresolved = NULL;       // Pointer to unresolved hash list
+struct HREC * lookup(char *);          // Hash lookup
+char * ost;                                                    // Output symbol table
+char * ost_ptr;                                                // Output symbol table; current pointer
+char * ost_end;                                                // Output symbol table; end pointer
+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
+
+// Some human readable defines for endianess
+#define ENDIANNESS_BIG     1
+#define ENDIANNESS_LITTLE  0
 
 
 //
 // Get a Long Word from Memory
 //
-unsigned getlong(char * src)
+uint32_t getlong(uint8_t * src)
 {
-       unsigned temp;
-       char * out;
-               
-       out = (char *)&temp;
+       uint32_t temp;
+       uint8_t * out;
 
-       if (endian == 1)
+       out = (uint8_t *)&temp;
+
+       if (endian == ENDIANNESS_BIG)
        {
                *out++ = src[0];
                *out++ = src[1];
@@ -100,28 +107,33 @@ unsigned getlong(char * src)
 //
 // Put a Long Word into Memory
 //
-void putlong(char * dest, unsigned val)
+void putlong(uint8_t * dest, uint32_t val)
 {
-       *dest++ = (char)(val >> 24);
-       *dest++ = (char)(val >> 16);
-       *dest++ = (char)(val >> 8);
-       *dest = (char)val;
+       *dest++ = (uint8_t)(val >> 24);
+       *dest++ = (uint8_t)(val >> 16);
+       *dest++ = (uint8_t)(val >> 8);
+       *dest = (uint8_t)val;
 }
 
 
 //
 // Get a Word from Memory
 //
-int getword(char * src)
+uint16_t getword(uint8_t * src)
 {
-       unsigned temp;
-       char * out;
+       uint16_t temp;
+       uint8_t * out = (uint8_t *)&temp;
 
-       out = (char *)&temp;
-       *out++ = src[1];
-       *out++ = src[0];
-       *out++ = 0;
-       *out = 0;
+       if (endian == ENDIANNESS_BIG)
+       {
+               out[0] = src[0];
+               out[1] = src[1];
+       }
+       else
+       {
+               out[0] = src[1];
+               out[1] = src[0];
+       }
 
        return temp;
 }
@@ -130,25 +142,23 @@ int getword(char * src)
 //
 // Put a Word into Memory
 //
-void putword(char * dest, int val)
+void putword(uint8_t * dest, uint16_t val)
 {
-       *dest++ = (char)(val >> 8);
-       *dest = (char)val;
+       *dest++ = (uint8_t)(val >> 8);
+       *dest = (uint8_t)val;
 }
 
 
 //
-// Obtain a File's Size
+// Find passed in file's length in bytes
+// N.B.: This also resets the file's pointer to the start of the file
 //
-long FSIZE(int fd)
+long FileSize(int fd)
 {
-       unsigned temp, hold;
+       long size = lseek(fd, 0, SEEK_END);
+       lseek(fd, 0, SEEK_SET);
 
-       temp = lseek(fd, 0L, SEEK_CUR);
-       hold = lseek(fd, 0L, SEEK_END);
-       lseek(fd, 0L, SEEK_SET);
-
-       return hold;
+       return size;
 }
 
 
@@ -158,206 +168,225 @@ long FSIZE(int fd)
 //
 int dosym(struct OFILE * ofile)
 {
-   char * symptr;                                            // Symbol pointer
-   char * symend;                                            // Symbol end pointer
-   int type;                                                // Symbol type
-   long value;                                              // Symbol value
-   int index;                                               // Symbol index
-   int j;                                                   // Iterator
-   int ssidx;                                               // Segment size table index
-   unsigned tsegoffset;                                     // Cumulative TEXT segment offset
-   unsigned dsegoffset;                                     // Cumulative DATA segment offset
-   unsigned bsegoffset;                                     // Cumulative BSS segment offset
-   struct HREC * hptr;                                       // Hash table pointer for globl/extrn
-   char sym[SYMLEN];                                        // String for symbol name/hash search
-
-   // Point to first symbol record in the object file
-   symptr = (ofile->o_image + 32 +
-             ofile->o_header.tsize +
-             ofile->o_header.dsize +
-             ofile->o_header.absrel.reloc.tsize +
-             ofile->o_header.absrel.reloc.dsize);
-
-   // Point to end of symbol record in the object file
-   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.
-   ssidx = -1;                                              // Initialise segment index
-   tsegoffset = dsegoffset = bsegoffset = 0;                // Initialise segment offsets
-
-   for(j=0; j<(int)obj_index; j++)
-   {                    // Search for object file name
-      if (!strcmp(ofile->o_name, obj_fname[j]))
-         {
-         ssidx = j;                                         // Object file name found
-         break;
-      }
-
-      tsegoffset += obj_segsize[j][0];                      // Accumulate segment sizes
-      dsegoffset += obj_segsize[j][1];
-      bsegoffset += obj_segsize[j][2];
-   }
-
-   if (ssidx == -1)
-   {
-      printf("dosym() : Cannot get object file segment size : %s\n", ofile->o_name);
-      return 1;
-   }   
-
-   // Process each record in the 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
-
-      // Global/External symbols have a pre-processing stage
-      if (type & 0x01000000)
-         {
-         // Obtain the string table index for the relocation symbol, look 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.
-         memset(sym, 0, SYMLEN);          
-         strcpy(sym, symend + index);
-         hptr = lookup(sym);
-
-                if (hptr == NULL)
-                {
-            printf("dosym() : Cannot determine symbol : %s\n", sym);
-            return 1;
-         }
-
-         // 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;                                        // Initialise segment index
-         tsegoffset = dsegoffset = bsegoffset = 0;          // Initialise segment offsets
-
-         for(j=0; j<(int)obj_index; j++)
-                {              // Search for object filename
-            if (!strcmp((const char *)hptr->h_ofile, obj_fname[j]))
+       char * symptr;                          // Symbol pointer
+       char * symend;                          // Symbol end pointer
+       int type;                                       // Symbol type
+       long value;                                     // Symbol value
+       int index;                                      // Symbol index
+       int j;                                          // Iterator
+       int ssidx;                                      // Segment size table index
+       unsigned tsegoffset;            // Cumulative TEXT segment offset
+       unsigned dsegoffset;            // Cumulative DATA segment offset
+       unsigned bsegoffset;            // Cumulative BSS segment offset
+       struct HREC * hptr;                     // Hash table pointer for globl/extrn
+       char sym[SYMLEN];                       // String for symbol name/hash search
+
+       // Point to first symbol record in the object file
+       symptr = (ofile->o_image + 32
+               + ofile->o_header.tsize
+               + ofile->o_header.dsize
+               + ofile->o_header.absrel.reloc.tsize
+               + ofile->o_header.absrel.reloc.dsize);
+
+       // Point to end of symbol record in the object file
+       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.
+       ssidx = -1;                                                                     // Initialise segment index
+       tsegoffset = dsegoffset = bsegoffset = 0;       // Initialise segment offsets
+
+       // Search for object file name
+       for(j=0; j<(int)obj_index; j++)
+       {
+               if (!strcmp(ofile->o_name, obj_fname[j]))
+               {
+                       ssidx = j;                                                      // Object file name found
+                       break;
+               }
+
+               tsegoffset += obj_segsize[j][0];                // Accumulate segment sizes
+               dsegoffset += obj_segsize[j][1];
+               bsegoffset += obj_segsize[j][2];
+       }
+
+       if (ssidx == -1)
+       {
+               printf("dosym() : Cannot get object file segment size : %s\n", ofile->o_name);
+               return 1;
+       }
+
+       // Process each record in the 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
+
+               // Global/External symbols have a pre-processing stage
+               if (type & 0x01000000)
+               {
+                       // Obtain the string table index for the relocation symbol, look
+                       // 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.
+                       memset(sym, 0, SYMLEN);
+                       strcpy(sym, symend + index);
+                       hptr = lookup(sym);
+
+                       if (hptr == NULL)
+                       {
+                               printf("dosym() : Cannot determine symbol : %s\n", sym);
+                               return 1;
+                       }
+
+                       // 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;                                                                     // Initialise segment index
+                       tsegoffset = dsegoffset = bsegoffset = 0;       // Initialise segment offsets
+
+                       for(j=0; j<(int)obj_index; j++)
+                       {              // Search for object filename
+                               if (!strcmp((const char *)hptr->h_ofile, obj_fname[j]))
+                               {
+                                       ssidx = j;                                      // Symbol object filename
+                                       break;
+                               }
+
+                               tsegoffset += obj_segsize[j][0];                // Accumulate segment sizes
+                               dsegoffset += obj_segsize[j][1];
+                               bsegoffset += obj_segsize[j][2];
+                       }
+
+                       if (ssidx == -1)
+                       {
+                               printf("dosym() : Cannot get object file segment size : %s\n",
+                                       ofile->o_name);
+                               return 1;
+                       }
+
+                       type = hptr->h_type;                            // Update type with global type
+
+                       if (type == 0x03000000)
+                               type = 0x02000000;                              // Reset external flag if absolute
+
+                       // If the global/external has a value then update that vaule in
+                       // accordance with the segment sizes of the object file it
+                       // originates from
+                       if (hptr->h_value)
+                       {
+                               switch (hptr->h_type & 0x0E000000)
+                               {
+                               case 0x02000000:                                // Absolute value
+                               case 0x04000000:                                // TEXT segment
+                                       value = hptr->h_value;
+                                       break;
+                               case 0x06000000:                                // DATA segment
+                                       value = hptr->h_value - (hptr->h_ofile->o_header.tsize);
+                                       break;
+                               case 0x08000000:                                // BSS segment
+                                       value = hptr->h_value
+                                               - (hptr->h_ofile->o_header.tsize + hptr->h_ofile->o_header.dsize);
+                               break;
+                               }
+                       }
+               }
+
+               // Process and update the value dependant on whether the symbol is a
+               // debug symbol or not
+               if (type & 0xF0000000)
+               {
+                       // DEBUG SYMBOL
+                       // Set the correct debug symbol base address (TEXT segment)
+                       dbgsymbase = 0;
+
+                       for(j=0; (unsigned)j<dosymi; j++)
+                               dbgsymbase += obj_segsize[j][0];
+
+                       switch (type & 0xFF000000)
+                       {
+                       case 0x64000000:
+                               value = tval + dbgsymbase;
+                               break;
+                       case 0x44000000:
+                       case 0x46000000:
+                       case 0x48000000:
+                               value = tval + dbgsymbase + value;
+                       default:
+                               break;
+                       }
+
+                       putlong(symptr + 8, value);
+               }
+               else
+               {
+                       // NON-DEBUG SYMBOL
+                       // Now make modifications to the symbol value, local or global,
+                       // based on the segment sizes of the object file currently being
+                       // processed.
+                       switch (type & T_SEG)
+                       {
+                       case 0x02000000:                                // Absolute value
+                               break;
+                       case T_TEXT:                                    // TEXT segment
+                               if (type & 0x01000000)
+                                       value = tbase + tsegoffset + value;
+                               else
+                                       value = tbase + tsegoffset + value;
+
+                               putlong(symptr + 8, value);
+                               break;
+                       case T_DATA:                                    // DATA segment
+                               if (type & 0x01000000)
+                                       value = dbase + dsegoffset + value;
+                               else
+                                       value = dbase + dsegoffset + (value - ofile->o_header.tsize);
+
+                               putlong(symptr + 8, value);
+                               break;
+                       case T_BSS:                                     // BSS segment
+                               if (type & 0x01000000)
+                                       value = bbase + bsegoffset + value;
+                               else
+                                       value = bbase + bsegoffset
+                                               + (value - (ofile->o_header.tsize + ofile->o_header.dsize));
+
+                               putlong(symptr + 8, value);
+                               break;
+                       default:
+                               break;
+                       }
+               }
+
+               // Add to output symbol table
+               if (lflag || !islocal(type))
+               {
+                       if (islocal(type) || isglobal(type))
                        {
-               ssidx = j;                                   // Symbol object filename
-               break;
-            }
-
-            tsegoffset += obj_segsize[j][0];                // Accumulate segment sizes
-            dsegoffset += obj_segsize[j][1];
-            bsegoffset += obj_segsize[j][2];
-         }
-         
-         if (ssidx == -1)
-                {
-            printf("dosym() : Cannot get object file segment size : %s\n", 
-                   ofile->o_name);
-            return 1;
-         }   
-
-         type = hptr->h_type;                               // Update type with global type
-
-         if (type == 0x03000000) 
-            type = 0x02000000;          // Reset external flag if absolute
-
-         // If the global/external has a value then update that vaule in accordance with the
-         // segment sizes of the object file it originates from
-         if (hptr->h_value)
-                {
-            switch (hptr->h_type & 0x0E000000)
+                               if ((index = ost_add(symend + index, type, value)) == -1)
+                                       return 1;
+                       }
+                       else
                        {
-               case 0x02000000:                             // Absolute value
-               case 0x04000000:                             // TEXT segment
-                  value = hptr->h_value;
-                  break;
-               case 0x06000000:                             // DATA segment
-                  value = hptr->h_value - (hptr->h_ofile->o_header.tsize);
-                  break;
-               case 0x08000000:                             // BSS segment
-                  value = hptr->h_value - 
-                          (hptr->h_ofile->o_header.tsize + hptr->h_ofile->o_header.dsize);
-               break;
-            }
-         }
-      }
-
-      // Process and update the value dependant on whether the symbol is a debug symbol or not
-      if (type & 0xF0000000)
-         {                               // DEBUG SYMBOL
-         // Set the correct debug symbol base address (TEXT segment)
-         dbgsymbase = 0;
-
-                for(j=0; (unsigned)j<dosymi; j++) 
-            dbgsymbase += obj_segsize[j][0];
-
-                switch (type & 0xFF000000)
-                {
-            case 0x64000000: 
-               value = tval + dbgsymbase; 
-               break;
-            case 0x44000000:
-            case 0x46000000:
-            case 0x48000000:
-               value = tval + dbgsymbase + value;
-            default: 
-               break;
-         }
-
-         putlong(symptr + 8, value);
-      }
-      else
-         {                                              // NON-DEBUG SYMBOL
-         // Now make modifications to the symbol value, local or global, based on the segment sizes
-         // of the object file currently being processed.
-         switch (type & T_SEG)
-                {
-            case 0x02000000:                                // Absolute value
-               break;
-            case T_TEXT:                                    // TEXT segment
-               if (type & 0x01000000) value = tbase + tsegoffset + value;
-               else value = tbase + tsegoffset + value;
-               putlong(symptr + 8, value);
-               break;
-            case T_DATA:                                    // DATA segment
-               if (type & 0x01000000) value = dbase + dsegoffset + value;
-               else value = dbase + dsegoffset + (value - ofile->o_header.tsize);
-               putlong(symptr + 8, value);
-               break;
-            case T_BSS:                                     // BSS segment
-               if (type & 0x01000000) value = bbase + bsegoffset + value;
-               else value = bbase + bsegoffset + 
-                           (value - (ofile->o_header.tsize + ofile->o_header.dsize));
-               putlong(symptr + 8, value);
-               break;
-            default:
-               break;
-         }
-      } 
-
-      // Add to output symbol table
-      if (lflag || !islocal(type))
-         {
-         if (islocal(type) || isglobal(type))
-                {
-            if ((index = ost_add(symend + index, type, value)) == -1) 
-               return 1;
-         }
-         else
-                {
-            // Belongs in OST, but don't look it up yet
-            index = -1;        
-         }
-      }
-   }
-
-   dosymi++;                                                // Increment dosym() processsing
-   return 0;
+                               // Belongs in OST, but don't look it up yet
+                               index = -1;
+                       }
+               }
+       }
+
+       // Increment dosym() processsing
+       dosymi++;
+
+       return 0;
 }
 
 
 //
-// Free Up Hash Records
+// Free up hash memory
 //
 void hash_free(void)
 {
@@ -378,26 +407,27 @@ void hash_free(void)
 }
 
 
-// 
+//
 // Add all Global and External Symbols to the Output Symbol Table
-// 
+//
 long docommon(void)
 {
-       struct HREC * hptr;                                       // Hash record pointer
-       int i;                                                   // Iterator
+       struct HREC * hptr;                                                     // Hash record pointer
+       int i;                                                                          // Iterator
 
        for(i=0; i<NBUCKETS; i++)
        {
                for(hptr=htable[i]; hptr!=NULL; hptr=hptr->h_next)
                {
-                       if (iscommon(hptr->h_type))
+//NO!                  if (iscommon(hptr->h_type))
+                       if (isglobal(hptr->h_type) || isextern(hptr->h_type))
                        {
                                if (hptr->h_type == 0x03000000)
-                                       hptr->h_type = 0x02000000;                   // Absolutes can't be externals
+                                       hptr->h_type = 0x02000000;      // Absolutes can't be externals
 
                                if (ost_add(hptr->h_sym, hptr->h_type, hptr->h_value) == -1)
                                        return -1;
-                       } 
+                       }
                }
        }
 
@@ -406,363 +436,496 @@ long docommon(void)
 
 
 //
-// Add a Symbol's Name, Type, and Value to the OST. 
+// Add a Symbol's Name, Type, and Value to the OST.
 // Return the Index of the Symbol in OST, or -1 for Error.
 //
-int ost_add(char *name, int type, long value)
+int ost_add(char * name, int type, long value)
 {
-   int ost_offset_p, ost_offset_e = 0;                      // OST table offsets for position calcs
-   int slen = 0;                                            // Symbol string length
-   int ostresult;                                           // OST index result
-
-   slen = strlen(name);
-
-   // If the OST or OST String Table has not been initialised then do so
-   if (ost_index == 0) {
-      if ((ost = malloc(OST_BLOCK)) == NULL) {
-         printf("OST memory allocation error (stringtable).\n");
-         return(-1);
-      }
-      ost_ptr = ost;                                        // Set OST start pointer
-      ost_end = ost + OST_BLOCK;                            // Set OST end pointer
-      if ((oststr = malloc(OST_BLOCK)) == NULL) {
-         printf("OST memory allocation error (string).\n");
-         return(-1);
-      }
-      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
-      oststr_end = oststr + OST_BLOCK;
-   } else {
-      // If next symbol record exceeds current allocation then expand symbol table.
-      ost_offset_p = (ost_ptr - ost);
-      ost_offset_e = (ost_end - ost);
-      if ((ost_ptr + 12) > ost_end) {                  // 3 x int (12)
-         if ((ost = realloc(ost, (unsigned)(ost_end + OST_BLOCK))) == NULL) {
-            printf("OST memory reallocation error.\n");
-            return(-1);
-         }
-         ost_ptr = ost + ost_offset_p;
-         ost_end = (ost + ost_offset_e) + OST_BLOCK;
-      }
-      ost_offset_p = (oststr_ptr - oststr);
-      ost_offset_e = (oststr_end - oststr);
-      if ((oststr_ptr + (slen+1+4)) > oststr_end) {
-         if ((oststr = realloc(oststr, (unsigned)(oststr_end + OST_BLOCK))) == NULL) {
-            printf("OSTSTR memory reallocation error.\n");
-            return(-1);
-         }
-         oststr_ptr = oststr + ost_offset_p;
-         oststr_end = (oststr + ost_offset_e) + OST_BLOCK;
-      }
-   }
-
-   // If this is a debug symbol and the include debug symbol flag (-g) is not set then do nothing
-   if ((type & 0xF0000000) && !gflag) { 
-      // Do nothing
-   } else {
-      ostresult = ost_lookup(name);                         // Get symbol index in OST
-      // If the symbol is in the output symbol table and the bflag is set (don't remove multiply 
-      // defined locals) and this is not an external/global symbol *** OR *** the symbol is not 
-      // in the output symbol table then add it.
-      if (((ostresult != -1) && bflag && !(type & 0x01000000)) || 
-         ((ostresult != -1) && gflag &&  (type & 0xF0000000)) || (ostresult == -1)) {
-         if ((type & 0xF0000000) == 0x40000000)
-            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 + 4, type );
-         putlong(ost_ptr + 8, value);
-         ost_ptr += 12;
-         // If the symbol type is anything but a debug line information symbol then write 
-         // the symbol string to the string table
-         if ((type & 0xF0000000) != 0x40000000) {
-            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
-         }
-         return(ost_index++);                               // Return OST index
-      }
-   }
-
-   return 0; // not sure about this as it could affect return indices. needed to stop return error.
+       int ost_offset_p, ost_offset_e = 0;                     // OST table offsets for position calcs
+       int slen = 0;                                                           // Symbol string length
+       int ostresult;                                                          // OST index result
+
+       slen = strlen(name);
+
+       // If the OST or OST String Table has not been initialised then do so
+       if (ost_index == 0)
+       {
+               if ((ost = malloc(OST_BLOCK)) == NULL)
+               {
+                       printf("OST memory allocation error (stringtable).\n");
+                       return -1;
+               }
+
+               ost_ptr = ost;                                                  // Set OST start pointer
+               ost_end = ost + OST_BLOCK;                              // Set OST end pointer
+
+               if ((oststr = malloc(OST_BLOCK)) == NULL)
+               {
+                       printf("OST memory allocation error (string).\n");
+                       return -1;
+               }
+
+               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
+               oststr_end = oststr + OST_BLOCK;
+       }
+       else
+       {
+               // If next symbol record exceeds current allocation then expand symbol
+               // table.
+               ost_offset_p = (ost_ptr - ost);
+               ost_offset_e = (ost_end - ost);
+
+               // 3 x int (12)
+               if ((ost_ptr + 12) > ost_end)
+               {
+#warning "!!! Bad logic in realloc call !!!"
+                       if ((ost = realloc(ost, (ost_end + OST_BLOCK))) == NULL)
+                       {
+                               printf("OST memory reallocation error.\n");
+                               return -1;
+                       }
+
+                       ost_ptr = ost + ost_offset_p;
+                       ost_end = (ost + ost_offset_e) + OST_BLOCK;
+               }
+
+               ost_offset_p = (oststr_ptr - oststr);
+               ost_offset_e = (oststr_end - oststr);
+
+               if ((oststr_ptr + (slen + 1 + 4)) > oststr_end)
+               {
+#warning "!!! Bad logic in realloc call !!!"
+                       if ((oststr = realloc(oststr, (oststr_end + OST_BLOCK))) == NULL)
+                       {
+                               printf("OSTSTR memory reallocation error.\n");
+                               return -1;
+                       }
+
+                       oststr_ptr = oststr + ost_offset_p;
+                       oststr_end = (oststr + ost_offset_e) + OST_BLOCK;
+               }
+       }
+
+       // If this is a debug symbol and the include debug symbol flag (-g) is not
+       // set then do nothing
+       if ((type & 0xF0000000) && !gflag)
+       {
+               // Do nothing
+       }
+       else
+       {
+               ostresult = ost_lookup(name);           // Get symbol index in OST
+
+               // If the symbol is in the output symbol table and the bflag is set
+               // (don't remove multiply defined locals) and this is not an
+               // external/global symbol *** OR *** the symbol is not in the output
+               // symbol table then add it.
+               if (((ostresult != -1) && bflag && !(type & 0x01000000))
+                       || ((ostresult != -1) && gflag && (type & 0xF0000000)) || (ostresult == -1))
+               {
+                       if ((type & 0xF0000000) == 0x40000000)
+                               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 + 4, type );
+                       putlong(ost_ptr + 8, value);
+                       ost_ptr += 12;
+
+                       // If the symbol type is anything but a debug line information
+                       // symbol then write the symbol string to the string table
+                       if ((type & 0xF0000000) != 0x40000000)
+                       {
+                               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
+                       }
+
+                       if (vflag > 1)
+                       {
+                               printf("ost_add: (%s), type=$%08X, val=$%08X\n", name, type, value);
+                       }
+
+                       return ost_index++;
+               }
+       }
+
+       // Not sure about this as it could affect return indices. Needed to stop
+       // return error.
+       return 0;
 }
 
+
 //
-// Return the Index of a Symbol in the Output Symbol Table -------------------------------------
+// Return the Index of a Symbol in the Output Symbol Table
 //
+int ost_lookup(char * sym)
+{
+       int i;                          // Iterator
+       int stro = 4;           // Offset in string table
 
-int ost_lookup(char *sym) {
-   int i;                                                   // Iterator
-   int stro = 4;                                            // Offset in string table
+       for(i=0; i<ost_index; i++)
+       {
+               if (strcmp(oststr + stro, sym) == 0)
+                       return i + 1;
 
-   for(i = 0; i < ost_index; i++) {
-      if (!strcmp(oststr+stro, sym)) {
-         return(i+1);
-      } else {
-         stro += strlen(oststr+stro) + 1;
-      }
-   }
+               stro += strlen(oststr + stro) + 1;
+       }
 
-   return(-1);
+       return -1;
 }
 
+
 //
-// Add Unresolved Externs to the Output Symbol Table -------------------------------------------
+// Add Unresolved Externs to the Output Symbol Table
 //
+int dounresolved(void)
+{
+       struct HREC * hptr, * htemp;            // Hash record pointers
+       hptr = unresolved;                                      // Point to unresolved symbols list
+
+       // While unresolved list is valid
+       while (hptr != NULL)
+       {
+               if (ost_add(hptr->h_sym, T_EXT, 0L) == -1)
+                       return 1;
+
+               if (vflag > 1)
+                       printf("dounresolved(): added %s\n", hptr->h_sym);
 
-int dounresolved(void) {
-   struct HREC *hptr, *htemp;                               // Hash record pointers
+               htemp = hptr->h_next;                   // Temporarily get ptr to next record
+               free(hptr);                                             // Free current record
+               hptr = htemp;                                   // Make next record ptr, current
+       }
 
-   hptr = unresolved;                                       // Point to unresolved symbols list
-   
-   while (hptr != NULL) {                                    // While unresolved list is valid
-      if (ost_add(hptr->h_sym, T_EXT, 0L) == -1) return 1;
-          htemp = hptr->h_next;                                 // Temporarily get ptr to next record
-          free(hptr);                                           // Free current record
-          hptr = htemp;                                         // Make next record ptr, current
-   }
-   
-   unresolved = NULL;                                       // Zero unresolved record list
-   
-   return 0;
+       unresolved = NULL;                                      // Zero unresolved record list
+       return 0;
 }
-    
-// -------------------------------------------------------------------------------------------------
-// Update Object File TEXT and DATA Segments Based on Relocation Records. Take in an OFILE header 
-// and flag (T_TEXT, T_DATA) to process. Return (0) is successful or non-zero (1) if failed.
-// -------------------------------------------------------------------------------------------------
-
-int reloc_segment(struct OFILE *ofile, int flag) {
-   char *symtab;                                            // Start of symbol table 
-   char *symbols;                                           // Start of symbols
-   char *sptr;                                              // Start of segment data
-   char *rptr;                                              // Start of segment relocation records
-   unsigned symidx;                                         // Offset to symbol
-   unsigned addr;                                           // Relocation address
-   unsigned rflg;                                           // Relocation flags
-   unsigned olddata;                                        // Old segment data at reloc address
-   unsigned newdata = 0;                                    // New segment data at reloc address
-   unsigned pad;                                            // Temporary to calculate phrase padding
-   int i;                                                   // Iterator
-   char sym[SYMLEN];                                        // String for symbol name/hash search
-   int ssidx;                                               // Segment size table index
-   unsigned glblreloc;                                      // Global relocation flag
-   unsigned absreloc;                                       // Absolute relocation flag
-   unsigned relreloc;                                       // Relative relocation flag
-   unsigned swcond;                                         // Switch statement condition
-   unsigned relocsize;                                      // Relocation record size
-
-   // If there is no TEXT relocation data for the selected object file segment then update the COF
-   // TEXT segment offset allowing for the phrase padding
-   if ((flag == T_TEXT) && !ofile->o_header.absrel.reloc.tsize) {
-      pad = ((ofile->o_header.tsize+secalign) & ~secalign); // TEXT segment size plus padding
-      textoffset += (ofile->o_header.tsize + (pad - ofile->o_header.tsize)); 
-      if (vflag > 1) {                                       // Verbose mode information
-         printf("reloc_segment(%s, TEXT) : No Relocation Data\n", ofile->o_name);
-      }
-      return 0;
-   }
-
-   // If there is no DATA relocation data for the selected object file segment then update the COF
-   // DATA and BSS segment offsets allowing for the phrase padding
-   if ((flag == T_DATA) && !ofile->o_header.absrel.reloc.dsize) {
-      pad = ((ofile->o_header.dsize+secalign) & ~secalign); // DATA segment size plus padding
-      dataoffset += (ofile->o_header.dsize + (pad - ofile->o_header.dsize));
-      pad = ((ofile->o_header.bsize+secalign) & ~secalign); // BSS segment size plus padding
-      bssoffset += (ofile->o_header.bsize + (pad - ofile->o_header.bsize));
-      if (vflag > 1) {                                       // Verbose mode information
-         printf("reloc_segment(%s, DATA) : No Relocation Data\n", ofile->o_name);
-      }
-      return 0;
-   }
-
-   // Verbose mode information
-   if (vflag > 1) {                                              
-      printf("reloc_segment(%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 + ofile->o_header.dsize +
-             ofile->o_header.absrel.reloc.tsize + ofile->o_header.absrel.reloc.dsize);                                        
-
-   // Obtain pointer to start of symbols
-   symbols = symtab + ofile->o_header.ssize;
-
-   // Obtain pointer to start of TEXT segment
-   sptr = ofile->o_image + 32;                              
-
-   // Obtain pointer to start of TEXT relocation records
-   rptr = sptr + (ofile->o_header.tsize + ofile->o_header.dsize);
-
-   relocsize = ofile->o_header.absrel.reloc.tsize;
-
-   // Update pointers if DATA relocation records are being processed
-   if (flag == T_DATA) {                                     
-      sptr += ofile->o_header.tsize;                        // Start of DATA segment
-      rptr += ofile->o_header.absrel.reloc.tsize;           // Start of DATA relocation records
-      relocsize = ofile->o_header.absrel.reloc.dsize;
-   }
-
-   // Process each relocation record for the TEXT segment
-   for(i = 0; i < (int)relocsize; i += 8) {
-      // Obtain both the relocation address and the relocation flags from the object file image
-      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
-
-      // Additional processing required for global relocations
-      if (glblreloc) {                                    
-         // Obtain the string table index for the relocation symbol, look 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));
-         memset(sym, 0, SYMLEN);          
-         strcpy(sym, symbols + symidx);
-         olddata = newdata = 0;                             // Initialise old and new segment data
-         ssidx = ost_lookup(sym);
-         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);
-      if (rflg & 0x01) olddata = _SWAPWORD(olddata);
-
-      // Process record dependant on segment it relates to; TEXT, DATA or BSS. Construct a new
-      // relocated segment long word based on the required segment base address, the segment
-      // data offset in the resulting COF file and the offsets from the incoming object file.
-      //swcond = glblreloc ? ((hptr->h_type & 0x0E000000) >> 16) : (rflg & 0xFFFFFF00);
-      swcond = (rflg & 0xFFFFFF00);
-      if (!glblreloc) {
-         switch (swcond) {
-            case 0x00000200:                                // Absolute Value
-               break;
-            case 0x00000400:                                // TEXT segment relocation record
-               if (!glblreloc) 
-                  if (flag == T_TEXT) newdata = tbase + textoffset + olddata;
-                  else newdata = tbase + dataoffset + olddata;
-               break;
-            case 0x00000600:                                // DATA segment relocation record
-                  if (!glblreloc) newdata = dbase + dataoffset + (olddata - ofile->o_header.tsize);
-               break;
-            case 0x00000800:                                // BSS segment relocation record
-               if (!glblreloc) newdata = bbase + bssoffset + 
-                              (olddata - (ofile->o_header.tsize + ofile->o_header.dsize));
-               break;
-         }
-      } else {
-                 if (!relreloc) newdata += olddata;
-      }
-         // Set absolute (long) or relative (word) address of symbol
-      if (absreloc) {
-         // Flip the new long word segment data if the relocation record indicated a RISC MOVEI 
-         // instruction and place the resulting data back in the COF segment
-         if (rflg & 0x01) newdata = _SWAPWORD(newdata);
-
-         putlong(sptr + addr, newdata);
-
-      }
-      else if (relreloc) {
-                putword(sptr + addr, newdata - tbase - addr - ofile->o_tbase);
-         }
-
-      rptr += 8;                                            // Point to the next relocation record
-   }
-
-   // Update the COF segment offset allowing for the phrase padding.
-   if (flag == T_TEXT) {                                     
-      pad = ((ofile->o_header.tsize+secalign) & ~secalign); // TEXT segment plus padding
-      textoffset += (ofile->o_header.tsize + (pad - ofile->o_header.tsize));
-   } else {
-      pad = ((ofile->o_header.dsize+secalign) & ~secalign); // DATA segment plus padding
-      dataoffset += (ofile->o_header.dsize + (pad - ofile->o_header.dsize));
-      pad = ((ofile->o_header.bsize+secalign) & ~secalign); // BSS segment plus padding
-      bssoffset += (ofile->o_header.bsize + (pad - ofile->o_header.bsize)); 
-   }
-
-   return 0;                                               // Return value, should always be zero
+
+
+//
+// Update Object File TEXT and DATA Segments Based on Relocation Records. Take
+// in an OFILE header and flag (T_TEXT, T_DATA) to process. Return (0) is
+// successful or non-zero (1) if failed.
+//
+int reloc_segment(struct OFILE * ofile, int flag)
+{
+       char * symtab;                                  // Start of symbol table
+       char * symbols;                                 // Start of symbols
+       char * sptr;                                    // Start of segment data
+       char * rptr;                                    // Start of segment relocation records
+       unsigned symidx;                                // Offset to symbol
+       unsigned addr;                                  // Relocation address
+       unsigned rflg;                                  // Relocation flags
+       unsigned olddata;                               // Old segment data at reloc address
+       unsigned newdata = 0;                   // New segment data at reloc address
+       unsigned pad;                                   // Temporary to calculate phrase padding
+       int i;                                                  // Iterator
+       char sym[SYMLEN];                               // String for symbol name/hash search
+       int ssidx;                                              // Segment size table index
+       unsigned glblreloc;                             // Global relocation flag
+       unsigned absreloc;                              // Absolute relocation flag
+       unsigned relreloc;                              // Relative relocation flag
+       unsigned swcond;                                // Switch statement condition
+       unsigned relocsize;                             // Relocation record size
+
+       // If there is no TEXT relocation data for the selected object file segment
+       // 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("reloc_segment(%s, TEXT) : No Relocation Data\n", ofile->o_name);
+
+               return 0;
+       }
+
+       // If there is no DATA relocation data for the selected object file segment
+       // then update the COF DATA and BSS segment offsets allowing for the phrase
+       // padding
+       if ((flag == T_DATA) && !ofile->o_header.absrel.reloc.dsize)
+       {
+               // 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("reloc_segment(%s, DATA) : No Relocation Data\n", ofile->o_name);
+
+               return 0;
+       }
+
+       // Verbose mode information
+       if (vflag > 1)
+       {
+               printf("reloc_segment(%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 + ofile->o_header.dsize
+               + ofile->o_header.absrel.reloc.tsize + ofile->o_header.absrel.reloc.dsize);
+
+       // Obtain pointer to start of symbols
+       symbols = symtab + ofile->o_header.ssize;
+
+       // Obtain pointer to start of TEXT segment
+       sptr = ofile->o_image + 32;
+
+       // Obtain pointer to start of TEXT relocation records
+       rptr = sptr + (ofile->o_header.tsize + ofile->o_header.dsize);
+
+       relocsize = ofile->o_header.absrel.reloc.tsize;
+
+    if (vflag)
+    {
+        printf("RELOCSIZE :: %d  Records = %d\n",relocsize,relocsize/8);
+    }
+
+       // Update pointers if DATA relocation records are being processed
+       if (flag == T_DATA)
+       {
+               sptr += ofile->o_header.tsize;              // Start of DATA segment
+               rptr += ofile->o_header.absrel.reloc.tsize; // Start of DATA relocation records
+               relocsize = ofile->o_header.absrel.reloc.dsize;
+       }
+
+       // Process each relocation record for the TEXT segment
+       for(i=0; i<(int)relocsize; i+=8)
+       {
+               // Obtain both the relocation address and the relocation flags from the
+               // object file image
+               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
+
+               // Additional processing required for global relocations
+               if (glblreloc)
+               {
+                       // Obtain the string table index for the relocation symbol, look
+                       // 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));
+                       memset(sym, 0, SYMLEN);
+                       strcpy(sym, symbols + symidx);
+                       olddata = newdata = 0;              // Initialise old and new segment data
+                       ssidx = ost_lookup(sym);
+                       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);
+
+               if (rflg & 0x01)
+                       olddata = _SWAPWORD(olddata);
+
+               // Process record dependant on segment it relates to; TEXT, DATA or
+               // BSS. Construct a new relocated segment long word based on the
+               // required segment base address, the segment data offset in the
+               // resulting COF file and the offsets from the incoming object file.
+               //swcond = glblreloc ? ((hptr->h_type & 0x0E000000) >> 16) : (rflg & 0xFFFFFF00);
+               swcond = (rflg & 0xFFFFFF00);
+
+               if (!glblreloc)
+               {
+                       switch (swcond)
+                       {
+                       case 0x00000200:                    // Absolute Value
+                               break;
+                       case 0x00000400:                    // TEXT segment relocation record
+//AARRRGGGGHHHHH! does the else belong to the 1st 'if' or the 2nd?
+// can we trust the indention to tell the truth here???
+// Braces were not here, so if something breaks, try pairing the else to the 1st 'if'...
+                               if (!glblreloc)
+                               {
+                                       if (flag == T_TEXT)     // Is this a TEXT section record?
+                                               newdata = tbase + textoffset + olddata;
+                                       else
+                                               newdata = tbase + dataoffset + olddata; // Nope, must be DATA section
+                               }
+
+                               break;
+                       case 0x00000600:                    // DATA segment relocation record
+                               if (!glblreloc)
+                                       newdata = dbase + dataoffset + (olddata - ofile->o_header.tsize);
+
+                               break;
+                       case 0x00000800:                    // BSS segment relocation record
+                               if (!glblreloc)
+                                       newdata = bbase + bssoffset
+                                               + (olddata - (ofile->o_header.tsize + ofile->o_header.dsize));
+
+                               break;
+                       }
+               }
+               else
+               {
+                       if (!relreloc)
+                               newdata += olddata;
+               }
+
+               // Set absolute (long) or relative (word) address of symbol
+               if (absreloc)
+               {
+                       // Flip the new long word segment data if the relocation record
+                       // indicated a RISC MOVEI instruction and place the resulting data
+                       // back in the COF segment
+                       if (rflg & 0x01)
+                               newdata = _SWAPWORD(newdata);
+
+                       putlong(sptr + addr, newdata);
+               }
+               else if (relreloc)
+               {
+                       putword(sptr + addr, newdata - tbase - addr - ofile->o_tbase);
+               }
+
+               // Shamus: Let's output some info to aid in debugging this crap
+               if (vflag > 1)
+               {
+                       char ssiString[128];
+                       ssiString[0] = 0;
+
+                       if (glblreloc)
+                               sprintf(ssiString, " [ssi:%i]", ssidx);
+
+                       printf("reloc_segment($%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)
+       {
+               // 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));
+       }
+
+       // Return value, should always be zero
+       return 0;
 }
 
+
 //
-// -------------------------------------------------------------------------------------------------
-// Add a path character to the end of string 's' if it doesn't already end with one.
-// The last occurrance of '/' or '\\' in the string is assumed to be the path character.
-// -------------------------------------------------------------------------------------------------
+// Add a path character to the end of string 's' if it doesn't already end with
+// one. The last occurrance of '/' or '\\' in the string is assumed to be the
+// path character.
 //
+void pathadd(char * s)
+{
+       // And hope to God that there's enough space in the buffer...
+       char pathchar = 0;
 
-void pathadd(char *s) {
-   char pathchar = 0;
+       while (*s)
+       {
+               if (*s == '/' || *s == '\\')
+                       pathchar = *s;
+
+               s++;
+       }
+
+       s--;
 
-   while (*s) {
-          if (*s == '/' || *s == '\\') pathchar = *s;
-      s++;
-   }
-   s--;
-   if (*s == pathchar) return;
+       if (*s == pathchar)
+               return;
 
-   *++s = pathchar;
-   *++s = 0;
+       *++s = pathchar;
+       *++s = 0;
 }
 
+
+//
+// Try to open "name", "name.o", "${libdir}name", "${libdir}name.o". Return the
+// handle of the file successfully opened. p_name is updated to point to a
+// malloc()'ed string which is the name which actually got opened. p_name will
+// return unchanged if the file can't be found.
 //
-// -------------------------------------------------------------------------------------------------
-// Try to open "name", "name.o", "${libdir}name", "${libdir}name.o". Return the handle of the file 
-// successfully opened. p_name is updated to point to a malloc()'ed string which is the name which 
-// actually got opened. p_name will return unchanged if the file can't be found.
-// -------------------------------------------------------------------------------------------------
-//
-
-int tryopen(char **p_name) {
-   char *name = *p_name;                                    // Filename
-   char *tmpbuf, *lastdot;                                  // Buffer and 'dot' pointers
-   int fd, hasdot;                                          // File descriptor and 'has dot' flag
-
-   // Note that libdir will be an empty string if there is none specified 
-   if ((tmpbuf = malloc((long)strlen(name) + strlen(libdir) + 3)) == NULL) {
-      printf("tryopen() : out of memory\n");
-      return(-1);
-   }
-   strcpy(tmpbuf, name);
-    
-   hasdot = ((lastdot = strrchr(tmpbuf, '.')) > strrchr(tmpbuf, '/')) && 
-            (lastdot > strrchr(tmpbuf, '\\'));
-
-   if ((fd = open(tmpbuf, _OPEN_FLAGS)) >= 0) goto ok;       // Try to open file as passed first
-   if (!hasdot) {                                         
-      strcat(tmpbuf, ".o");                                 // Try to open file with '.o' added
-      if ((fd = open(tmpbuf, _OPEN_FLAGS)) >= 0) goto ok;
-   }
-
-   // Try the libdir only if the name isn't already anchored
-   if (*name != '/' && *name != '\\' && !strchr(name, ':')) {
-      strcpy(tmpbuf,libdir);
-      // Add a trailing path char if there isn't one already
-      pathadd(tmpbuf);
-      strcat(tmpbuf, name);
-      if ((fd = open(tmpbuf, _OPEN_FLAGS)) >= 0) goto ok;
-      if (!hasdot) {
-         strcat(tmpbuf, ".o");
-         if ((fd = open(tmpbuf, _OPEN_FLAGS)) >= 0) goto ok;
-      }
-   }
-
-   return(-1);                                              // Couldn't open file at all
-
-   ok:                                                      // What more Atari label use - sigh!!!
-   
-   if ((tmpbuf = realloc(tmpbuf, (long)strlen(tmpbuf) + 1)) == NULL) {
-      printf("tryopen() : out of memory\n");
-      return(-1);
-   }
-   *p_name = tmpbuf;
-    
-   return(fd);                                              // Return file descriptor
+int tryopen(char ** p_name)
+{
+       char * name = * p_name;                 // Filename
+       char * tmpbuf, * lastdot;               // Buffer and 'dot' pointers
+       int fd, hasdot;                                 // File descriptor and 'has dot' flag
+
+       // Note that libdir will be an empty string if there is none specified
+       if ((tmpbuf = malloc((long)strlen(name) + strlen(libdir) + 3)) == NULL)
+       {
+               printf("tryopen() : out of memory\n");
+               return -1;
+       }
+
+       strcpy(tmpbuf, name);
+       hasdot = ((lastdot = strrchr(tmpbuf, '.')) > strrchr(tmpbuf, '/'))
+               && (lastdot > strrchr(tmpbuf, '\\'));
+
+       if ((fd = open(tmpbuf, _OPEN_FLAGS)) >= 0)
+               goto ok;                                        // Try to open file as passed first
+
+       if (!hasdot)
+       {
+               strcat(tmpbuf, ".o");           // Try to open file with '.o' added
+
+               if ((fd = open(tmpbuf, _OPEN_FLAGS)) >= 0)
+                       goto ok;
+       }
+
+       // Try the libdir only if the name isn't already anchored
+       if (*name != '/' && *name != '\\' && !strchr(name, ':'))
+       {
+               strcpy(tmpbuf, libdir);
+               // Add a trailing path char if there isn't one already
+               pathadd(tmpbuf);
+               strcat(tmpbuf, name);
+
+               if ((fd = open(tmpbuf, _OPEN_FLAGS)) >= 0)
+                       goto ok;
+
+               if (!hasdot)
+               {
+                       strcat(tmpbuf, ".o");
+
+                       if ((fd = open(tmpbuf, _OPEN_FLAGS)) >= 0)
+                               goto ok;
+               }
+       }
+
+       // Couldn't open file at all
+       return -1;
+
+// There are worse things... :-P
+ok:
+       if ((tmpbuf = realloc(tmpbuf, (long)strlen(tmpbuf) + 1)) == NULL)
+       {
+               printf("tryopen() : out of memory\n");
+               return -1;
+       }
+
+       *p_name = tmpbuf;
+       return fd;                                              // Return file descriptor
 }
 
 
@@ -772,7 +935,7 @@ int tryopen(char **p_name) {
 void put_name(struct OFILE * p)
 {
        int flag = *(p->o_arname);
-       printf("%s%s%s", flag ? p->o_arname : "", flag ? ":" : "", p->o_name);
+       printf("%s%s%s", (flag ? (char *)(p->o_arname) : ""), (flag ? ":" : ""), p->o_name);
 }
 
 
@@ -783,8 +946,8 @@ void put_name(struct OFILE * p)
 //
 int dofile(char * fname, int flag, char * sym)
 {
-       int fd;                                                  // File descriptor
-       int temp;                                                // Temporary storage
+       int fd;
+       int temp;
 
        // Verbose information
        if (vflag)
@@ -800,7 +963,8 @@ int dofile(char * fname, int flag, char * sym)
        // Reached maximum file handles
        if (hd == NHANDLES)
        {
-               if (flush_handles()) return 1;
+               if (ProcessObjectFiles())
+                       return 1;
        }
 
        // Attempt to open input file
@@ -810,25 +974,25 @@ int dofile(char * fname, int flag, char * sym)
                return 1;
        }
 
-       // The file is open; save its info in the handle and name arrays 
+       // The file is open; save its info in the handle and name arrays
        handle[hd] = fd;
-       name[hd] = fname;                                        // This is the name from tryopen()
+       name[hd] = fname;                       // This is the name from tryopen()
        hflag[hd] = flag;
 
        // Include files
        if (flag)
        {
-               temp = strlen(sym);                                   // Get symbol length
+               temp = strlen(sym);             // Get symbol length
 
-               // 100 chars is max length of a symbol 
+               // 100 chars is max length of a symbol
                if (temp > 99)
                {
                        sym[99] = '\0';
                        temp = 99;
                }
 
-               // Malloc enough space for two symbols, then build the second one. Second one may be one 
-               // character longer than first 
+               // Malloc enough space for two symbols, then build the second one.
+               // Second one may be one character longer than first
                if ((hsym1[hd] = malloc((long)temp + 1)) == NULL
                        || (hsym2[hd] = malloc((long)temp + 2)) == NULL)
                {
@@ -856,8 +1020,10 @@ int dofile(char * fname, int flag, char * sym)
                }
        }
 
-       hd++;                                                    // Increment next handle index
-       return 0;                                               // No problems
+       // Increment next handle index
+       hd++;
+       // No problems
+       return 0;
 }
 
 
@@ -866,10 +1032,10 @@ int dofile(char * fname, int flag, char * sym)
 //
 int segmentpad(FILE * fd, long segsize, int value)
 {
-       long padsize;                                            // Number of pad bytes needed
-       int i;                                                   // Good 'ol iterator
-       char padarray[32];                                       // Array of padding bytes
-       char * padptr;                                           // Pointer to array
+       long padsize;                            // Number of pad bytes needed
+       int i;                                   // Good 'ol iterator
+       char padarray[32];                       // Array of padding bytes
+       char * padptr;                           // Pointer to array
 
        // Determine the number of padding bytes that are needed
        padsize = (segsize + secalign) & ~secalign;
@@ -888,11 +1054,11 @@ int segmentpad(FILE * fd, long segsize, int value)
 
                symoffset += padsize;
 
-               if (fwrite(padarray, padsize, 1, fd) != 1)            // Write padding bytes
+               if (fwrite(padarray, padsize, 1, fd) != 1) // Write padding bytes
                        return 1;
        }
 
-       return 0;                                                // All done
+       return 0;
 }
 
 
@@ -901,32 +1067,35 @@ int segmentpad(FILE * fd, long segsize, int value)
 //
 int write_ofile(struct OHEADER * header)
 {
-       FILE * fd;                                               // File descriptor
-       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
-       unsigned index, type, value;                             // Symbol table index, type and value
-       short abstype;                                           // ABS symbol type
-       char symbol[14];                                         // Symbol record for ABS files
-       int slen;                                                // Symbol string length
-
-       symoffset = 0;                                           // Initialise symbol offset
+       FILE * fd;                                                      // File descriptor
+       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
+       unsigned index, type, value;            // Symbol table index, type and value
+       short abstype;                                          // ABS symbol type
+       char symbol[14];                                        // Symbol record for ABS files
+       int slen;                                                       // Symbol string length
+
+       symoffset = 0;                                          // Initialise symbol offset
 
        // Add correct output extension if none
        if (strchr(ofile, '.') == NULL)
        {
-               if (aflag && cflag) strcat(ofile, ".cof");            // COF files
-               else if (aflag && !cflag) strcat(ofile, ".abs");      // ABS files
-               else strcat(ofile, ".o");                             // Object files (partial linking etc)
+               if (aflag && cflag)
+                       strcat(ofile, ".cof");          // COF files
+               else if (aflag && !cflag)
+                       strcat(ofile, ".abs");          // ABS files
+               else
+                       strcat(ofile, ".o");            // Object files (partial linking etc)
        }
 
-       fd = fopen(ofile, "wb");                                 // Attempt to open output file
+       fd = fopen(ofile, "wb");                        // Attempt to open output file
 
        if (!fd)
-       {                              
-               printf("Can't open output file %s\n", ofile);         // Error opening output file
+       {
+               printf("Can't open output file %s\n", ofile);   // Error opening output file
                return 1;
        }
 
@@ -934,18 +1103,18 @@ int write_ofile(struct OHEADER * header)
        // Absolute (COF) header
        if (cflag)
        {
-               tsoff = dsoff = bsoff = 0xA8;                         // Initialises segment offsets
+               tsoff = dsoff = bsoff = 0xA8;   // Initialises segment offsets
 
-               // Process each object file segment size to obtain a cumulative segment size for both 
-               // the TEXT and DATA segments
+               // 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++)
                {
-                       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 += obj_segsize[i][0];     // Adding TEXT segment sizes
+                       bsoff += obj_segsize[i][0] + obj_segsize[i][1]; // Adding TEXT and DATA segment sizes
                }
 
-               // Currently this only builds a COF absolute file. Conditionals and additional code will
-               // need to be added for ABS and partial linking.
+               // 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)
@@ -962,11 +1131,11 @@ int write_ofile(struct OHEADER * header)
                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 + 40,  tbase                );         // @TEXT
                putlong(himage + 44,  dbase                );         // @DATA
 
                // Build the TEXT SEC_HDR
-               putlong(himage + 48,  0x2E746578           );                     
+               putlong(himage + 48,  0x2E746578           );
                putlong(himage + 52,  0x74000000           );         // ".text"
                putlong(himage + 56,  tbase                );         // TEXT START
                putlong(himage + 60,  tbase                );         // TEXT START
@@ -978,7 +1147,7 @@ int write_ofile(struct OHEADER * header)
                putlong(himage + 84,  0x00000020           );         // SEC_FLAGS: STYP_TEXT
 
                // Build the DATA SEC_HDR
-               putlong(himage + 88,  0x2E646174           );                     
+               putlong(himage + 88,  0x2E646174           );
                putlong(himage + 92,  0x61000000           );         // ".data"
                putlong(himage + 96,  dbase                );         // DATA START
                putlong(himage + 100, dbase                );         // DATA START
@@ -990,7 +1159,7 @@ int write_ofile(struct OHEADER * header)
                putlong(himage + 124, 0x00000040           );         // SEC_FLAGS: STYP_DATA
 
                // Build the BSS SEC_HDR
-               putlong(himage + 128, 0x2E627373           );                     
+               putlong(himage + 128, 0x2E627373           );
                putlong(himage + 132, 0x00000000           );         // ".bss"
                putlong(himage + 136, bbase                );         // BSS START
                putlong(himage + 140, bbase                );         // BSS START
@@ -1012,7 +1181,7 @@ int write_ofile(struct OHEADER * header)
                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 + 18,  0x00000000           );         //
                putlong(himage + 22,  tbase                );         // TEXT base address
                putword(himage + 26,  0xFFFF               );         // Flags (?)
                putlong(himage + 28,  dbase                );         // DATA base address
@@ -1026,13 +1195,13 @@ int write_ofile(struct OHEADER * header)
        if (!cflag)
        {
                if (!noheaderflag)
-                       if (fwrite(himage, 36, 1, fd) != 1) 
+                       if (fwrite(himage, 36, 1, fd) != 1)
                                goto werror;
        }
        // Absolute (COF) header
        else
        {
-               if (fwrite(himage, 168, 1, fd) != 1) 
+               if (fwrite(himage, 168, 1, fd) != 1)
                        goto werror;
        }
 
@@ -1047,11 +1216,11 @@ int write_ofile(struct OHEADER * header)
                        if (vflag > 1)
                                printf("Writing TEXT Segment of %s\n", otemp->o_name);
 
-                       if (fwrite(otemp->o_image + 32, osize, 1, fd) != 1) 
+                       if (fwrite(otemp->o_image + 32, osize, 1, fd) != 1)
                                goto werror;
 
                        // Pad to required alignment boundary
-                       if (segmentpad(fd, osize, 0x0000))              
+                       if (segmentpad(fd, osize, 0x0000))
                                goto werror;
 
                        symoffset += osize;
@@ -1059,7 +1228,7 @@ int write_ofile(struct OHEADER * header)
        }
 
        // Write the DATA segment of each object file
-       for(otemp = olist; otemp != NULL; otemp = otemp->o_next)
+       for(otemp=olist; otemp!=NULL; otemp=otemp->o_next)
        {
                osize = otemp->o_header.dsize;
 
@@ -1073,7 +1242,7 @@ int write_ofile(struct OHEADER * header)
                                goto werror;
 
                        // Pad to required alignment boundary
-                       if (segmentpad(fd, osize, 0))                        
+                       if (segmentpad(fd, osize, 0))
                                goto werror;
 
                        symoffset += osize;
@@ -1095,23 +1264,25 @@ int write_ofile(struct OHEADER * header)
                // Absolute (ABS) symbol/string table
                else
                {
-                       // The symbol and string table have been created as part of the dosym() function and the 
-                       // output symbol and string tables are in COF format. For an ABS file we need to process 
-                       // through this to create the 14 character long combined symbol and string table.
-                       // Format of symbol table in ABS: AAAAAAAATTVVVV, where (A)=STRING, (T)=TYPE & (V)=VALUE
+                       // The symbol and string table have been created as part of the
+                       // dosym() function and the output symbol and string tables are in
+                       // COF format. For an ABS file we need to process through this to
+                       // create the 14 character long combined symbol and string table.
+                       // Format of symbol table in ABS: AAAAAAAATTVVVV, where (A)=STRING,
+                       // (T)=TYPE & (V)=VALUE
 
                        for(i=0; i<ost_index; i++)
                        {
-                               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
+                               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
 
                                if (type & 0xF0000000)
                                        continue;                    // Not doing debug symbols
 
-                               value = getlong((ost + (i * 12)) + 8);             // Get symbol value
+                               value = getlong((ost + (i * 12)) + 8);  // Get symbol value
                                slen = strlen(oststr + index);
 
                                // Get symbol string (maximum 8 chars)
@@ -1142,26 +1313,26 @@ int write_ofile(struct OHEADER * header)
                                        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
 
                                if (fwrite(symbol, 14, 1, fd) != 1) goto werror;    // Write symbol record
                        }
                }
        }
 
-       // Close the file 
+       // Close the file
        if (fclose(fd))
        {
                printf("Close error on output file %s\n",ofile);
                return 1;
        }
-       else
-               return 0;
 
-werror:                                                  // OMG! Why did Atari use these :)
+       return 0;
+
+werror:
        printf("Write error on output file %s\n", ofile);
-       fclose(fd);                                                            // Try to close output file anyway
+       fclose(fd);                     // Try to close output file anyway
        return 1;
 }
 
@@ -1171,25 +1342,25 @@ werror:                                                  // OMG! Why did Atari u
 //
 int write_map(struct OHEADER * header)
 {
-       unsigned i, o;                                           // Inner and outer loop iterators
-       unsigned c;                                              // Column number
-       unsigned index;                                          // Symbol string index
-       unsigned type;                                           // Symbol type
-       unsigned value;                                          // Symbol value
-       char * symbol;                                           // Symbol string value
+       unsigned i, o;                  // Inner and outer loop iterators
+       unsigned c;                             // Column number
+       unsigned index;                 // Symbol string index
+       unsigned type;                  // Symbol type
+       unsigned value;                 // Symbol value
+       char * symbol;                  // Symbol string value
 
        if (ost_index == 0)
-               return 0;                            // Return if no symbols to map
+               return 0;                       // Return if no symbols to map
 
        printf("LOAD MAP\n\n");
 
-       // Outer loop for each of the symbol areas to map out; 
+       // Outer loop for each of the symbol areas to map out;
        // 0 = NON-RELOCATABLE SYMBOLS
        // 1 = TEXT-SEGMENT RELOCATABLE SYMBOLS
        // 2 = DATA-SEGMENT RELOCATABLE SYMBOLS
        // 3 = BSS-SEGMENT RELOCATABLE SYMBOLS
        for(o=0; o<4; o++)
-       {                                 
+       {
                // Display the correct map header for the symbols being processed
                switch (o)
                {
@@ -1199,31 +1370,33 @@ int write_map(struct OHEADER * header)
                case 3: printf("BSS-SEGMENT RELOCATABLE SYMBOLS\n\n");  break;
                }
 
-               c = 0;                                                // Initialise column number
+               c = 0;                          // Initialise column number
 
                // 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
-                       symbol = oststr + index;                           // Get symbol string
-                       
+                       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
                        if (c == 3)
                        {
                                printf("\n");
-                               c = 0;       
+                               c = 0;
                        }
 
-                       // If local symbols not included and the type is local then go to next symbol record
+                       // If local symbols not included and the type is local then go to
+                       // next symbol record
                        if (!lflag & !(type & 0x01000000))
                                continue;
 
                        // Output each symbol to the display, dependant on type
                        switch (o)
                        {
-                       case 0:                                         // Non-relocatable symbols
+                       case 0:
+                               // Non-relocatable symbols
                                if (type == 0x02000000 || type == 0x03000000)
                                {
                                        printf("%-8s %c  %08X   ", symbol, (type & 0x01000000) ? 'G' : 'L', value);
@@ -1231,7 +1404,8 @@ int write_map(struct OHEADER * header)
                                }
 
                                break;
-                       case 1:                                         // TEXT segment relocatable symbols
+                       case 1:
+                               // TEXT segment relocatable symbols
                                if (type == 0x04000000 || type == 0x05000000)
                                {
                                        printf("%-8s %c  %08X   ", symbol, (type & 0x01000000) ? 'G' : 'L', value);
@@ -1239,7 +1413,8 @@ int write_map(struct OHEADER * header)
                                }
 
                                break;
-                       case 2:                                         // DATA segment relocatble symbols
+                       case 2:
+                               // DATA segment relocatble symbols
                                if (type == 0x06000000 || type == 0x07000000)
                                {
                                        printf("%-8s %c  %08X   ", symbol, (type & 0x01000000) ? 'G' : 'L', value);
@@ -1247,7 +1422,8 @@ int write_map(struct OHEADER * header)
                                }
 
                                break;
-                       case 3:                                         // BSS segment relocatable symbols
+                       case 3:
+                               // BSS segment relocatable symbols
                                if (type == 0x08000000 || type == 0x09000000)
                                {
                                        printf("%-8s %c  %08X   ", symbol, (type & 0x01000000) ? 'G' : 'L', value);
@@ -1261,7 +1437,7 @@ int write_map(struct OHEADER * header)
                printf("\n\n");
        }
 
-       return 0;                                               // All done
+       return 0;
 }
 
 
@@ -1302,7 +1478,6 @@ int atolx(char * string, int * value)
 // Stuff the (long) value of a string into the value argument. RETURNS TRUE if
 // the string doesn't parse.  Parses only as a hex string.
 //
-//int getval(char * string, long * value)
 int getval(char * string, int * value)
 {
        return atolx(string, value);
@@ -1317,17 +1492,18 @@ int getval(char * string, int * value)
 //
 struct OHEADER * make_ofile()
 {
-       unsigned tptr, dptr, bptr;                               // Bases in runtime model
-       int ret = 0;                                             // Return value
-       struct OFILE * otemp, * oprev, * ohold;                  // Object file list pointers
-       struct OHEADER * header;                                 // Output header pointer
+       unsigned tptr, dptr, bptr;                                      // Bases in runtime model
+       int ret = 0;                                                            // Return value
+       struct OFILE * otemp, * oprev, * ohold;         // Object file list pointers
+       struct OHEADER * header;                                        // Output header pointer
 
-       textsize = datasize = bsssize = 0;                       // Initialise cumulative segment sizes
+       // Initialize cumulative segment sizes
+       textsize = datasize = bsssize = 0;
 
-       // For each object file, accumulate the sizes of the segments but remove those 
-       // object files which are unused
-       oprev = NULL;                                            // Init previous obj file list ptr
-       otemp = olist;                                           // Set temp pointer to object file list
+       // For each object file, accumulate the sizes of the segments but remove
+       // those object files which are unused
+       oprev = NULL;                   // Init previous obj file list ptr
+       otemp = olist;                  // Set temp pointer to object file list
 
        while (otemp != NULL)
        {
@@ -1349,24 +1525,28 @@ struct OHEADER * make_ofile()
                                }
                                else
                                {
-                                       oprev -> o_next = otemp->o_next;
+                                       oprev->o_next = otemp->o_next;
                                }
 
                                ohold = otemp;
-                               free(ohold->o_image);
+
+                               if (!ohold->isArchiveFile)
+                                       free(ohold->o_image);
+
                                free(ohold);
                        }
                        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;
+                               textsize += (otemp->o_header.tsize + secalign) & ~secalign;
+                               datasize += (otemp->o_header.dsize + secalign) & ~secalign;
+                               bsssize  += (otemp->o_header.bsize + secalign) & ~secalign;
                                oprev = otemp;
                        }
                }
 
-               otemp = otemp->o_next;                                // Go to next object file list pointer
+               // Go to next object file list pointer
+               otemp = otemp->o_next;
        }
 
        // Update base addresses and create symbols _TEXT_E, _DATA_E and _BSS_E
@@ -1386,7 +1566,7 @@ struct OHEADER * make_ofile()
                        ost_add("_BSS_E", 0x09000000, tval + textsize + datasize + bsssize);
                }
                else
-               { 
+               {
                        // BSS is independant of DATA
                        bbase = bval;
                        ost_add("_BSS_E", 0x09000000, bval + bsssize);
@@ -1412,11 +1592,11 @@ struct OHEADER * make_ofile()
                }
        }
 
-       // Place each unresolved symbol in the output symbol table 
+       // Place each unresolved symbol in the output symbol table
        if (dounresolved())
-               return NULL;                         
+               return NULL;
 
-       tptr = 0;                                                // Initialise base addresses
+       tptr = 0;                                                               // Initialise base addresses
        dptr = 0;
        bptr = 0;
 
@@ -1433,31 +1613,31 @@ struct OHEADER * make_ofile()
                {
                        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;
+                       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 
-               if (dosym(otemp)) 
+
+               // For each symbol, (conditionally) add it to the ost
+               // For ARCHIVE markers, this adds the symbol for the file & returns
+               if (dosym(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;
-                       }
 
                        ohold = otemp;
 
-                       if (ohold->o_image) free(ohold->o_image);
-                               free(ohold);
+                       if (ohold->o_image)
+                               if (!ohold->isArchiveFile)
+                                       free(ohold->o_image);
+
+                       free(ohold);
                }
                else
                {
@@ -1478,37 +1658,39 @@ struct OHEADER * make_ofile()
                return NULL;
        }
 
-       // Fill in the output header. Does not match the actual output but values used as reference
-       header->magic = 0x0150;                                  // COF magic number
-       header->tsize = textsize;                                // TEXT segment size
-       header->dsize = datasize;                                // DATA segment size
-       header->bsize = bsssize;                                 // BSS segment size
-       header->ssize = (ost_ptr - ost);                         // Symbol table size
-       header->ostbase = ost;                                   // Output symbol table base address
-   
-       // For each object file, relocate its TEXT and DATA segments. OR the result into ret so all 
-       // files get moved (and errors reported) before returning with the error condition
+       // Fill in the output header. Does not match the actual output but values
+       // used as reference
+       header->magic = 0x0150;                     // COF magic number
+       header->tsize = textsize;                   // TEXT segment size
+       header->dsize = datasize;                   // DATA segment size
+       header->bsize = bsssize;                    // BSS segment size
+       header->ssize = (ost_ptr - ost);            // Symbol table size
+       header->ostbase = ost;                      // Output symbol table base address
+
+       // For each object file, relocate its TEXT and DATA segments. OR the result
+       // into ret so all files get moved (and errors reported) before returning
+       // with the error condition
        for(otemp=olist; otemp!=NULL; otemp=otemp->o_next)
        {
                if (!(otemp->o_flags & O_ARCHIVE))
                {
-                       ret |= reloc_segment(otemp, T_TEXT);               // TEXT segment relocations
-                       ret |= reloc_segment(otemp, T_DATA);               // DATA segment relocations
+                       ret |= reloc_segment(otemp, T_TEXT);    // TEXT segment relocations
+                       ret |= reloc_segment(otemp, T_DATA);    // DATA segment relocations
                }
        }
 
-       hash_free();                                             // Done with global symbol hash tables
+       hash_free();                                // Done with global symbol hash tables
 
-       return (ret ? (unsigned)NULL : header);
+       return (ret ? (struct OHEADER *)NULL : header);
 }
 
 
 //
 // Add Symbol to Hash List
 //
-int add_to_hlist(struct HREC **hptr, char *sym, struct OFILE *ofile, long value, int type)
+int add_to_hlist(struct HREC ** hptr, char * sym, struct OFILE * ofile, long value, int type)
 {
-       struct HREC *htemp;                                      // Temporary hash record pointer
+       struct HREC * htemp;                                    // Temporary hash record pointer
        int i;
 
        // Attempt to allocate new hash record
@@ -1518,15 +1700,21 @@ int add_to_hlist(struct HREC **hptr, char *sym, struct OFILE *ofile, long value,
                return 1;
        }
 
+       // Shamus: Moar testing...
+       if (vflag > 1)
+       {
+               printf("add_to_hlist(): hptr=$%08X, sym=\"%s\", ofile=$%08X, value=$%X, type=$%X\n", hptr, sym, ofile, value, type);
+       }
+
        for(i=0; i<SYMLEN; i++)
                htemp->h_sym[i] = '\0';
 
-       strcpy(htemp->h_sym, sym);                               // Populate hash record
+       strcpy(htemp->h_sym, sym);                              // Populate hash record
        htemp->h_ofile = ofile;
        htemp->h_value = value;
        htemp->h_type = type;
 
-       htemp->h_next = *hptr;                                   // Update hash record pointers
+       htemp->h_next = *hptr;                                  // Update hash record pointers
        *hptr = htemp;
 
        return 0;
@@ -1539,47 +1727,52 @@ int add_to_hlist(struct HREC **hptr, char *sym, struct OFILE *ofile, long value,
 add_unresolved(char * sym, struct OFILE * ofile)
 {
        if (vflag > 1)
-               printf("add_unresolved(%s,%s)\n", sym, ofile->o_name);
+               printf("add_unresolved(%s, %s)\n", sym, ofile->o_name);
 
        return add_to_hlist(&unresolved, sym, ofile, 0L, 0);
 }
 
 
 //
-// Generate and Return Hash Value
+// Generate hash value
 //
-int dohash(char * s)
+int DoHash(char * s)
 {
-       int i = (s[0]+s[1]+s[2]+s[3]+s[4]+s[5]+s[6]+s[7] +s[8]+s[9]+s[10]+s[11]+s[12]+s[13]+s[14]) % NBUCKETS;
+       int i = (s[0] + s[1] + s[2] + s[3] + s[4] + s[5] + s[6] + s[7]  + s[8]
+               + s[9] + s[10] + s[11] + s[12] + s[13] + s[14]) % NBUCKETS;
        return i;
 }
 
 
 //
-// Lookup a Symbol in the Hash Table
+// Lookup a symbol in the hash table
 //
 struct HREC * lookup(char * sym)
 {
-       struct HREC * hptr = htable[dohash(sym)];                // Hash index to record based on sym
-       char symbol[SYMLEN];                                     // Temporary symbol storage
+       struct HREC * hptr = htable[DoHash(sym)];       // Hash index to record based on sym
+       char symbol[SYMLEN];                                            // Temporary symbol storage
 
-       memset(symbol, 0, SYMLEN);                               // Clean string for comparison
+       memset(symbol, 0, SYMLEN);                                      // Clean string for comparison
        strcpy(symbol, sym);
 
        while (hptr != NULL)
        {
-               if (symcmp(symbol, hptr->h_sym))
+//This is utter failure...
+//             if (symcmp(symbol, hptr->h_sym))  <-- left here for giggles :D  - LinkoVitch
+               // Return hash pointer if found
+               if (strcmp(symbol, hptr->h_sym) == 0)
                        return hptr;
 
-               hptr = hptr->h_next;                                  // Return hash pointer if found
+               hptr = hptr->h_next;
        }
 
-       return NULL;                                            // Not found in hash table
+       // Symbol was not found in hash table
+       return NULL;
 }
 
 
 //
-// Add Symbol to the Hash Table
+// Add symbol to the hash table
 //
 int hash_add(char * sym, long type, long value, struct OFILE * ofile)
 {
@@ -1588,22 +1781,22 @@ int hash_add(char * sym, long type, long value, struct OFILE * ofile)
 
        if (vflag > 1)
        {
-               printf("hash_add(%s,%s,%lx,", sym, ofile->o_name,value);
+               printf("hash_add(%s,%s,%lx,", sym, ofile->o_name, value);
                printf("%x,%s)\n", (unsigned int)type, (flag ? "GLOBAL" : "COMMON"));
        }
 
        if ((hptr = lookup(sym)) == NULL)
        {
-               return add_to_hlist(&htable[dohash(sym)], sym, ofile, value, type);
+               return add_to_hlist(&htable[DoHash(sym)], sym, ofile, value, type);
        }
 
        // Already there!
        if (iscommon(type) && !iscommon(hptr->h_type))
        {
-               // Mismatch: global came first; warn and keep the global one 
+               // Mismatch: global came first; warn and keep the global one
                if (wflag)
                {
-                       printf("Warning: %s: global from ",sym);
+                       printf("Warning: %s: global from ", sym);
                        put_name(hptr->h_ofile);
                        printf(" used, common from ");
                        put_name(ofile);
@@ -1615,7 +1808,7 @@ int hash_add(char * sym, long type, long value, struct OFILE * ofile)
        }
        else if (iscommon(hptr->h_type) && !iscommon(type))
        {
-               // Mismatch: common came first; warn and keep the global one 
+               // Mismatch: common came first; warn and keep the global one
                if (wflag)
                {
                        printf("Warning: %s: global from ", sym);
@@ -1629,9 +1822,10 @@ int hash_add(char * sym, long type, long value, struct OFILE * ofile)
                hptr->h_ofile = ofile;
                hptr->h_value = value;
        }
+       // They're both global
        else if (flag)
-       {                                                        // They're both global
-               // Global exported by another ofile; warn and make this one extern 
+       {
+               // Global exported by another ofile; warn and make this one extern
                if (wflag)
                {
                        printf("Duplicate symbol %s: ", sym);
@@ -1643,8 +1837,9 @@ int hash_add(char * sym, long type, long value, struct OFILE * ofile)
 
                putword(sym + 8, ABST_EXTERN);
        }
+       // They're both common
        else
-       {                                                                 // They're both common 
+       {
                if (hptr->h_value < value)
                {
                        hptr->h_value = value;
@@ -1655,153 +1850,185 @@ int hash_add(char * sym, long type, long value, struct OFILE * ofile)
        return 0;
 }
 
+
 //
-// -------------------------------------------------------------------------------------------------
-// Add the imported symbols from this file to unresolved, and the global and common symbols to the 
-// exported hash table.
+// Add the imported symbols from this file to unresolved, and the global and
+// common symbols to the exported hash table.
 //
-// Change old-style commons (type == T_EXTERN, value != 0) to new-style ones 
+// Change old-style commons (type == T_EXTERN, value != 0) to new-style ones
 // (type == (T_GLOBAL | T_EXTERN)).
-// -------------------------------------------------------------------------------------------------
-//
-
-int add_symbols(struct OFILE *Ofile) {
-   long nsymbols;                                           // Number of symbols in object file
-   char *ptr;                                               // Object data base pointer
-   char *sfix;                                              // Symbol fixup table pointer
-   char *sstr;                                              // Symbol string table pointer
-   long index;                                              // String index
-   long type;                                               // Symbol type
-   long value;                                              // Symbol value
-   struct HREC *hptr;                                       // Hash record pointer
-   char symbol[SYMLEN];
-
-   if (vflag > 1)
-      printf("Add symbols for file %s\n", Ofile->o_name);
-
-   ptr = Ofile->o_image + 32 +                              // Get base pointer, start of sym fixups
-         Ofile->o_header.tsize + 
-         Ofile->o_header.dsize + 
-         Ofile->o_header.absrel.reloc.tsize +
-         Ofile->o_header.absrel.reloc.dsize;
-   sfix = ptr;                                              // Set symbol fixup pointer
-   sstr = sfix + Ofile->o_header.ssize;                     // Set symbol table pointer
-   nsymbols = Ofile->o_header.ssize / 12;                   // Obtain number of symbols
-
-   while (nsymbols) {
-      index = getlong(sfix);                                // Get symbol string index
-      type  = getlong(sfix+4);                              // Get symbol type
-      value = getlong(sfix+8);                              // Get symbol value
-      memset(symbol, 0, SYMLEN);
-      strcpy(symbol, sstr+index);
-
-      if (type & T_EXT) {                                    // If this is a global/external
-         if ((type - T_EXT)) {
-            if (hash_add(symbol, type, value, Ofile)) {      // Then add to hash table
-               return 1;                                   // Error if addition failed
-            }
-         } else {
-            if ((hptr = lookup(symbol)) != NULL) {           // If value is zero and in hash table
-               hptr->h_ofile->o_flags |= O_USED;            // Mark symbol as used
-            } else if (add_unresolved(symbol, Ofile)) {      // Otherwise add to unresolved list
-               return 1;                                   // Error if addition failed
-            }
-         }
-      }
-
-      sfix += 12;                                           // Increment symbol fixup pointer
-      nsymbols--;                                           // Decrement num of symbols to process
-   }
-
-   return 0;                                               // Success loading symbols
+//
+int add_symbols(struct OFILE * Ofile)
+{
+       long nsymbols;                          // Number of symbols in object file
+       char * ptr;                                     // Object data base pointer
+       char * sfix;                            // Symbol fixup table pointer
+       char * sstr;                            // Symbol string table pointer
+       long index;                                     // String index
+       long type;                                      // Symbol type
+       long value;                                     // Symbol value
+       struct HREC * hptr;                     // Hash record pointer
+       char symbol[SYMLEN];
+
+       if (vflag > 1)
+               printf("Add symbols for file %s\n", Ofile->o_name);
+
+       ptr = Ofile->o_image + 32                               // Get base pointer, start of sym fixups
+               + Ofile->o_header.tsize
+               + Ofile->o_header.dsize
+               + Ofile->o_header.absrel.reloc.tsize
+               + Ofile->o_header.absrel.reloc.dsize;
+       sfix = ptr;                                                             // Set symbol fixup pointer
+       sstr = sfix + Ofile->o_header.ssize;    // Set symbol table pointer
+       nsymbols = Ofile->o_header.ssize / 12;  // Obtain number of symbols
+
+       while (nsymbols)
+       {
+               index = getlong(sfix);                          // Get symbol string index
+               type  = getlong(sfix + 4);                      // Get symbol type
+               value = getlong(sfix + 8);                      // Get symbol value
+               memset(symbol, 0, SYMLEN);
+               strcpy(symbol, sstr + index);
+
+               // If this is a global/external
+               if (type & T_EXT)
+               {
+                       if ((type - T_EXT))
+                       {
+                               // Then add to hash table
+                               if (hash_add(symbol, type, value, Ofile))
+                               {
+                                       return 1;                               // Error if addition failed
+                               }
+                       }
+                       else
+                       {
+                               // If value is zero and in hash table
+                               if ((hptr = lookup(symbol)) != NULL)
+                               {
+                                       hptr->h_ofile->o_flags |= O_USED;       // Mark symbol as used
+                               }
+                               // Otherwise add to unresolved list
+                               else if (add_unresolved(symbol, Ofile))
+                               {
+                                       return 1;                               // Error if addition failed
+                               }
+                       }
+               }
+
+               sfix += 12;                                                     // Increment symbol fixup pointer
+               nsymbols--;                                                     // Decrement num of symbols to process
+       }
+
+       // Success loading symbols
+       return 0;
 }
 
+
 //
-// Process Object File for Symbols -------------------------------------------------------------
-//
-
-int doobj(char *fname, char *ptr, char *aname, int flags) {
-   struct OFILE *Ofile;                                     // Object record pointer
-   char *temp;                                              // Temporary data pointer
-
-   if ((Ofile = new_ofile()) == NULL) {                      // Allocate memory for object record ptr
-      printf("Out of memory processing %s\n",fname);
-      return 1;
-   }
-
-   // Starting after all pathnames, etc., copy .o file name to Ofile
-   temp = path_tail(fname);
-   if (strlen(temp) > FNLEN - 1) {                           // Check filename length
-      printf("File name too long: %s\n", temp);
-      return 1;
-   }
-   if (strlen(aname) > FNLEN - 1) {                          // Check archive name length
-      printf("Archive name too long: %s\n", aname);
-      return 1;
-   }
-   strcpy(Ofile->o_name, temp);                             // Store filename
-   strcpy(Ofile->o_arname, aname);                          // Store archive name
-
-   Ofile->o_next  = NULL;                                   // Initialise object record information
-   Ofile->o_tbase = 0;
-   Ofile->o_dbase = 0;
-   Ofile->o_bbase = 0;
-   Ofile->o_flags = flags;
-   Ofile->o_image = ptr;
-           
-   // Don't do anything if this is just an ARCHIVE marker, just add the file to the olist
-   if (!(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;
-      if (Ofile->o_header.dsize & 7) {
-         printf("Warning: data segment size of ");
-         put_name(Ofile);
-         printf(" is not a phrase multiple\n");
-      }
-           
-      // 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 (add_symbols(Ofile)) return 1;
-   }
-       
-       // Add this file to the olist 
-       if (olist == NULL) 
-      olist = Ofile;
-       else 
-      olast->o_next = Ofile;
+// Process object file for symbols
+//
+int doobj(char * fname, char * ptr, char * aname, int flags)
+{
+       struct OFILE * Ofile;           // Object record pointer
+       char * temp;                            // Temporary data pointer
+
+       // Allocate memory for object record ptr
+       if ((Ofile = new_ofile()) == NULL)
+       {
+               printf("Out of memory processing %s\n",fname);
+               return 1;
+       }
+
+       // Starting after all pathnames, etc., copy .o file name to Ofile
+       temp = path_tail(fname);
+
+       // Check filename length
+       if (strlen(temp) > FNLEN - 1)
+       {
+               printf("File name too long: %s\n", temp);
+               return 1;
+       }
+
+       // Check archive name length
+       if (strlen(aname) > FNLEN - 1)
+       {
+               printf("Archive name too long: %s\n", aname);
+               return 1;
+       }
+
+       strcpy(Ofile->o_name, temp);            // Store filename
+       strcpy(Ofile->o_arname, aname);         // Store archive name
+
+       Ofile->o_next  = NULL;                          // Initialise object record information
+       Ofile->o_tbase = 0;
+       Ofile->o_dbase = 0;
+       Ofile->o_bbase = 0;
+       Ofile->o_flags = flags;
+       Ofile->o_image = ptr;
+       Ofile->isArchiveFile = 0;
+
+       // Don't do anything if this is just an ARCHIVE marker, just add the file
+       // to the olist
+       if (!(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;
+
+               if ((Ofile->o_header.dsize & 7) && wflag)
+               {
+                       printf("Warning: data segment size of ");
+                       put_name(Ofile);
+                       printf(" is not a phrase multiple\n");
+               }
+
+               // 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 (add_symbols(Ofile))
+                       return 1;
+       }
+
+       // Add this file to the olist
+       if (olist == NULL)
+               olist = Ofile;
+       else
+               olast->o_next = Ofile;
+
        olast = Ofile;
        return 0;
 }
 
 
 //
-// Remove Elements from Unresolved List which are Resolvable
+// Remove elements from unresolved list which are resolvable
 //
 int dolist(void)
 {
-       struct HREC * uptr;                                      // Unresolved hash record pointer
-       struct HREC * prev = NULL;                               // Previous hash record pointer
-       struct HREC * htemp;                                     // Temporary hash record pointer
-       struct OFILE * ptemp;                                    // Temporary object file record pointer
+       struct HREC * uptr;                             // Unresolved hash record pointer
+       struct HREC * prev = NULL;              // Previous hash record pointer
+       struct HREC * htemp;                    // Temporary hash record pointer
+       struct OFILE * ptemp;                   // Temporary object file record pointer
 
        // Process object file list
        while (plist != NULL)
        {
-               if (doobj(plist->o_name, plist->o_image, plist->o_arname, plist->o_flags)) 
+               if (doobj(plist->o_name, plist->o_image, plist->o_arname, plist->o_flags))
                        return 1;
 
                ptemp = plist;
@@ -1818,7 +2045,7 @@ int dolist(void)
                if ((htemp = lookup(uptr->h_sym)) != NULL)
                {
                        if (vflag > 1)
-                               printf(" %s in %s\n", isglobal(htemp->h_type) ? "global" : "common", htemp->h_ofile->o_name);
+                               printf("%s in %s (=$%06X)\n", isglobal(htemp->h_type) ? "global" : "common", htemp->h_ofile->o_name, htemp->h_value);
 
                        htemp->h_ofile->o_flags |= O_USED;
 
@@ -1848,54 +2075,57 @@ int dolist(void)
 
 
 //
-// Extract Filename from Path
+// Extract filename from path
 //
 char * path_tail(char * name)
 {
-       char * temp = max(strrchr(name,'/'), max(strrchr(name,':'), strrchr(name, 92)));
+       char * temp = strrchr(name, PATH_DELIMITER);
 
+       // Return what was passed in if path delimiter was not found
        if (temp == NULL)
-               temp = (name - 1);
+               return name;
 
        return temp + 1;
 }
 
 
 //
-// Add Input File to Processing List
+// Add input file to processing list
 //
-int pladd(char * ptr, char * fname)
+int AddToProcessingList(char * ptr, char * fname, uint8_t arFile)
 {
        if (plist == NULL)
-       {  
-               plist = new_ofile();                                  // First time object record allocation
-               plast = plist;                                        // Update last object record pointer
+       {
+               plist = new_ofile();                    // First time object record allocation
+               plast = plist;                                  // Update last object record pointer
        }
        else
        {
-               plast->o_next = new_ofile();                          // Next object record allocation
-               plast = plast->o_next;                                // Update last object record pointer
+               plast->o_next = new_ofile();    // Next object record allocation
+               plast = plast->o_next;                  // Update last object record pointer
        }
 
        if (plast == NULL)
-       {                                
-               printf("Out of memory.\n");                           // Error if memory allocation fails
+       {
+               printf("Out of memory.\n");             // Error if memory allocation fails
                return 1;
        }
 
-       if (strlen(path_tail(fname)) > FNLEN-1)
-       {                 // Error on excessive filename length
-               printf("File name too long: %s (sorry!)\n",fname);
+       if (strlen(path_tail(fname)) > FNLEN - 1)
+       {
+               // Error on excessive filename length
+               printf("File name too long: %s (sorry!)\n", fname);
                return 1;
        }
 
-       strcpy(plast->o_name, path_tail(fname));                 // Store filename, not path
-       *plast->o_arname = 0;                                    // No archive name for this file
-       plast->o_image = ptr;                                    // Store data pointer
-       plast->o_flags = O_USED;                                 // File is used
-       plast->o_next = NULL;                                    // Initialise next record pointer
+       strcpy(plast->o_name, path_tail(fname));        // Store filename, not path
+       *plast->o_arname = 0;                           // No archive name for this file
+       plast->o_image = ptr;                           // Store data pointer
+       plast->o_flags = O_USED;                        // File is used
+       plast->o_next = NULL;                           // Initialise next record pointer
+       plast->isArchiveFile = arFile;          // Shamus: Temp until can sort out
 
-       return 0;                                               // Return without errors
+       return 0;                                                       // Return without errors
 }
 
 
@@ -1914,18 +2144,18 @@ int pladd(char * ptr, char * fname)
 //
 int doinclude(char * fname, int handle, char * sym1, char * sym2, int segment)
 {
-       long fsize, dsize, size;                                 // File, DATA segment and image sizes 
-       char * ptr, * sptr;                                      // Data pointers
-       int i;                                                   // Iterators
-       int sym1len = 0;                                         // Symbol 1 length
-       int sym2len = 0;                                         // Symbol 2 length
+       long fsize, dsize, size;              // File, DATA segment and image sizes
+       char * ptr, * sptr;                   // Data pointers
+       int i;                                // Iterators
+       int sym1len = 0;                      // Symbol 1 length
+       int sym2len = 0;                      // Symbol 2 length
        unsigned symtype = 0;
 
-       fsize = FSIZE(handle);                                   // Get size of include file
-       dsize = (fsize+secalign) & ~secalign;                     // Round up to a alignment boundary
+       fsize = FileSize(handle);             // Get size of include file
+       dsize = (fsize + secalign) & ~secalign; // Round up to a alignment boundary
 
-       sym1len = strlen(sym1) + 1;                              // Get sym1 length + null termination
-       sym2len = strlen(sym2) + 1;                              // Get sym2 length + null termination
+       sym1len = strlen(sym1) + 1;           // Get sym1 length + null termination
+       sym2len = strlen(sym2) + 1;           // Get sym2 length + null termination
 
        size = 32 + dsize + 24 + 4 + sym1len + sym2len + 4;
 
@@ -1939,7 +2169,7 @@ int doinclude(char * fname, int handle, char * sym1, char * sym2, int segment)
        }
 
        // Read in binary data
-       if (read(handle, ptr+32, fsize) != fsize)
+       if (read(handle, ptr + 32, fsize) != fsize)
        {
                printf("File read error on %s\n", fname);
                close(handle);
@@ -1947,17 +2177,17 @@ int doinclude(char * fname, int handle, char * sym1, char * sym2, int segment)
                return 1;
        }
 
-       close(handle);                                           // Close file
+       close(handle);
 
        strcpy(obj_fname[obj_index], path_tail(fname));
 
-       // Build this image's dummy header 
-       putlong(ptr, 0x00000107);                                // Magic number
+       // Build this image's dummy header
+       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;
@@ -1965,54 +2195,54 @@ int doinclude(char * fname, int handle, char * sym1, char * sym2, int segment)
        }
        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;
        }
 
-       obj_index++;                                             // Increment object count
+       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
+       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
+       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
+       sptr = ptr + 32 + dsize + 24 + 4;      // Set sptr to symbol table location
 
-       for(i=0; i<(sym1len-1); i++)                             // Write symbol1 to string table
-               sptr[i] = *sym1++;     
+       for(i=0; i<(sym1len-1); i++)           // Write symbol1 to string table
+               sptr[i] = *sym1++;
 
-       sptr += (sym1len-1);                                     // Step past symbol string
-       *sptr = '\0';                                            // Terminate symbol string
-       sptr += 1;                                               // Step past termination
+       sptr += (sym1len - 1);                 // Step past symbol string
+       *sptr = '\0';                          // Terminate symbol string
+       sptr += 1;                             // Step past termination
 
-       for(i=0; i<(sym2len-1); i++)                             // Write symbol2 to string table
+       for(i=0; i<(sym2len-1); i++)           // Write symbol2 to string table
                sptr[i] = *sym2++;
 
-       sptr += (sym2len-1);                                     // Step past symbol string
-       *sptr = '\0';                                            // Terminate symbol string
-       sptr += 1;                                               // Step past termination
+       sptr += (sym2len - 1);                 // Step past symbol string
+       *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 pladd(ptr, fname);
+       return AddToProcessingList(ptr, fname, 0);
 }
 
 
@@ -2023,19 +2253,17 @@ int doinclude(char * fname, int handle, char * sym1, char * sym2, int segment)
 // a pointer to the OFILE structure for this file, so you can diddle its flags
 // (dofile sets O_USED for files on the command line).
 //
-int doobject(char * fname, int fd, char * ptr)
+int DoObject(char * fname, int fd, char * ptr)
 {
-       long size;                                               // File size
-
        if (ptr == NULL)
-       {                                        
-               size = FSIZE(fd);                                     // Get size of input object file
+       {
+               long size = FileSize(fd);
 
                // Allocate memory for file data
                if ((ptr = malloc(size)) == NULL)
                {
                        printf("Out of memory while processing %s\n", fname);
-                       close(fd);                                         // Close and error
+                       close(fd);
                        return 1;
                }
 
@@ -2043,502 +2271,642 @@ int doobject(char * fname, int fd, char * ptr)
                if (read(fd, ptr, size) != size)
                {
                        printf("File read error on %s\n", fname);
-                       close(fd);                                         // Close, free memory and error
+                       close(fd);
                        free(ptr);
                        return 1;
                }
 
-               strcpy(obj_fname[obj_index], path_tail(fname));         // SCPCD : get the name of the file instead of all pathname
+               // 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
-       }    
+       }
 
-       // Now add this image to the list of pending ofiles (plist) 
+       // Now add this image to the list of pending ofiles (plist)
        // This routine is shared by doinclude after it builds the image
-       return pladd(ptr, fname);
+       return AddToProcessingList(ptr, fname, 0);
 }
 
-
 //
-// Process In Outstanding Object Files
+// Process an ar archive file (*.a)
 //
-int flush_handles(void)
+int DoArchive(char * fname, int fd)
 {
-   int i;                                                   // Iterator
-   char magic[4];                                           // Magic header number
-  //  unsigned test;
-
-  for(i = 0; i < (int)hd; i++) {                           // Process all handles
-      if (vflag == 1) {                                      // Verbose mode information
-         printf("Read file %s%s\n", name[i], hflag[i] ? " (include)" : "");
-      }
-      if (!hflag[i]) {                                       // Attempt to read file magic number
-         // OBJECT FILES
-         if (read(handle[i],magic,4) != 4) {
-            printf("Error reading file %s\n", name[i]);
-            close(handle[i]);                               // Close file and error
-            return 1;
-         }
-               
-         lseek(handle[i], 0L, 0);                           // Reset to start of input file 
-//             test = getlong(magic); printf("Magic Number is 0x%08X\n", test);
-         if (getlong(magic) == 0x00000107) {                 // Look for SMAC/MAC object files
-            if (doobject(name[i], handle[i], 0L))            // Process input object file
-               return 1; 
-         } else {
-            printf("%s is not a supported object file\n", name[i]);
-            close(handle[i]);                               // Close file and error
-            return 1;
-         }
-      } else {
-         // INCLUDE FILES
-         // If hflag[i] is 1, include this in the data segment; if 2, put in in text segment
-         if (doinclude(name[i], handle[i], hsym1[i], hsym2[i], hflag[i]-1)) 
-            return 1;
-      }
-   }
-    
-   for(i = 0; i < (int)hd; i++) {                           // Free include, symbol & object handles
-          free(name[i]); 
-          if (hflag[i]) {
-         free(hsym1[i]);
-         free(hsym2[i]);
-      }
-   }
-    
-   hd = 0;                                                  // Reset next handle indicator
-
-   return 0;                                               // Return
+       // Read in the archive file to memory and process
+       long size = FileSize(fd);
+       char * ptr = malloc(size);
+       char * endPtr = ptr + size;
+
+       if (ptr == NULL)
+       {
+               printf("Out of memory while processing %s\n", fname);
+               close(fd);
+               return 1;
+       }
+
+       if (read(fd, ptr, size) != size)
+       {
+               printf("File read error on %s\n", fname);
+               close(fd);
+               free(ptr);
+               return 1;
+       }
+
+       close(fd);
+
+       // Save the pointer for later...
+       arPtr[arIndex++] = ptr;
+       char objName[17];
+       char objSize[11];
+       int i;
+
+       // Loop through all objects in the archive and process them
+       do
+       {
+               objName[16] = objSize[10] = 0;
+
+               for(i=0; i<16; i++)
+               {
+                       if (ptr[i] == '/')
+                       {
+                               objName[i] = 0;
+                               break;
+                       }
+
+                       objName[i] = ptr[i];
+               }
+
+               for(i=0; i<10; i++)
+               {
+                       if (ptr[48 + i] == ' ')
+                       {
+                               objSize[i] = 0;
+                               break;
+                       }
+
+                       objSize[i] = ptr[48 + i];
+               }
+
+               if (objName[0] != 0)
+               {
+                       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++;
+
+                       if (AddToProcessingList(ptr + 60, objName, 1))
+                               return 1;
+               }
+
+               uint32_t size = atoi(objSize);
+               size += (size & 0x01 ? 1 : 0);
+               ptr += 60 + size;
+       }
+       while (ptr < endPtr);
+
+       return 0;
 }
 
+
 //
-// Load newargv with Pointers to Arguments Found in the Buffer ---------------------------------
-//
-
-int parse(char *buf, char *newargv[]) {
-   int i = 1;
-    
-   if (vflag) {
-      printf("begin parsing\n");
-   }
-   while (1) {
-      while (*buf && strchr(",\t\n\r\14 ", *buf)) buf++;
-
-      /* test for eof */
-      if (*buf == '\0' || *buf == 26) {
-         if (i == 0) {
-            printf("No commands in command file\n");
-            return(-1);
-         } else {
-            return(i);
-         }
-      }
-
-      /* test for comment */
-      if (*buf == '#') {
-         /* found a comment; skip to next \n and start over */
-         while (*buf && *buf != '\n') buf++;
-         continue;
-      }
-
-      if (i == MAXARGS) {
-         printf("Too many arguments in command file\n");
-         return(-1);
-      }
-      newargv[i] = buf;
-      while (!strchr(",\t\n\r\14 ", *buf)) {
-         if (*buf == '\0' || *buf == 26) {
-            printf("Finished parsing %d args\n", i);
-            return(i);
-         }
-         buf++;
-      }
-      *buf++ = '\0';
-      if (vflag) {
-         printf("argv[%d] = \"%s\"\n",i,newargv[i]);
-      }
-      i++;
-   }
+// Process files (*.o, *.a) passed in on the command line
+//
+int ProcessObjectFiles(void)
+{
+       int i;                          // Iterator
+       char magic[8];          // Magic header number
+
+       // Process all handles
+       for(i=0; i<(int)hd; i++)
+       {
+               // Verbose mode information
+               if (vflag == 1)
+               {
+                       printf("Read file %s%s\n", name[i], hflag[i] ? " (include)" : "");
+               }
+
+               if (!hflag[i])
+               {
+                       // Attempt to read file magic number
+                       // OBJECT/ARCHIVE FILES 
+                       if (read(handle[i], magic, 4) != 4)
+                       {
+                               printf("Error reading file %s\n", name[i]);
+                               close(handle[i]);
+                               return 1;
+                       }
+
+                       lseek(handle[i], 0L, 0);        // Reset to start of input file
+
+                       // Look for RMAC/MAC/GCC ($20107) object files
+                       if ((getlong(magic) == 0x00000107) || (getlong(magic) == 0x00020107))
+                       {
+                               // Process input object file
+                               if (DoObject(name[i], handle[i], 0L))
+                                       return 1;
+                       }
+                       // Otherwise, look for an object archive file
+                       else if (strncmp(magic, "!<arch>\0x0A", 8) == 0)
+                       {
+                               if (DoArchive(name[i], handle[i]))
+                                       return 1;
+                       }
+                       else
+                       {
+                               // Close file and error
+                               printf("%s is not a supported object or archive file\n", name[i]);
+                               close(handle[i]);
+                               return 1;
+                       }
+               }
+               else
+               {
+                       // INCLUDE FILES
+                       // If hflag[i] is 1, include this in the data segment; if 2, put it
+                       // in text segment
+                       if (doinclude(name[i], handle[i], hsym1[i], hsym2[i], hflag[i] - 1))
+                               return 1;
+               }
+       }
+
+       // Free include, symbol & object handles
+       for(i=0; i<(int)hd; i++)
+       {
+               free(name[i]);
+
+               if (hflag[i])
+               {
+                       free(hsym1[i]);
+                       free(hsym2[i]);
+               }
+       }
+
+       // Reset next handle indicator
+       hd = 0;
+       return 0;
 }
 
+
 //
-// Process in a Link Command File -----------------------------------------
+// Load newargv with pointers to arguments found in the buffer
 //
+int parse(char * buf, char * newargv[])
+{
+       int i = 1;
+
+       if (vflag)
+               printf("begin parsing\n");
+
+       while (1)
+       {
+               while (*buf && strchr(",\t\n\r\14 ", *buf))
+                       buf++;
+
+               /* test for eof */
+               if (*buf == '\0' || *buf == 26)
+               {
+                       if (i == 0)
+                       {
+                               printf("No commands in command file\n");
+                               return -1;
+                       }
+                       else
+                       {
+                               return i;
+                       }
+               }
+
+               /* test for comment */
+               if (*buf == '#')
+               {
+                       /* found a comment; skip to next \n and start over */
+                       while (*buf && *buf != '\n')
+                               buf++;
+
+                       continue;
+               }
 
+               if (i == MAXARGS)
+               {
+                       printf("Too many arguments in command file\n");
+                       return -1;
+               }
+
+               newargv[i] = buf;
+
+               while (!strchr(",\t\n\r\14 ", *buf))
+               {
+                       if (*buf == '\0' || *buf == 26)
+                       {
+                               printf("Finished parsing %d args\n", i);
+                               return i;
+                       }
+
+                       buf++;
+               }
+
+               *buf++ = '\0';
+
+               if (vflag)
+                       printf("argv[%d] = \"%s\"\n", i, newargv[i]);
+
+               i++;
+       }
+}
+
+
+//
+// Process in a Link Command File
+//
 int docmdfile(char * fname)
 {
-   int fd;                                                  // File descriptor
-   unsigned size;                                           // Command file size
-   char * ptr;                                               // Pointer
-   int newargc;                                             // New argument count
-   char * (*newargv)[];                                      // New argument value array
-
-   if (vflag > 1)
-          printf("docmdfile(%s)\n", fname);          // Verbose information
-
-   // Allocate memory for new argument values
-   newargv = malloc((long)(sizeof(char *) * MAXARGS));
-
-   if (!newargv)
-   {
-      printf("Out of memory.\n");
-      return 1;
-       }
-
-   // Attempt to open and read in the command file
-   if (fname)
-   { 
-      if ((fd = open(fname, _OPEN_FLAGS)) < 0)
-         {
-         printf("Cannot open command file %s.\n", fname);
-         return 1;
-      }
-
-      size = FSIZE(fd);
-
-         if ((ptr = malloc(size + 1)) == NULL)
-         {
-         printf("Out of memory.\n");
-         close(fd);
-         return 1;
-      }
-
-      if (read(fd, ptr, size) != (int)size)
-         {
-         printf("Read error on command file %s.\n", fname);
-         close(fd);
-         return 1;
-      }
-
-      *(ptr + size) = 0;                                    // Null terminate the buffer
-      close(fd);
-   }
-   else
-   {
-      printf("No command filename specified\n");
-      return 1;
-   }
-
-   // Parse the command file
-   if ((newargc = parse(ptr, *newargv)) == -1)
-   {
-      return 1;
-   }
-
-   // Process the inputted flags
-   if (doargs(newargc, *newargv))
-   {
-      printf("docmdfile: doargs returns TRUE\n");
-      return 1;
-   }
-   
-   free(ptr);
-   free(newargv);
-
-   return 0;
+       int fd;                                     // File descriptor
+       unsigned size;                              // Command file size
+       char * ptr;                                 // Pointer
+       int newargc;                                // New argument count
+       char * (*newargv)[];                        // New argument value array
+
+       // Verbose information
+       if (vflag > 1)
+               printf("docmdfile(%s)\n", fname);
+
+       // Allocate memory for new argument values
+       newargv = malloc((long)(sizeof(char *) * MAXARGS));
+
+       if (!newargv)
+       {
+               printf("Out of memory.\n");
+               return 1;
+       }
+
+       // Attempt to open and read in the command file
+       if (fname)
+       {
+               if ((fd = open(fname, _OPEN_FLAGS)) < 0)
+               {
+                       printf("Cannot open command file %s.\n", fname);
+                       return 1;
+               }
+
+               size = FileSize(fd);
+
+               if ((ptr = malloc(size + 1)) == NULL)
+               {
+                       printf("Out of memory.\n");
+                       close(fd);
+                       return 1;
+               }
+
+               if (read(fd, ptr, size) != (int)size)
+               {
+                       printf("Read error on command file %s.\n", fname);
+                       close(fd);
+                       return 1;
+               }
+
+               *(ptr + size) = 0;                      // Null terminate the buffer
+               close(fd);
+       }
+       else
+       {
+               printf("No command filename specified\n");
+               return 1;
+       }
+
+       // Parse the command file
+       if ((newargc = parse(ptr, *newargv)) == -1)
+       {
+               return 1;
+       }
+
+       // Process the inputted flags
+       if (doargs(newargc, *newargv))
+       {
+               printf("docmdfile: doargs returns TRUE\n");
+               return 1;
+       }
+
+       free(ptr);
+       free(newargv);
+
+       return 0;
 }
 
+
 //
-// Take an Argument List and Parse the Command Line -----------------------
+// Take an Argument List and Parse the Command Line
 //
-
 int doargs(int argc, char * argv[])
 {
-   int i = 1;                                               // Iterator
-   int c;                                                   // Command line character
-   char * ifile, * isym;                                        // File name and symbol name for -i 
-
-   while (i < argc)
-   {                                        // Parse through option switches & files
-      if (argv[i][0] == '-')
-         {                               // Process command line switches
-         if (!argv[i][1])
-                { 
-            printf("Illegal option argument: %s\n\n", argv[i]);
-            display_help();
-                     return 1;
-         }
-
-         c = argv[i++][1];                                  // Get next character in command line
-
-         switch (c)
-                {                                        // Process command line switch
-            case '?':                                       // Display usage information
-            case 'h':
+       int i = 1;                                      // Iterator
+       int c;                                          // Command line character
+       char * ifile, * isym;           // File name and symbol name for -i
+
+       // Parse through option switches & files
+       while (i < argc)
+       {
+               // Process command line switches
+               if (argv[i][0] == '-')
+               {
+                       if (!argv[i][1])
+                       {
+                               printf("Illegal option argument: %s\n\n", argv[i]);
+                               display_help();
+                               return 1;
+                       }
+
+                       c = argv[i++][1];                       // Get next character in command line
+
+                       // Process command line switch
+                       switch (c)
+                       {
+                       case '?':                                       // Display usage information
+                       case 'h':
                        case 'H':
-               display_version();
-               display_help();
-               return 1;
-            case 'a':
-                       case 'A':                                  // Set absolute linking on 
-               if (aflag)
-                                  warn('a', 1);
-
-                          if (i + 2 >= argc)
-                          {
-                  printf("Not enough arguments to -a\n");
-                  return 1;
-               }
-
-               aflag = 1;                                   // Set abs link flag
-               // Segment order is TEXT, DATA, BSS
-               // Text segment can be 'r', 'x' or a value 
-               ttype = 0;
-
-                          if ((*argv[i] == 'r' || *argv[i] == 'R') && !argv[i][1])
-                          {
-                  ttype = -1;                               // TEXT segment is relocatable
-               }
-               else if ((*argv[i] == 'x' || *argv[i] == 'X'))
-                          {
-                  printf("Error in text-segment address: cannot be contiguous\n");
-                  return 1;
-               }
-               else if ((ttype = 0), getval(argv[i], &tval))
-                          {
-                  printf("Error in text-segment address: %s is not 'r', 'x' or an address.", argv[i]);
-                  return 1;
-               }
-
-               i++;
-               // Data segment can be 'r', 'x' or a value 
-               dtype = 0;
-
-                          if ((*argv[i] == 'r' || *argv[i] == 'R') && !argv[i][1])
-                          {
-                  dtype = -1;                               // DATA segment is relocatable
-               }
-               else if ((*argv[i] == 'x' || *argv[i] == 'X'))
-                          {
-                  dtype = -2;                               // DATA follows TEXT
-               }
-               else if ((dtype = 0), getval(argv[i],&dval))
-                          {
-                  printf("Error in data-segment address: %s is not 'r', 'x' or an address.", argv[i]);
-                  return 1;
-               }
-
-               i++;
-               btype = 0;
-
-                          // BSS segment can be 'r', 'x' or a value 
-               if ((*argv[i] == 'r' || *argv[i] == 'R') && !argv[i][1])
-                          {
-                  btype = -1;                               // BSS segment is relocatable
-               }
-               else if ((*argv[i] == 'x' || *argv[i] == 'X'))
-                          {
-                  btype = -3;                               // BSS follows DATA
-               }
-               else if ((btype = 0), getval(argv[i],&bval))
-                          {
-                  printf("Error in bss-segment address: %s is not 'r', 'x[td]', or an address.", argv[i]);
-                  return 1;
-               }
-
-               i++;
-               break;
-            case 'b':
-                       case 'B':                                  // Don't remove muliply defined locals
-               if (bflag)
-                                  warn('b', 1);
-
-                          bflag = 1;
-               break;
-            case 'c':
-                       case 'C':                             // Process a command file
-               if (i == argc)
-                          {
-                  printf("Not enough arguments to -c\n");
-                  return 1;
-               }
-
-               if (docmdfile(argv[i++]))
-                          {
-                  return 1;
-               }
-
-               break;
-            case 'd':
-                       case 'D':                                  // Wait for "return" before exiting 
-               if (dflag)
-                                  warn('d', 0);
-
-                          dflag = 1;
-               waitflag = 1;
-               break;
-            case 'e':
-                       case 'E':                             // Output COFF (absolute only)
-               cflag = 1;
-               break;
-            case 'g':
-                       case 'G':                             // Output source level debugging
-               printf("\'g\' flag not currently implemented\n");
-               gflag = 0;
-               /*
-               if (gflag) warn('g', 1);
-               gflag = 1;
-               */
-               break;
-            case 'i':
-                       case 'I':                             // Include binary file
-               if (i + 2 > argc)
-                          {
-                  printf("Not enough arguments to -i\n");
-                  return 1;
-               }
-
-               ifile = argv[i++];
-               isym = argv[i++];
-                          
-               if ((argv[i-3][2] == 'i') || (argv[i-3][2] == 'I'))
-                          {   // handle -ii (No truncation)
-                  if (!cflag)
-                                         printf("warning: (-ii) COFF format output not specified\n");
-               }
-               else
-                          {                                     // handle -i (Truncation)
-                  if (strlen(isym) > 7)
-                                         isym[7] = '\0';
-               }
-
-               // Place include files in the DATA segment only
-               if (dofile(ifile, DSTSEG_D, isym))
-                                  return 1;
-
-                          break;
-            case 'l':
-                       case 'L':                             // Add local symbols
-               if (lflag)
-                                  warn('l', 1);
-
-                          lflag = 1;
-               break;
-            case 'm':
-                       case 'M':                             // Produce load symbol map
-               if (mflag)
-                                  warn('m', 1);
-
-                          mflag = 1;
-               break;
-            case 'n':
-                       case 'N':                             // Output no header to .abs file
-               if (noheaderflag)
-                                  warn('n', 1);
-
-                          noheaderflag = 1;
-               break;
-            case 'o':
-                       case 'O':                                  // Specify an output file 
-               if (oflag)
-                                  warn('o', 1);
-
-                          oflag = 1;
-
-                          if (i >= argc)
-                          {
-                  printf("No output filename following -o switch\n");
-                  return 1;
-               }
-
-               if (strlen(argv[i]) > FARGSIZE - 5)
-                          {
-                  printf("Output file name too long (sorry!)\n");
-                  return 1;
-               }
-
-               strcpy(ofile, argv[i++]);
-               break;
-            case 'r':
-                       case 'R':                             // Section alignment size
-               if (rflag)
-                                  warn('r', 1);
-
-                          rflag = 1;
-
-                          switch (argv[i-1][2])
-                          {
-                  case 'w': case 'W': secalign = 1;  break; // Word alignment
-                  case 'l': case 'L': secalign = 3;  break; // Long alignment
-                  case 'p': case 'P': secalign = 7;  break; // Phrase alignment
-                  case 'd': case 'D': secalign = 15; break; // Double phrase alignment
-                  case 'q': case 'Q': secalign = 31; break; // Quad phrase alignment
-                  default:            secalign = 7;  break; // Default phrase alignment
-               }
-
-               break;
-            case 's':
-                       case 'S':                             // Output only global symbols
-               if (sflag)
-                                  warn('s', 1);
-
-                          sflag = 1;
-               break;
-            case 'v':
-                       case 'V':                                  // Verbose information
-               if (!vflag && !versflag)
-                          {
-                  display_version();
-               }
-
-               vflag++;
-               break;
-            case 'z':
-                       case 'Z':                                  // Suppress banner flag 
-               if (zflag)
-                                  warn('z', 1);
-
-                          zflag = 1;
-               break;
-            default:
-               printf("unknown option argument `%c'\n", c);
-               return 1;
-         }
-      }
-      else
-         {                                              // Not a switch, then process as a file
-         if (dofile(argv[i++], 0, NULL))
-                        return 1;
-      }
-
-   }
-
-   if (!oflag && vflag)
-   {
-      strcpy(ofile, "output");
-      printf("Output file is %s[.ext]\n", ofile);
-   }
-
-   if (oflag && vflag)
-          printf("Output file is %s\n", ofile);
-
-   if (sflag)
-          lflag = 0;
-
-   return 0;                                               // No problems encountered
+                               display_version();
+                               display_help();
+                               return 1;
+                       case 'a':
+                       case 'A':                                       // Set absolute linking on
+                               if (aflag)
+                                       warn('a', 1);
+
+                               if (i + 2 >= argc)
+                               {
+                                       printf("Not enough arguments to -a\n");
+                                       return 1;
+                               }
+
+                               aflag = 1;                              // Set abs link flag
+                               // Segment order is TEXT, DATA, BSS
+                               // Text segment can be 'r', 'x' or a value
+                               ttype = 0;
+
+                               if ((*argv[i] == 'r' || *argv[i] == 'R') && !argv[i][1])
+                               {
+                                       ttype = -1;                     // TEXT segment is relocatable
+                               }
+                               else if ((*argv[i] == 'x' || *argv[i] == 'X'))
+                               {
+                                       printf("Error in text-segment address: cannot be contiguous\n");
+                                       return 1;
+                               }
+                               else if ((ttype = 0), getval(argv[i], &tval))
+                               {
+                                       printf("Error in text-segment address: %s is not 'r', 'x' or an address.", argv[i]);
+                                       return 1;
+                               }
+
+                               i++;
+                               // Data segment can be 'r', 'x' or a value
+                               dtype = 0;
+
+                               if ((*argv[i] == 'r' || *argv[i] == 'R') && !argv[i][1])
+                               {
+                                       dtype = -1;                     // DATA segment is relocatable
+                               }
+                               else if ((*argv[i] == 'x' || *argv[i] == 'X'))
+                               {
+                                       dtype = -2;                     // DATA follows TEXT
+                               }
+                               else if ((dtype = 0), getval(argv[i],&dval))
+                               {
+                                       printf("Error in data-segment address: %s is not 'r', 'x' or an address.", argv[i]);
+                                       return 1;
+                               }
+
+                               i++;
+                               btype = 0;
+
+                               // BSS segment can be 'r', 'x' or a value
+                               if ((*argv[i] == 'r' || *argv[i] == 'R') && !argv[i][1])
+                               {
+                                       btype = -1;                     // BSS segment is relocatable
+                               }
+                               else if ((*argv[i] == 'x' || *argv[i] == 'X'))
+                               {
+                                       btype = -3;                     // BSS follows DATA
+                               }
+                               else if ((btype = 0), getval(argv[i],&bval))
+                               {
+                                       printf("Error in bss-segment address: %s is not 'r', 'x[td]', or an address.", argv[i]);
+                                       return 1;
+                               }
+
+                               i++;
+                               break;
+                       case 'b':
+                       case 'B':                                       // Don't remove muliply defined locals
+                               if (bflag)
+                                       warn('b', 1);
+
+                               bflag = 1;
+                               break;
+                       case 'c':
+                       case 'C':                                       // Process a command file
+                               if (i == argc)
+                               {
+                                       printf("Not enough arguments to -c\n");
+                                       return 1;
+                               }
+
+                               if (docmdfile(argv[i++]))
+                               {
+                                       return 1;
+                               }
+
+                               break;
+                       case 'd':
+                       case 'D':                                       // Wait for "return" before exiting
+                               if (dflag)
+                                       warn('d', 0);
+
+                               dflag = 1;
+                               waitflag = 1;
+                               break;
+                       case 'e':
+                       case 'E':                                       // Output COFF (absolute only)
+                               cflag = 1;
+                               break;
+                       case 'g':
+                       case 'G':                                       // Output source level debugging
+                               printf("\'g\' flag not currently implemented\n");
+                               gflag = 0;
+                               /*
+                               if (gflag) warn('g', 1);
+                               gflag = 1;
+                               */
+                               break;
+                       case 'i':
+                       case 'I':                                       // Include binary file
+                               if (i + 2 > argc)
+                               {
+                                       printf("Not enough arguments to -i\n");
+                                       return 1;
+                               }
+
+                               ifile = argv[i++];
+                               isym = argv[i++];
+
+                               // handle -ii (No truncation)
+                               if ((argv[i-3][2] == 'i') || (argv[i-3][2] == 'I'))
+                               {
+                                       if (!cflag)
+                                               printf("warning: (-ii) COFF format output not specified\n");
+                               }
+                               // handle -i (Truncation)
+                               else
+                               {
+                                       if (strlen(isym) > 7)
+                                               isym[7] = '\0';
+                               }
+
+                               // Place include files in the DATA segment only
+                               if (dofile(ifile, DSTSEG_D, isym))
+                                       return 1;
+
+                               break;
+                       case 'l':
+                       case 'L':                                       // Add local symbols
+                               if (lflag)
+                                       warn('l', 1);
+
+                               lflag = 1;
+                               break;
+                       case 'm':
+                       case 'M':                                       // Produce load symbol map
+                               if (mflag)
+                                       warn('m', 1);
+
+                               mflag = 1;
+                               break;
+                       case 'n':
+                       case 'N':                                       // Output no header to .abs file
+                               if (noheaderflag)
+                                       warn('n', 1);
+
+                               noheaderflag = 1;
+                               break;
+                       case 'o':
+                       case 'O':                                       // Specify an output file
+                               if (oflag)
+                                       warn('o', 1);
+
+                               oflag = 1;
+
+                               if (i >= argc)
+                               {
+                                       printf("No output filename following -o switch\n");
+                                       return 1;
+                               }
+
+                               if (strlen(argv[i]) > FARGSIZE - 5)
+                               {
+                                       printf("Output file name too long (sorry!)\n");
+                                       return 1;
+                               }
+
+                               strcpy(ofile, argv[i++]);
+                               break;
+                       case 'r':
+                       case 'R':                                       // Section alignment size
+                               if (rflag)
+                                       warn('r', 1);
+
+                               rflag = 1;
+
+                               switch (argv[i-1][2])
+                               {
+                                       case 'w': case 'W': secalign = 1;  break; // Word alignment
+                                       case 'l': case 'L': secalign = 3;  break; // Long alignment
+                                       case 'p': case 'P': secalign = 7;  break; // Phrase alignment
+                                       case 'd': case 'D': secalign = 15; break; // Double phrase alignment
+                                       case 'q': case 'Q': secalign = 31; break; // Quad phrase alignment
+                                       default:            secalign = 7;  break; // Default phrase alignment
+                               }
+
+                               break;
+                       case 's':
+                       case 'S':                                       // Output only global symbols
+                               if (sflag)
+                                       warn('s', 1);
+
+                               sflag = 1;
+                               break;
+                       case 'v':
+                       case 'V':                                       // Verbose information
+                               if (!vflag && !versflag)
+                               {
+                                       display_version();
+                               }
+
+                               vflag++;
+                               break;
+                       case 'w':
+                       case 'W':                                       // Show warnings flag
+                               if (wflag)
+                                       warn('w', 1);
+
+                               wflag = 1;
+                               break;
+                       case 'z':
+                       case 'Z':                                       // Suppress banner flag
+                               if (zflag)
+                                       warn('z', 1);
+
+                               zflag = 1;
+                               break;
+                       default:
+                               printf("unknown option argument `%c'\n", c);
+                               return 1;
+                       }
+               }
+               else
+               {
+                       // Not a switch, then process as a file
+                       if (dofile(argv[i++], 0, NULL))
+                               return 1;
+               }
+       }
+
+       if (!oflag && vflag)
+       {
+               strcpy(ofile, "output");
+               printf("Output file is %s[.ext]\n", ofile);
+       }
+
+       if (oflag && vflag)
+               printf("Output file is %s\n", ofile);
+
+       if (sflag)
+               lflag = 0;
+
+       // No problems encountered
+       return 0;
 }
 
 
 //
-// Display Version Information --------------------------------------------
+// Display Version Information
 //
 void display_version(void)
 {
        if (displaybanner)// && vflag)
        {
-               printf("\nReboot's Linker for Atari Jaguar\n"); 
-               printf("Copyright (c) 199x Allan K. Pratt, 2011 Reboot\n"); 
+               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);
        }
 }
 
 
 //
-// Display Command Line Help -----------------------------------------------
+// Display Command Line Help
 //
 void display_help(void)
 {
@@ -2569,13 +2937,14 @@ void display_help(void)
        printf("                           q: quad phrase (32 bytes)\n");
        printf("   -s                      output only global symbols\n");
        printf("   -v                      set verbose mode\n");
+       printf("   -w                      show linker warnings\n");
        printf("   -z                      suppress banner\n");
        printf("\n");
 }
 
 
 //
-// Application Exit -------------------------------------------------------
+// Application Exit
 //
 void rln_exit(void)
 {
@@ -2588,7 +2957,7 @@ void rln_exit(void)
        // Wait for return key if requested
        if (waitflag)
        {
-               printf("\nPress the <return> key to continue. ");
+               printf("\nPress the [RETURN] key to continue. ");
                fgets(tempbuf, 128, stdin);
        }
 
@@ -2597,7 +2966,7 @@ void rln_exit(void)
 
 
 //
-// Determine Processor Endianess ------------------------------------------
+// Determine Processor Endianess
 //
 int get_endianess(void)
 {
@@ -2605,74 +2974,78 @@ int get_endianess(void)
        char * p = (char *)&i;
 
        if (p[0] == 1)
-               return 0;               // LITTLE
+               return ENDIANNESS_LITTLE;
 
-       return 1;                       // BIG
+       return ENDIANNESS_BIG;
 }
 
 
 //
-// Application Code Starts Here -------------------------------------------
+// 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
+       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
+       endian = get_endianess();               // Get processor endianess
+       cmdlnexec = argv[0];                    // Obtain executable name
        s = getenv("RLNPATH");
 
-       if (s)                                                   // Attempt to obtain env variable
-               strcpy(libdir, s);                                    // Store it if found
+       if (s)                                                  // Attempt to obtain env variable
+               strcpy(libdir, s);                      // Store it if found
 
+       // Parse the command line
        if (doargs(argc, argv))
-       {                                 // Parse the command line
+       {
                errflag = 1;
                rln_exit();
        }
 
        if (!zflag && !vflag)
        {
-               display_version();                                    // Display version information
-               versflag = 1;                                          // We've dumped the version banner 
+               display_version();                      // Display version information
+               versflag = 1;                           // We've dumped the version banner
        }
 
-       if (flush_handles())
-       {                                    // Process in specified files/objects
+       // Process in specified files/objects
+       if (ProcessObjectFiles())
+       {
                errflag = 1;
                rln_exit();
        }
 
+       // Remove elements from unresolved list
        if (dolist())
-       {                                           // Remove elements from unresolved list
+       {
                errflag = 1;
                rln_exit();
        }
 
+       // Check that there is something to link
        if (olist == NULL)
-       {                                      // Check that there is something to link
-//             printf("No object files to link.\n\n");
-//             errflag = 1;
+       {
                display_help();
                rln_exit();
        }
 
+       // Report unresolved externals
        if (unresolved != NULL)
-       {                                 // Report unresolved externals
+       {
                printf("UNRESOLVED SYMBOLS\n");
 
+               // Don't list them if two -u's or more
                if (uflag < 2)
-               {                                       // Don't list them if two -u's or more 
+               {
                        utemp = unresolved;
 
                        while (utemp != NULL)
                        {
-                       printf("\t%s (",utemp->h_sym);
-                       put_name(utemp->h_ofile);
-                       printf(")\n");
-                       utemp = utemp->h_next;
+                               printf("\t%s (",utemp->h_sym);
+                               put_name(utemp->h_ofile);
+                               printf(")\n");
+                               utemp = utemp->h_next;
                        }
                }
 
@@ -2683,47 +3056,53 @@ int main(int argc, char * argv[])
                }
        }
 
+       // Make one output file from input objs
        if ((header = make_ofile()) == NULL)
-       {                    // Make one output file from input objs
+       {
                errflag = 1;
                rln_exit();
        }
 
+       // Partial linking
        if (pflag)
-       {                                              // Partial linking
+       {
                printf("TO DO:Partial linking\n");
                errflag = 1;
        }
+       // Relocatable linking
        else if (!aflag)
-       {                                     // Relocatable linking
+       {
                printf("TO DO:Relocatable linking\n");
                errflag = 1;
        }
+       // Absolute linking
        else
-       {                                                 // Absolute linking
+       {
                if (vflag)
                {
                        printf("Absolute linking ");
 
                        if (cflag)
-                       printf("(COF)\n"); 
+                               printf("(COF)\n"); 
                        else
-                       printf("(ABS)\n");
+                               printf("(ABS)\n");
                }
 
                if (vflag > 1)
-               printf("Header magic is 0x%04X\n", (unsigned int)header->magic);
+                       printf("Header magic is 0x%04X\n", (unsigned int)header->magic);
 
                if (write_ofile(header))
-               errflag = 1;
+                       errflag = 1;
        }
 
-       if (mflag)                                                // Display the loaded symbols map
+       // Display the loaded symbols map
+       if (mflag)
                if (write_map(header))
                        errflag = 1;
 
+       // Display segment size summary
        if (vflag)
-       {                                             // Display segment size summary
+       {
                printf("\n");
                printf("+---------+----------+----------+----------+\n");
                printf("| Segment |     TEXT |     DATA |      BSS |\n");
@@ -2732,6 +3111,9 @@ int main(int argc, char * argv[])
                printf("+---------+----------+----------+----------+\n\n");
        }
 
-       free(header);                                            // Free allocated memory
-       rln_exit();                                              // Perform application exit
+//printf("BIG_ENDIAN = %i, LITTLE_ENDIAN = %i\n", BIG_ENDIAN, LITTLE_ENDIAN);
+
+       free(header);
+       rln_exit();
 }
+