//
// 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 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[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
uint16_t getword(uint8_t * src)
{
uint16_t temp;
- uint8_t * out;
+ uint8_t * out = (uint8_t *)&temp;
- out = (uint8_t *)&temp;
-#if 0
- // Shamus: This assumes little endian...
- *out++ = src[1];
- *out++ = src[0];
-// Shamus: And *why* do this as a uint32_t???
-// *out++ = 0;
-// *out = 0;
-#else
if (endian == ENDIANNESS_BIG)
{
out[0] = src[0];
out[0] = src[1];
out[1] = src[0];
}
-#endif
return temp;
}
//
-// 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;
}
//
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
+ 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
// 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 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++)
- { // Search for object file name
+ {
if (!strcmp(ofile->o_name, obj_fname[j]))
{
- ssidx = j; // Object file name found
+ ssidx = j; // Object file name found
break;
}
- tsegoffset += obj_segsize[j][0]; // Accumulate segment sizes
+ tsegoffset += obj_segsize[j][0]; // Accumulate segment sizes
dsegoffset += obj_segsize[j][1];
bsegoffset += obj_segsize[j][2];
}
// 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
+ 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.
+ // 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);
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
+ // 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
+ 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
+ ssidx = j; // Symbol object filename
break;
}
- tsegoffset += obj_segsize[j][0]; // Accumulate segment sizes
+ tsegoffset += obj_segsize[j][0]; // Accumulate segment sizes
dsegoffset += obj_segsize[j][1];
bsegoffset += obj_segsize[j][2];
}
return 1;
}
- type = hptr->h_type; // Update type with global type
+ type = hptr->h_type; // Update type with global type
if (type == 0x03000000)
- type = 0x02000000; // Reset external flag if absolute
+ 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 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
+ case 0x02000000: // Absolute value
+ case 0x04000000: // TEXT segment
value = hptr->h_value;
break;
- case 0x06000000: // DATA segment
+ case 0x06000000: // DATA segment
value = hptr->h_value - (hptr->h_ofile->o_header.tsize);
break;
- case 0x08000000: // BSS segment
+ 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
+ // Process and update the value dependant on whether the symbol is a
+ // debug symbol or not
if (type & 0xF0000000)
- { // DEBUG SYMBOL
+ {
+ // DEBUG SYMBOL
// Set the correct debug symbol base address (TEXT segment)
dbgsymbase = 0;
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.
+ {
+ // 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
value = bbase + bsegoffset + value;
else
value = bbase + bsegoffset
- +(value - (ofile->o_header.tsize + ofile->o_header.dsize));
+ + (value - (ofile->o_header.tsize + ofile->o_header.dsize));
putlong(symptr + 8, value);
break;
}
}
- dosymi++; // Increment dosym() processsing
+ // Increment dosym() processsing
+ dosymi++;
+
return 0;
}
//
-// Free Up Hash Records
+// Free up hash memory
//
void hash_free(void)
{
{
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
return -1;
}
- ost_ptr = ost; // Set OST start pointer
- ost_end = ost + OST_BLOCK; // Set OST end pointer
+ ost_ptr = ost; // Set OST start pointer
+ ost_end = ost + OST_BLOCK; // Set OST end pointer
if ((oststr = malloc(OST_BLOCK)) == NULL)
{
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
+ 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.
+ // 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)
{
- if ((ost = realloc(ost, (unsigned)(ost_end + OST_BLOCK))) == NULL)
+#warning "!!! Bad logic in realloc call !!!"
+ if ((ost = realloc(ost, (ost_end + OST_BLOCK))) == NULL)
{
printf("OST memory reallocation error.\n");
return -1;
if ((oststr_ptr + (slen + 1 + 4)) > oststr_end)
{
- if ((oststr = realloc(oststr, (unsigned)(oststr_end + OST_BLOCK))) == NULL)
+#warning "!!! Bad logic in realloc call !!!"
+ if ((oststr = realloc(oststr, (oststr_end + OST_BLOCK))) == NULL)
{
printf("OSTSTR memory reallocation error.\n");
return -1;
}
else
{
- ostresult = ost_lookup(name); // Get symbol index in OST
+ 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
|| ((ostresult != -1) && gflag && (type & 0xF0000000)) || (ostresult == -1))
{
if ((type & 0xF0000000) == 0x40000000)
- putlong(ost_ptr, 0x00000000); // Zero string table offset for dbg line
+ putlong(ost_ptr, 0x00000000); // Zero string table offset for dbg line
else
- putlong(ost_ptr, (oststr_ptr - oststr)); // String table offset of symbol string
+ putlong(ost_ptr, (oststr_ptr - oststr)); // String table offset of symbol string
putlong(ost_ptr + 4, type );
putlong(ost_ptr + 8, value);
// 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
+ strcpy(oststr_ptr, name); // Put symbol name in string table
+ *(oststr_ptr + slen) = '\0'; // Add null terminating character
oststr_ptr += (slen + 1);
- putlong(oststr_ptr, 0x00000000); // Null terminating long
- putlong(oststr, (oststr_ptr - oststr)); // Update size of string table
+ putlong(oststr_ptr, 0x00000000); // Null terminating long
+ putlong(oststr, (oststr_ptr - oststr)); // Update size of string table
+ }
+
+ if (vflag > 1)
+ {
+ printf("ost_add: (%s), type=$%08X, val=$%08X\n", name, type, value);
}
- return ost_index++; // Return OST index
+ return ost_index++;
}
}
- // not sure about this as it could affect return indices. needed to stop return error.
+ // Not sure about this as it could affect return indices. Needed to stop
+ // return error.
return 0;
}
//
int ost_lookup(char * sym)
{
- int i; // Iterator
- int stro = 4; // Offset in string table
+ int i; // Iterator
+ int stro = 4; // Offset in string table
for(i=0; i<ost_index; i++)
{
//
int dounresolved(void)
{
- struct HREC * hptr, * htemp; // Hash record pointers
- hptr = unresolved; // Point to unresolved symbols list
+ 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;
-//printf("dounresolved(): added %s\n",hptr->h_sym);
- htemp = hptr->h_next; // Temporarily get ptr to next record
- free(hptr); // Free current record
- hptr = htemp; // Make next record ptr, current
+ if (vflag > 1)
+ printf("dounresolved(): added %s\n", hptr->h_sym);
+
+ 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
+ unresolved = NULL; // Zero unresolved record list
return 0;
}
//
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
+ 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);
+ pad = ((ofile->o_header.tsize + secalign) & ~secalign);
textoffset += (ofile->o_header.tsize + (pad - ofile->o_header.tsize));
if (vflag > 1)
//
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
+ 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)
&& (lastdot > strrchr(tmpbuf, '\\'));
if ((fd = open(tmpbuf, _OPEN_FLAGS)) >= 0)
- goto ok; // Try to open file as passed first
+ goto ok; // Try to open file as passed first
if (!hasdot)
{
- strcat(tmpbuf, ".o"); // Try to open file with '.o' added
+ 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);
+ strcpy(tmpbuf, libdir);
// Add a trailing path char if there isn't one already
pathadd(tmpbuf);
strcat(tmpbuf, name);
}
}
- return -1; // Couldn't open file at all
+ // Couldn't open file at all
+ return -1;
-// What more Atari label use - sigh!!!
+// There are worse things... :-P
ok:
if ((tmpbuf = realloc(tmpbuf, (long)strlen(tmpbuf) + 1)) == NULL)
{
//
int dofile(char * fname, int flag, char * sym)
{
- int fd; // File descriptor
- int temp; // Temporary storage
+ int fd;
+ int temp;
// Verbose information
if (vflag)
// Reached maximum file handles
if (hd == NHANDLES)
{
- if (flush_handles())
+ if (ProcessObjectFiles())
return 1;
}
// 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
if (temp > 99)
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)
{
}
}
- hd++; // Increment next handle index
- return 0; // No problems
+ // Increment next handle index
+ hd++;
+ // No problems
+ return 0;
}
//
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;
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;
}
//
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
+ strcat(ofile, ".cof"); // COF files
else if (aflag && !cflag)
- strcat(ofile, ".abs"); // ABS files
+ strcat(ofile, ".abs"); // ABS files
else
- strcat(ofile, ".o"); // Object files (partial linking etc)
+ 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;
}
// 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)
}
// 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;
// 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)
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
}
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;
}
//
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");
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)
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);
}
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);
}
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);
}
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);
printf("\n\n");
}
- return 0; // All done
+ return 0;
}
// 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);
//
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)
{
}
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
}
}
- 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
if (dounresolved())
return NULL;
- tptr = 0; // Initialise base addresses
+ tptr = 0; // Initialise base addresses
dptr = 0;
bptr = 0;
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
{
hash_free(); // Done with global symbol hash tables
- return (ret ? (unsigned)NULL : header);
+ return (ret ? (struct OHEADER *)NULL : header);
}
//
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
// Shamus: Moar testing...
if (vflag > 1)
{
- printf("add_to_hlist(): hptr=$%08X, sym=\"%s\", ofile=$%08X, value=%li, type=%i", (unsigned int)hptr, sym, (unsigned int)ofile, value, type);
+ 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;
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)
{
//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)
{
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
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);
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
if (wflag)
{
putword(sym + 8, ABST_EXTERN);
}
+ // They're both common
else
- { // They're both common
+ {
if (hptr->h_value < value)
{
hptr->h_value = value;
//
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
+ 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
+ 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
+ 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
+ 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);
// Then add to hash table
if (hash_add(symbol, type, value, Ofile))
{
- return 1; // Error if addition failed
+ 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
+ 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
+ return 1; // Error if addition failed
}
}
}
- sfix += 12; // Increment symbol fixup pointer
- nsymbols--; // Decrement num of symbols to process
+ sfix += 12; // Increment symbol fixup pointer
+ nsymbols--; // Decrement num of symbols to process
}
- return 0; // Success loading symbols
+ // Success loading symbols
+ return 0;
}
//
-// Process Object File for Symbols
+// 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
+ struct OFILE * Ofile; // Object record pointer
+ char * temp; // Temporary data pointer
// Allocate memory for object record ptr
if ((Ofile = new_ofile()) == NULL)
return 1;
}
- strcpy(Ofile->o_name, temp); // Store filename
- strcpy(Ofile->o_arname, aname); // Store archive name
+ 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_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
+ // 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);
// Round BSS off to alignment boundary
Ofile->o_header.bsize = (Ofile->o_header.bsize + secalign) & ~secalign;
- if (Ofile->o_header.dsize & 7)
+ if ((Ofile->o_header.dsize & 7) && wflag)
{
printf("Warning: data segment size of ");
put_name(Ofile);
//
-// 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 ((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;
//
-// Extract Filename from Path
+// Extract filename from path
//
char * path_tail(char * name)
{
-// char * temp = MAX(strrchr(name, '/'), MAX(strrchr(name, ':'), strrchr(name, '\\')));
char * temp = strrchr(name, PATH_DELIMITER);
// Return what was passed in if path delimiter was not found
//
-// 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);
+ {
+ // 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
+ *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
}
//
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;
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
+ 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;
}
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
+ 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);
}
// 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;
}
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;
// 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 an ar archive file (*.a)
+//
+int DoArchive(char * fname, int fd)
+{
+ // 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;
}
//
-// Process In Outstanding Object Files
+// Process files (*.o, *.a) passed in on the command line
//
-int flush_handles(void)
+int ProcessObjectFiles(void)
{
- int i; // Iterator
- char magic[4]; // Magic header number
- // unsigned test;
+ int i; // Iterator
+ char magic[8]; // Magic header number
// Process all handles
for(i=0; i<(int)hd; i++)
}
if (!hflag[i])
- { // Attempt to read file magic number
- // OBJECT FILES
- if (read(handle[i],magic,4) != 4)
+ {
+ // 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]); // Close file and error
+ close(handle[i]);
return 1;
}
- lseek(handle[i], 0L, 0); // Reset to start of input file
- // test = getlong(magic); printf("Magic Number is 0x%08X\n", test);
+ lseek(handle[i], 0L, 0); // Reset to start of input file
- if (getlong(magic) == 0x00000107)
- { // Look for SMAC/MAC object files
- if (doobject(name[i], handle[i], 0L)) // Process input object 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
{
- printf("%s is not a supported object file\n", name[i]);
- close(handle[i]); // Close file and error
+ // 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 in in text segment
+ // 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;
}
}
}
- hd = 0; // Reset next handle indicator
- return 0; // Return
+ // Reset next handle indicator
+ hd = 0;
+ return 0;
}
//
-// Load newargv with Pointers to Arguments Found in the Buffer
+// Load newargv with pointers to arguments found in the buffer
//
int parse(char * buf, char * newargv[])
{
return 1;
}
- size = FSIZE(fd);
+ size = FileSize(fd);
if ((ptr = malloc(size + 1)) == NULL)
{
//
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
+ 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)
- { // Parse through option switches & files
+ {
+ // Process command line switches
if (argv[i][0] == '-')
- { // Process command line switches
+ {
if (!argv[i][1])
{
printf("Illegal option argument: %s\n\n", argv[i]);
return 1;
}
- c = argv[i++][1]; // Get next character in command line
+ c = argv[i++][1]; // Get next character in command line
+ // Process command line switch
switch (c)
- { // Process command line switch
- case '?': // Display usage information
+ {
+ case '?': // Display usage information
case 'h':
case 'H':
display_version();
display_help();
return 1;
case 'a':
- case 'A': // Set absolute linking on
+ case 'A': // Set absolute linking on
if (aflag)
warn('a', 1);
return 1;
}
- aflag = 1; // Set abs link flag
+ 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
+ ttype = -1; // TEXT segment is relocatable
}
else if ((*argv[i] == 'x' || *argv[i] == 'X'))
{
if ((*argv[i] == 'r' || *argv[i] == 'R') && !argv[i][1])
{
- dtype = -1; // DATA segment is relocatable
+ dtype = -1; // DATA segment is relocatable
}
else if ((*argv[i] == 'x' || *argv[i] == 'X'))
{
- dtype = -2; // DATA follows TEXT
+ dtype = -2; // DATA follows TEXT
}
else if ((dtype = 0), getval(argv[i],&dval))
{
// 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
+ btype = -1; // BSS segment is relocatable
}
else if ((*argv[i] == 'x' || *argv[i] == 'X'))
{
- btype = -3; // BSS follows DATA
+ btype = -3; // BSS follows DATA
}
else if ((btype = 0), getval(argv[i],&bval))
{
i++;
break;
case 'b':
- case 'B': // Don't remove muliply defined locals
+ case 'B': // Don't remove muliply defined locals
if (bflag)
warn('b', 1);
bflag = 1;
break;
case 'c':
- case 'C': // Process a command file
+ case 'C': // Process a command file
if (i == argc)
{
printf("Not enough arguments to -c\n");
break;
case 'd':
- case 'D': // Wait for "return" before exiting
+ case 'D': // Wait for "return" before exiting
if (dflag)
warn('d', 0);
waitflag = 1;
break;
case 'e':
- case 'E': // Output COFF (absolute only)
+ case 'E': // Output COFF (absolute only)
cflag = 1;
break;
case 'g':
- case 'G': // Output source level debugging
+ case 'G': // Output source level debugging
printf("\'g\' flag not currently implemented\n");
gflag = 0;
/*
*/
break;
case 'i':
- case 'I': // Include binary file
+ case 'I': // Include binary file
if (i + 2 > argc)
{
printf("Not enough arguments to -i\n");
ifile = argv[i++];
isym = argv[i++];
+ // handle -ii (No truncation)
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");
}
+ // handle -i (Truncation)
else
- { // handle -i (Truncation)
+ {
if (strlen(isym) > 7)
isym[7] = '\0';
}
break;
case 'l':
- case 'L': // Add local symbols
+ case 'L': // Add local symbols
if (lflag)
warn('l', 1);
lflag = 1;
break;
case 'm':
- case 'M': // Produce load symbol map
+ case 'M': // Produce load symbol map
if (mflag)
warn('m', 1);
mflag = 1;
break;
case 'n':
- case 'N': // Output no header to .abs file
+ case 'N': // Output no header to .abs file
if (noheaderflag)
warn('n', 1);
noheaderflag = 1;
break;
case 'o':
- case 'O': // Specify an output file
+ case 'O': // Specify an output file
if (oflag)
warn('o', 1);
strcpy(ofile, argv[i++]);
break;
case 'r':
- case 'R': // Section alignment size
+ case 'R': // Section alignment size
if (rflag)
warn('r', 1);
break;
case 's':
- case 'S': // Output only global symbols
+ case 'S': // Output only global symbols
if (sflag)
warn('s', 1);
sflag = 1;
break;
case 'v':
- case 'V': // Verbose information
+ case 'V': // Verbose information
if (!vflag && !versflag)
{
display_version();
vflag++;
break;
case 'w':
- case 'W': // Show warnings flag
+ case 'W': // Show warnings flag
if (wflag)
warn('w', 1);
wflag = 1;
break;
case 'z':
- case 'Z': // Suppress banner flag
+ case 'Z': // Suppress banner flag
if (zflag)
warn('z', 1);
}
}
else
- { // Not a switch, then process as a file
+ {
+ // Not a switch, then process as a file
if (dofile(argv[i++], 0, NULL))
return 1;
}
-
}
if (!oflag && vflag)
if (sflag)
lflag = 0;
- return 0; // No problems encountered
+ // No problems encountered
+ return 0;
}
if (displaybanner)// && vflag)
{
printf("\nReboot's Linker for Atari Jaguar\n");
- printf("Copyright (c) 199x Allan K. Pratt, 2011 Reboot\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);
}
}
//
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))
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
}
// Process in specified files/objects
- if (flush_handles())
+ if (ProcessObjectFiles())
{
errflag = 1;
rln_exit();
// Check that there is something to link
if (olist == NULL)
{
-// printf("No object files to link.\n\n");
-// errflag = 1;
display_help();
rln_exit();
}
errflag = 1;
}
- if (mflag) // Display the loaded symbols map
+ // Display the loaded symbols map
+ if (mflag)
if (write_map(header))
errflag = 1;
//printf("BIG_ENDIAN = %i, LITTLE_ENDIAN = %i\n", BIG_ENDIAN, LITTLE_ENDIAN);
- free(header); // Free allocated memory
- rln_exit(); // Perform application exit
+ free(header);
+ rln_exit();
}
+
projects / rln / blobdiff