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 pflag, uflag, wflag = 1; // 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 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 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
+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 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
+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
+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
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;
+
+ out = (uint8_t *)&temp;
- if (endian == 1)
+ if (endian == ENDIANNESS_BIG)
{
*out++ = src[0];
*out++ = src[1];
//
// 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;
- out = (char *)&temp;
+ out = (uint8_t *)&temp;
+#if 0
+ // Shamus: This assumes little endian...
*out++ = src[1];
*out++ = src[0];
- *out++ = 0;
- *out = 0;
+// Shamus: And *why* do this as a uint32_t???
+// *out++ = 0;
+// *out = 0;
+#else
+ if (endian == ENDIANNESS_BIG)
+ {
+ out[0] = src[0];
+ out[1] = src[1];
+ }
+ else
+ {
+ out[0] = src[1];
+ out[1] = src[0];
+ }
+#endif
return temp;
}
//
// 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;
}
//
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;
- }
+ 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];
- }
+ 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;
- }
+ 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;
- }
+ // 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
- // 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]))
+ // 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)
{
- ssidx = j; // Symbol object filename
- break;
- }
+ printf("dosym() : Cannot determine symbol : %s\n", sym);
+ return 1;
+ }
- 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;
- }
+ // 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;
+ }
- type = hptr->h_type; // Update type with global type
+ tsegoffset += obj_segsize[j][0]; // Accumulate segment sizes
+ dsegoffset += obj_segsize[j][1];
+ bsegoffset += obj_segsize[j][2];
+ }
- if (type == 0x03000000)
- type = 0x02000000; // Reset external flag if absolute
+ if (ssidx == -1)
+ {
+ printf("dosym() : Cannot get object file segment size : %s\n",
+ ofile->o_name);
+ return 1;
+ }
- // 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)
+ 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)
{
- 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;
- }
- }
- }
+ 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;
+ // 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];
+ 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;
- }
+ 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;
- }
- }
+ 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;
- // 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;
- }
- }
- }
+ 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;
+ dosymi++; // Increment dosym() processsing
+ return 0;
}
}
-//
+//
// 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++)
{
if (iscommon(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;
- }
+ }
}
}
//
-// 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
+ 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);
+ 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 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;
+ }
- // 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
- }
- }
+ 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)
+ {
+ 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 0
+if ((strcmp(name, "U235SE_playback_rate") == 0)
+ || (strcmp(name, "U235SE_playback_period") == 0))
+{
+ printf("%s found: ost[0]=$%08X, ost[1]=$%08X, ost[2]=$%08X\n", name, getlong(ost_ptr), type, value);
+}
+#endif
+ // 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
+#if 0
+if ((strcmp(name, "U235SE_playback_rate") == 0)
+ || (strcmp(name, "U235SE_playback_period") == 0))
+ printf("%s was IGNORED!\n", name);
+#endif
+ }
+ 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 0
+if ((strcmp(name, "U235SE_playback_rate") == 0)
+ || (strcmp(name, "U235SE_playback_period") == 0))
+ printf("%s was added to the ost.\n", name);
+#endif
+ 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 0; // not sure about this as it could affect return indices. needed to stop return error.
+ return ost_index++; // Return OST index
+ }
+ }
+
+ // not sure about this as it could affect return indices. needed to stop return error.
+ return 0;
}
for(i=0; i<ost_index; i++)
{
- if (!strcmp(oststr + stro, sym))
+ if (strcmp(oststr + stro, sym) == 0)
+ {
+#if 0
+ // Shamus: More debug stuffs...
+ if (vflag > 1)
+ {
+ printf("ost_lookup(): Found @ %i (looking for '%s', found '%s')\n", i, sym, oststr + stro);
+ }
+#endif
+
return i + 1;
- else
- stro += strlen(oststr + stro) + 1;
+ }
+
+ stro += strlen(oststr + stro) + 1;
}
return -1;
{
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
//
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;
- }
+ 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 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;
- }
+ if (vflag > 1)
+ printf("reloc_segment(%s, TEXT) : No Relocation Data\n", ofile->o_name);
- // 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);
+ 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);
- // Obtain pointer to start of symbols
- symbols = symtab + ofile->o_header.ssize;
+ return 0;
+ }
- // Obtain pointer to start of TEXT segment
- sptr = ofile->o_image + 32;
+ // 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 TEXT relocation records
- rptr = sptr + (ofile->o_header.tsize + ofile->o_header.dsize);
+ // 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);
- relocsize = ofile->o_header.absrel.reloc.tsize;
+ // Obtain pointer to start of symbols
+ symbols = symtab + ofile->o_header.ssize;
- // 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;
- }
+ // Obtain pointer to start of TEXT segment
+ sptr = ofile->o_image + 32;
- // 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 pointer to start of TEXT relocation records
+ rptr = sptr + (ofile->o_header.tsize + ofile->o_header.dsize);
- // 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);
+ relocsize = ofile->o_header.absrel.reloc.tsize;
- putlong(sptr + addr, newdata);
+ if (vflag)
+ {
+ printf("RELOCSIZE :: %d Records = %d\n",relocsize,relocsize/8);
+ }
- }
- else if (relreloc) {
- putword(sptr + addr, newdata - tbase - addr - ofile->o_tbase);
- }
+ // 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;
+ }
- rptr += 8; // Point to the next relocation record
- }
+ // 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);
+//nope, false lead. -0 & -2 give bad results
+// newdata = getlong(ost + ((ssidx - 2) * 12) + 8);
+ }
- // 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));
- }
+ // 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);
- return 0; // Return value, should always be zero
+ 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;
}
//
int tryopen(char ** p_name)
{
- char * name = * p_name; // Filename
+ 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
+ // 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");
}
strcpy(tmpbuf, name);
- hasdot = ((lastdot = strrchr(tmpbuf, '.')) > strrchr(tmpbuf, '/')) &&
- (lastdot > strrchr(tmpbuf, '\\'));
+ 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)
return -1; // Couldn't open file at all
-ok: // What more Atari label use - sigh!!!
+// What more Atari label use - sigh!!!
+ok:
if ((tmpbuf = realloc(tmpbuf, (long)strlen(tmpbuf) + 1)) == NULL)
{
printf("tryopen() : out of memory\n");
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);
}
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()
hflag[hd] = flag;
{
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)
{
// 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
if (!fd)
- {
+ {
printf("Can't open output file %s\n", ofile); // Error opening output file
return 1;
}
{
tsoff = dsoff = bsoff = 0xA8; // Initialises segment offsets
- // Process each object file segment size to obtain a cumulative segment size for both
+ // 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++)
{
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
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
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
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
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;
}
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;
goto werror;
// Pad to required alignment boundary
- if (segmentpad(fd, osize, 0))
+ if (segmentpad(fd, osize, 0))
goto werror;
symoffset += osize;
// 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
+ // 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
}
}
- // Close the file
+ // Close the file
if (fclose(fd))
{
printf("Close error on output file %s\n",ofile);
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)
{
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
textsize = datasize = bsssize = 0; // Initialise cumulative segment sizes
- // For each object file, accumulate the sizes of the segments but remove those
+ // 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
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;
}
}
ost_add("_BSS_E", 0x09000000, tval + textsize + datasize + bsssize);
}
else
- {
+ {
// BSS is independant of DATA
bbase = bval;
ost_add("_BSS_E", 0x09000000, bval + bsssize);
}
}
- // 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
dptr = 0;
{
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;
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);
}
//
// 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
return 1;
}
+ // 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);
+ }
+
for(i=0; i<SYMLEN; i++)
htemp->h_sym[i] = '\0';
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
+ if (strcmp(symbol, hptr->h_sym) == 0)
return hptr;
hptr = hptr->h_next; // Return hash pointer if found
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);
}
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);
}
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);
putword(sym + 8, ABST_EXTERN);
}
else
- { // They're both common
+ { // They're both common
if (hptr->h_value < value)
{
hptr->h_value = value;
// 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)
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.tsize
+ + Ofile->o_header.dsize
+ Ofile->o_header.absrel.reloc.tsize
+ Ofile->o_header.absrel.reloc.dsize;
sfix = ptr; // Set symbol fixup pointer
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.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
+
+ // Round BSS off to alignment boundary
Ofile->o_header.bsize = (Ofile->o_header.bsize + secalign) & ~secalign;
if (Ofile->o_header.dsize & 7)
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))
return 1;
}
- // Add this file to the olist
- if (olist == NULL)
+ // Add this file to the olist
+ if (olist == NULL)
olist = Ofile;
- else
+ else
olast->o_next = Ofile;
olast = Ofile;
// 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;
int pladd(char * ptr, char * fname)
{
if (plist == NULL)
- {
+ {
plist = new_ofile(); // First time object record allocation
plast = plist; // Update last object record pointer
}
}
if (plast == NULL)
- {
+ {
printf("Out of memory.\n"); // Error if memory allocation fails
return 1;
}
//
int doinclude(char * fname, int handle, char * sym1, char * sym2, int segment)
{
- long fsize, dsize, size; // File, DATA segment and image sizes
+ long fsize, dsize, size; // File, DATA segment and image sizes
char * ptr, * sptr; // Data pointers
int i; // Iterators
int sym1len = 0; // Symbol 1 length
strcpy(obj_fname[obj_index], path_tail(fname));
- // Build this image's dummy header
+ // 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;
}
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_index++; // Increment object count
- putlong(ptr+12, 0L); // BSS 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
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++;
+ sptr[i] = *sym1++;
sptr += (sym1len-1); // Step past symbol string
*sptr = '\0'; // Terminate symbol string
long size; // File size
if (ptr == NULL)
- {
+ {
size = FSIZE(fd); // Get size of input object file
// Allocate memory for file data
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);
}
close(handle[i]); // Close file and error
return 1;
}
-
- lseek(handle[i], 0L, 0); // Reset to start of input file
+
+ 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;
+ 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))
+ 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]);
+ free(name[i]);
if (hflag[i])
{
// 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);
{
int i = 1; // Iterator
int c; // Command line character
- char * ifile, * isym; // File name and symbol name for -i
+ 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;
display_help();
return 1;
case 'a':
- case 'A': // Set absolute linking on
+ case 'A': // Set absolute linking on
if (aflag)
warn('a', 1);
aflag = 1; // Set abs link flag
// Segment order is TEXT, DATA, BSS
- // Text segment can be 'r', 'x' or a value
+ // Text segment can be 'r', 'x' or a value
ttype = 0;
if ((*argv[i] == 'r' || *argv[i] == 'R') && !argv[i][1])
}
i++;
- // Data segment can be 'r', 'x' or a value
+ // Data segment can be 'r', 'x' or a value
dtype = 0;
if ((*argv[i] == 'r' || *argv[i] == 'R') && !argv[i][1])
i++;
btype = 0;
- // BSS segment can be 'r', 'x' or a value
+ // 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
break;
case 'd':
- case 'D': // Wait for "return" before exiting
+ case 'D': // Wait for "return" before exiting
if (dflag)
warn('d', 0);
ifile = argv[i++];
isym = argv[i++];
-
+
if ((argv[i-3][2] == 'i') || (argv[i-3][2] == 'I'))
{ // handle -ii (No truncation)
if (!cflag)
noheaderflag = 1;
break;
case 'o':
- case 'O': // Specify an output file
+ case 'O': // Specify an output file
if (oflag)
warn('o', 1);
vflag++;
break;
case 'z':
- case 'Z': // Suppress banner flag
+ case 'Z': // Suppress banner flag
if (zflag)
warn('z', 1);
{
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, 2011 Reboot\n");
printf("V%i.%i.%i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
}
}
char * p = (char *)&i;
if (p[0] == 1)
- return 0; // LITTLE
+ return ENDIANNESS_LITTLE;
- return 1; // BIG
+ return ENDIANNESS_BIG;
}
//
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
}
+ // Process in specified files/objects
if (flush_handles())
- { // Process in specified files/objects
+ {
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;
}
}
}
}
+ // 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
+ if (mflag) // Display the loaded symbols map
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");
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); // Free allocated memory
+ rln_exit(); // Perform application exit
}