//
#include "rln.h"
+//#include <assert.h>
unsigned errflag = 0; // Error flag, goes TRUE on error
unsigned waitflag = 0; // Wait for any keypress flag
//
int DoSymbol(struct OFILE * ofile)
{
- int type; // Symbol type
- long value; // Symbol value
- int index; // Symbol index
- int j; // Iterator
- struct HREC * hptr; // Hash table pointer for globl/extrn
- char sym[SYMLEN]; // String for symbol name/hash search
+ int type; // Symbol type
+ long value; // Symbol value
+ int index; // Symbol index
+ int j; // Iterator
+ struct HREC * hptr; // Hash table pointer for globl/extrn
// Point to first symbol record in the object file
char * symptr = (ofile->o_image + 32
if (ssidx == -1)
{
- printf("DoSymbol(): Cannot get object file segment size: %s\n", ofile->o_name);
+ printf("DoSymbol(): Cannot get object file segment size: %s\n",
+ ofile->o_name);
return 1;
}
{
// 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 = LookupHREC(sym);
+ // symbol.
+ hptr = LookupHREC(symend + index);
if (hptr == NULL)
{
- printf("DoSymbol() : Cannot determine symbol : %s\n", sym);
+ printf("DoSymbol(): Cannot determine symbol: '%s' (%s)\n",
+ symend + index, ofile->o_name);
return 1;
}
if (ssidx == -1)
{
- printf("DoSymbol() : Cannot get object file segment size : %s\n", ofile->o_name);
+ printf("DoSymbol(): Cannot get object file segment size: '%s:%s' symbol: '%s' (%s)\n",
+ hptr->h_ofile->o_name, hptr->h_ofile->o_arname,
+ symend + index, ofile->o_name);
return 1;
}
index = OSTAdd(symend + index, type, value);
if (index == -1)
+ {
+ printf("DoSymbol(): Failed to add symbol '%s' to OST!\n", symend + index);
return 1;
+ }
}
}
- // Increment DoSymbol() processsing
+ // Increment dosymi processsing
dosymi++;
return 0;
// Add all global and external symbols to the output symbol table
// [This is confusing--is it adding globals or locals? common == local!
// but then again, we see this in the header:
-// #define T_COMMON (T_GLOBAL | T_EXTERN)]
+// #define T_COMMON (T_GLOBAL | T_EXTERN) but that could be just bullshit.]
//
long DoCommon(void)
{
//if (hptr->h_ofile->isArchiveFile)
// continue;
+//Is this true? Couldn't an absolute be exported???
if (hptr->h_type == (T_EXT | T_ABS))
hptr->h_type = T_ABS; // Absolutes *can't* be externals
//
-// Add a Symbol's Name, Type, and Value to the OST.
-// Return the Index of the Symbol in OST, or -1 for Error.
+// Add a symbol's name, type, and value to the OST.
+// Returns the index of the symbol in OST, or -1 for error.
//
int OSTAdd(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 slen = strlen(name);
- slen = strlen(name);
-
- // If the OST or OST String Table has not been initialised then do so
+ // If the OST or OST string table has not been initialised then do so
if (ost_index == 0)
{
- if ((ost = malloc(OST_BLOCK)) == NULL)
+ ost = malloc(OST_BLOCK);
+ oststr = malloc(OST_BLOCK);
+
+ if (ost == NULL)
{
- printf("OST memory allocation error (stringtable).\n");
+ printf("OST memory allocation error.\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)
+ if (oststr == NULL)
{
- printf("OST memory allocation error (string).\n");
+ printf("OSTSTR memory allocation error.\n");
return -1;
}
+ ost_ptr = ost; // Set OST start pointer
+ ost_end = ost + OST_BLOCK; // Set OST end pointer
+
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
else
{
// If next symbol record exceeds current allocation then expand symbol
- // table.
+ // table and/or symbol string table.
ost_offset_p = (ost_ptr - ost);
ost_offset_e = (ost_end - ost);
- // 3 x int (12)
+ // 3 x uint32_t (12 bytes)
if ((ost_ptr + 12) > ost_end)
{
-#warning "!!! Bad logic in realloc call !!!"
- if ((ost = realloc(ost, (ost_end + OST_BLOCK))) == NULL)
+ // We want to allocate the current size of the OST + another block.
+ ost = realloc(ost, ost_offset_e + OST_BLOCK);
+
+ if (ost == NULL)
{
printf("OST memory reallocation error.\n");
return -1;
ost_offset_p = (oststr_ptr - oststr);
ost_offset_e = (oststr_end - oststr);
+ // string length + terminating NULL + uint32_t (terminal long)
if ((oststr_ptr + (slen + 1 + 4)) > oststr_end)
{
-#warning "!!! Bad logic in realloc call !!!"
- if ((oststr = realloc(oststr, (oststr_end + OST_BLOCK))) == NULL)
+ oststr = realloc(oststr, ost_offset_e + OST_BLOCK);
+
+ if (oststr == NULL)
{
printf("OSTSTR memory reallocation error.\n");
return -1;
if ((type & 0xF0000000) && !gflag)
{
// Do nothing
+ return 0;
}
- else
- {
- ostresult = OSTLookup(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
+ // Get symbol index in OST, if any (-1 if not found)
+ ostresult = OSTLookup(name);
- putlong(ost_ptr + 4, type );
- putlong(ost_ptr + 8, value);
- ost_ptr += 12;
+ // 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
- // 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
- }
+ putlong(ost_ptr + 4, type);
+ putlong(ost_ptr + 8, value);
+ ost_ptr += 12;
- if (vflag > 1)
- {
- printf("OSTAdd: (%s), type=$%08X, val=$%08X\n", name, type, value);
- }
+ // 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++;
+ if (vflag > 1)
+ {
+ printf("OSTAdd: (%s), type=$%08X, val=$%08lX\n", name, type, value);
}
+
+// is ost_index pointing one past?
+// does this return the same regardless of if its ++n or n++?
+// no. it returns the value of ost_index *before* it's incremented.
+ return ++ost_index;
}
- // Not sure about this as it could affect return indices. Needed to stop
- // return error.
- return 0;
+ return ostresult;
}
//
// Return the index of a symbol in the output symbol table
+// N.B.: This is a 1-based index! (though there's no real reason for it to be)
//
int OSTLookup(char * sym)
{
//
int segmentpad(FILE * fd, long segsize, int value)
{
-// long padsize; // Number of pad bytes needed
- int i; // Good 'ol iterator
- char padarray[32]; // Array of padding bytes
- char * padptr; // Pointer to array
+ int i;
+ char padarray[32];
+ char * padptr;
// Determine the number of padding bytes that are needed
long padsize = (segsize + secalign) & ~secalign;
//
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
strcat(ofile, ".o"); // Object files (partial linking etc)
}
- fd = fopen(ofile, "wb"); // Attempt to open output file
+ 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);
return 1;
}
// additional code will need to be added for ABS and partial linking.
// Build the COF_HDR
- putword(himage + 0, 0x0150 ); // Magic Number (0x0150)
- putword(himage + 2, 0x0003 ); // Sections Number (3)
- putlong(himage + 4, 0x00000000 ); // Date (0L)
- putlong(himage + 8, dsoff + header->dsize); // Offset to Symbols Section
- putlong(himage + 12, ost_index); // Number of Symbols
- putword(himage + 16, 0x001C ); // Size of RUN_HDR (0x1C)
- putword(himage + 18, 0x0003 ); // Executable Flags (3)
+ putword(himage + 0, 0x0150 ); // Magic Number (0x0150)
+ putword(himage + 2, 0x0003 ); // Sections Number (3)
+ putlong(himage + 4, 0x00000000 ); // Date (0L)
+ putlong(himage + 8, dsoff + header->dsize); // Offset to Symbols Section
+ putlong(himage + 12, ost_index); // Number of Symbols
+ putword(himage + 16, 0x001C ); // Size of RUN_HDR (0x1C)
+ putword(himage + 18, 0x0003 ); // Executable Flags (3)
// Build the RUN_HDR
- putlong(himage + 20, 0x00000107 ); // Magic/vstamp
- putlong(himage + 24, header->tsize ); // TEXT size in bytes
- putlong(himage + 28, header->dsize ); // DATA size in bytes
- putlong(himage + 32, header->bsize ); // BSS size in bytes
- putlong(himage + 36, tbase ); // Start of executable, normally @TEXT
- putlong(himage + 40, tbase ); // @TEXT
- putlong(himage + 44, dbase ); // @DATA
+ putlong(himage + 20, 0x00000107 ); // Magic/vstamp
+ putlong(himage + 24, header->tsize ); // TEXT size in bytes
+ putlong(himage + 28, header->dsize ); // DATA size in bytes
+ putlong(himage + 32, header->bsize ); // BSS size in bytes
+ putlong(himage + 36, tbase ); // Start of executable, normally @TEXT
+ putlong(himage + 40, tbase ); // @TEXT
+ putlong(himage + 44, dbase ); // @DATA
// Build the TEXT SEC_HDR
putlong(himage + 48, 0x2E746578 );
- putlong(himage + 52, 0x74000000 ); // ".text"
- putlong(himage + 56, tbase ); // TEXT START
- putlong(himage + 60, tbase ); // TEXT START
- putlong(himage + 64, header->tsize ); // TEXT size in bytes
- putlong(himage + 68, tsoff ); // Offset to section data in file
- putlong(himage + 72, 0x00000000 ); // Offset to section reloc in file (0L)
- putlong(himage + 76, 0x00000000 ); // Offset to debug lines structures (0L)
- putlong(himage + 80, 0x00000000 ); // Nreloc/nlnno (0L)
- putlong(himage + 84, 0x00000020 ); // SEC_FLAGS: STYP_TEXT
+ putlong(himage + 52, 0x74000000 ); // ".text"
+ putlong(himage + 56, tbase ); // TEXT START
+ putlong(himage + 60, tbase ); // TEXT START
+ putlong(himage + 64, header->tsize ); // TEXT size in bytes
+ putlong(himage + 68, tsoff ); // Offset to section data in file
+ putlong(himage + 72, 0x00000000 ); // Offset to section reloc in file (0L)
+ putlong(himage + 76, 0x00000000 ); // Offset to debug lines structures (0L)
+ putlong(himage + 80, 0x00000000 ); // Nreloc/nlnno (0L)
+ putlong(himage + 84, 0x00000020 ); // SEC_FLAGS: STYP_TEXT
// Build the DATA SEC_HDR
putlong(himage + 88, 0x2E646174 );
- putlong(himage + 92, 0x61000000 ); // ".data"
- putlong(himage + 96, dbase ); // DATA START
- putlong(himage + 100, dbase ); // DATA START
- putlong(himage + 104, header->dsize ); // DATA size in bytes
- putlong(himage + 108, dsoff ); // Offset to section data in file
- putlong(himage + 112, 0x00000000 ); // Offset to section reloc in file (0L)
- putlong(himage + 116, 0x00000000 ); // Offset to debugging lines structures (0L)
- putlong(himage + 120, 0x00000000 ); // Nreloc/nlnno (0L)
- putlong(himage + 124, 0x00000040 ); // SEC_FLAGS: STYP_DATA
+ putlong(himage + 92, 0x61000000 ); // ".data"
+ putlong(himage + 96, dbase ); // DATA START
+ putlong(himage + 100, dbase ); // DATA START
+ putlong(himage + 104, header->dsize ); // DATA size in bytes
+ putlong(himage + 108, dsoff ); // Offset to section data in file
+ putlong(himage + 112, 0x00000000 ); // Offset to section reloc in file (0L)
+ putlong(himage + 116, 0x00000000 ); // Offset to debugging lines structures (0L)
+ putlong(himage + 120, 0x00000000 ); // Nreloc/nlnno (0L)
+ putlong(himage + 124, 0x00000040 ); // SEC_FLAGS: STYP_DATA
// Build the BSS SEC_HDR
putlong(himage + 128, 0x2E627373 );
- putlong(himage + 132, 0x00000000 ); // ".bss"
- putlong(himage + 136, bbase ); // BSS START
- putlong(himage + 140, bbase ); // BSS START
- putlong(himage + 144, header->bsize ); // BSS size in bytes
- putlong(himage + 148, bsoff ); // Offset to section data in file
- putlong(himage + 152, 0x00000000 ); // Offset to section reloc in file (0L)
- putlong(himage + 156, 0x00000000 ); // Offset to debugging lines structures (0L)
- putlong(himage + 160, 0x00000000 ); // Nreloc/nlnno (0L)
- putlong(himage + 164, 0x00000080 ); // SEC_FLAGS: STYP_BSS
-
- symoffset = 168; // Update symbol offset
+ putlong(himage + 132, 0x00000000 ); // ".bss"
+ putlong(himage + 136, bbase ); // BSS START
+ putlong(himage + 140, bbase ); // BSS START
+ putlong(himage + 144, header->bsize ); // BSS size in bytes
+ putlong(himage + 148, bsoff ); // Offset to section data in file
+ putlong(himage + 152, 0x00000000 ); // Offset to section reloc in file (0L)
+ putlong(himage + 156, 0x00000000 ); // Offset to debugging lines structures (0L)
+ putlong(himage + 160, 0x00000000 ); // Nreloc/nlnno (0L)
+ putlong(himage + 164, 0x00000080 ); // SEC_FLAGS: STYP_BSS
+
+ symoffset = 168; // Update symbol offset
}
// Absolute (ABS) header
else
{
// Build the ABS header
- putword(himage + 0, 0x601B ); // Magic Number (0x601B)
- putlong(himage + 2, header->tsize ); // TEXT segment size
- putlong(himage + 6, header->dsize ); // DATA segment size
- putlong(himage + 10, header->bsize ); // BSS segment size
- putlong(himage + 14, ost_index * 14 ); // Symbol table size (?)
- putlong(himage + 18, 0x00000000 ); //
- putlong(himage + 22, tbase ); // TEXT base address
- putword(himage + 26, 0xFFFF ); // Flags (?)
- putlong(himage + 28, dbase ); // DATA base address
- putlong(himage + 32, bbase ); // BSS base address
+ putword(himage + 0, 0x601B ); // Magic Number (0x601B)
+ putlong(himage + 2, header->tsize ); // TEXT segment size
+ putlong(himage + 6, header->dsize ); // DATA segment size
+ putlong(himage + 10, header->bsize ); // BSS segment size
+ putlong(himage + 14, ost_index * 14 ); // Symbol table size (?)
+ putlong(himage + 18, 0x00000000 ); //
+ putlong(himage + 22, tbase ); // TEXT base address
+ putword(himage + 26, 0xFFFF ); // Flags (?)
+ putlong(himage + 28, dbase ); // DATA base address
+ putlong(himage + 32, bbase ); // BSS base address
- symoffset = 36; // Update symbol offset
+ symoffset = 36; // Update symbol offset
}
// Write the header, but not if noheaderflag
{
if (header->ssize)
{
- if (fwrite(ost, (ost_ptr - ost), 1, fd) != 1) goto werror;
- if (fwrite(oststr, (oststr_ptr - oststr), 1, fd) != 1) goto werror;
+ if (fwrite(ost, (ost_ptr - ost), 1, fd) != 1)
+ goto werror;
+
+ if (fwrite(oststr, (oststr_ptr - oststr), 1, fd) != 1)
+ goto werror;
}
}
// Absolute (ABS) symbol/string table
else
{
// The symbol and string table have been created as part of the
- // DoSymbol() 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
+ // DoSymbol() 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
+ 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
+ // Skip debug symbols
if (type & 0xF0000000)
- continue; // Not doing debug symbols
+ continue;
- value = getlong((ost + (i * 12)) + 8); // Get symbol value
+ // Get symbol value
+ value = getlong((ost + (i * 12)) + 8);
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
+ // Write symbol record
+ if (fwrite(symbol, 14, 1, fd) != 1)
+ goto werror;
}
}
}
//
-// Convert ASCII to hexadecimal
+// Stuff the (long) value of a string into the value argument. RETURNS TRUE if
+// the string doesn't parse. Parses only as a hexadecimal string.
//
-//int atolx(char * string, long * value)
-int atolx(char * string, int * value)
+int GetHexValue(char * string, int * value)
{
*value = 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, int * value)
-{
- return atolx(string, value);
-}
-
-
//
// Create one big .o file from the images already in memory, returning a
// pointer to an OHEADER. Note that the oheader is just the header for the
{
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
// Initialize cumulative segment sizes
// 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
+ struct OFILE * oprev = NULL; // Init previous obj file list ptr
+ struct OFILE * otemp = olist; // Set temp pointer to object file list
+ int i = 0;
while (otemp != NULL)
{
else
oprev->o_next = otemp->o_next;
- ohold = otemp;
+ struct OFILE * ohold = otemp;
if (!ohold->isArchiveFile)
free(ohold->o_image);
- free(ohold);
+// free(ohold);
+
+ // Also need to remove them from the obj_* tables too :-P
+ // N.B.: Would probably be worthwhile to remove crap like this
+ // and stuff it into the OFILE structure...
+ if (wflag)
+ printf("»-> removing %s... (index == %i, len == %i)\n", obj_fname[i], i, obj_index - 1);
+
+ int k;
+
+ for(k=i; k<obj_index-1; k++)
+ {
+ memcpy(obj_fname[k], obj_fname[k + 1], FNLEN);
+ obj_segsize[k][0] = obj_segsize[k + 1][0];
+ obj_segsize[k][1] = obj_segsize[k + 1][1];
+ obj_segsize[k][2] = obj_segsize[k + 1][2];
+ }
+
+ obj_index--;
+ i--;
}
else
{
// Go to next object file list pointer
otemp = otemp->o_next;
+ i++;
}
// Update base addresses and create symbols _TEXT_E, _DATA_E and _BSS_E
}
else
{
- // BSS is independant of DATA
+ // BSS is independent of DATA
bbase = bval;
OSTAdd("_BSS_E", 0x09000000, bval + bsssize);
}
}
else
{
- // BSS is independant of DATA
+ // BSS is independent of DATA
bbase = bval;
OSTAdd("_BSS_E", 0x09000000, bval + bsssize);
}
else
oprev->o_next = otemp->o_next;
- ohold = otemp;
+ struct OFILE * ohold = otemp;
if (ohold->o_image)
if (!ohold->isArchiveFile)
int GetHash(char * s)
{
// For this to be consistent, the symbol MUST be zeroed out beforehand!
- char c[SYMLEN];
- memset(c, 0, SYMLEN);
- strcpy(c, s);
+ // N.B.: strncpy() pads zeroes for us, if the symbol is less than 15 chars.
+ char c[15];
+ strncpy(c, s, 15);
int i = (c[0] + c[1] + c[2] + c[3] + c[4] + c[5] + c[6] + c[7] + c[8]
+ c[9] + c[10] + c[11] + c[12] + c[13] + c[14]) % NBUCKETS;
}
+#if 0
//
// Add symbol to the hash table if it doesn't already exist, otherwise decide
// what to do since it's already defined in another unit.
//
int DealWithSymbol(char * sym, long type, long value, struct OFILE * ofile)
{
+ // Make sure we have a filename...
+ assert(ofile->o_name[0] != 0);
+
if (vflag > 1)
{
printf("DealWithSymbol(%s,%s,%lx,", sym, ofile->o_name, value);
printf("%x,%s)\n", (unsigned int)type, (isglobal(type) ? "GLOBAL" : "COMMON"));
}
+ // See if the symbol is already in the symbol table...
struct HREC * hptr = LookupHREC(sym);
if (hptr == NULL)
return AddSymbolToHashList(&htable[GetHash(sym)], sym, ofile, value, type);
+ // N.B.: The symbol being passed in is *already* been vetted as an
+ // external, so we have only *two* cases to look for here.
+#if 0
// Symbol is already in table... Figure out how to handle!
if (iscommon(type) && !iscommon(hptr->h_type))
{
printf(" discarded.\n");
}
+#if 0
+#warning "!!! WHERE THE FUCK IS THIS WRITING TO?? !!!"
+// Wow, just wow. This is writing to the symbol string table when it apparently
+// it thinks it's writing to an ABS symbol. This is so wrong, I don't even know
+// where to begin...
putword(sym + 8, ABST_EXTERN);
putlong(sym + 10, 0L);
+#else
+ // ??? write what to where?
+#endif
}
else if (iscommon(hptr->h_type) && !iscommon(type))
{
hptr->h_value = value;
}
// They're both global [WRONG! Passed in one is global]
+ // [technically, this is correct, as it failed the 1st two checks...
+ // but it is unclear, so the latter is preferable.]
// else if (!iscommon(type))
-//is this now right??
+//is this now right?? [YES, see above]
else if (!iscommon(type) && !iscommon(hptr->h_type))
{
// Global exported by another ofile; warn and make this one extern
printf(" discarded\n");
}
+#if 0
+#warning "!!! WHERE THE FUCK IS THIS WRITING TO?? !!!"
putword(sym + 8, ABST_EXTERN);
+#else
+ // ??? write what to where?
+#endif
}
// They're both common
else
hptr->h_ofile = ofile;
}
}
+#else
+ if (iscommon(hptr->h_type))
+ {
+ // Mismatch: common came first; warn and keep the global one
+ if (wflag)
+ {
+ printf("Warning: %s: global from ", sym);
+ put_name(ofile);
+ printf(" used, common from ");
+ put_name(hptr->h_ofile);
+ printf(" discarded.\n");
+ }
+
+ hptr->h_type = type;
+ hptr->h_ofile = ofile;
+ hptr->h_value = value;
+ }
+ else
+ {
+ // Global exported by another ofile; warn and make this one extern
+ if (wflag)
+ {
+ printf("Duplicate symbol %s: ", sym);
+ put_name(hptr->h_ofile);
+ printf(" used, ");
+ put_name(ofile);
+ printf(" discarded\n");
+ }
+
+#if 0
+#warning "!!! WHERE THE FUCK IS THIS WRITING TO?? !!!"
+ putword(sym + 8, ABST_EXTERN);
+#else
+ // ??? write what to where?
+#endif
+ }
+#endif
return 0;
}
+#endif
//
int AddSymbols(struct OFILE * Ofile)
{
struct HREC * hptr; // Hash record pointer
- char symbol[SYMLEN];
if (vflag > 1)
printf("Add symbols for file %s\n", Ofile->o_name);
long index = getlong(sfix); // Get symbol string index
long type = getlong(sfix + 4); // Get symbol type
long value = getlong(sfix + 8); // Get symbol value
- memset(symbol, 0, SYMLEN);
- strcpy(symbol, sstr + index);
if ((Ofile->isArchiveFile) && !(Ofile->o_flags & O_USED))
{
if ((type & T_EXT) && (type & (T_SEG | T_ABS)))
- if (AddARSymbol(symbol, Ofile))
+ if (AddARSymbol(sstr + index, Ofile))
return 1;
}
else if (type == T_EXT)
{
- // External symbal that is *not* in the current unit
- hptr = LookupHREC(symbol);
+ // External symbol that is *not* in the current unit
+ hptr = LookupHREC(sstr + index);
if (hptr != NULL)
hptr->h_ofile->o_flags |= O_USED; // Mark .o file as used
// Otherwise add to unresolved list
- else if (AddUnresolvedSymbol(symbol, Ofile))
+ else if (AddUnresolvedSymbol(sstr + index, Ofile))
return 1; // Error if addition failed
}
else if ((type & T_EXT) && (type & (T_SEG | T_ABS)))
{
+#if 0
// Symbol in the current unit that is also EXPORTED
- if (DealWithSymbol(symbol, type, value, Ofile))
+ if (DealWithSymbol(sstr + index, type, value, Ofile))
return 1; // Error if addition failed
+#else
+ hptr = LookupHREC(sstr + index);
+
+ // Symbol isn't in the table, so try to add it:
+ if (hptr == NULL)
+ {
+ if (AddSymbolToHashList(&htable[GetHash(sstr + index)],
+ sstr + index, Ofile, value, type))
+ return 1;
+ }
+ else
+ {
+ // Symbol already exists, decide what to do about it
+ if (iscommon(hptr->h_type))
+ {
+ // Mismatch: common came first; warn and keep the global
+ if (wflag)
+ {
+ printf("Warning: %s: global from ", sstr + index);
+ put_name(Ofile);
+ printf(" used, common from ");
+ put_name(hptr->h_ofile);
+ printf(" discarded.\n");
+ }
+
+ hptr->h_ofile = Ofile;
+ hptr->h_type = type;
+ hptr->h_value = value;
+ }
+ else
+ {
+ // Global exported by another ofile; warn and make this one
+ // extern
+ if (wflag)
+ {
+ printf("Duplicate symbol %s: ", sstr + index);
+ put_name(hptr->h_ofile);
+ printf(" used, ");
+ put_name(Ofile);
+ printf(" discarded\n");
+ }
+
+ // Set the global in this unit to pure external
+ // (is this a good idea? what if the other one is a ref to
+ // this one???)
+ putlong(sfix + 4, T_EXT);
+ }
+ }
+#endif
}
sfix += 12; // Increment symbol fixup pointer
// Don't do anything if this is just an ARCHIVE marker, just add the file
// to the olist
- // (Shamus: N.B. it does no such ARCHIVE thing ATM)
+ // (Shamus: N.B.: it does no such ARCHIVE thing ATM)
if (!(obj->o_flags & O_ARCHIVE))
{
Ofile->o_header.magic = getlong(ptr);
// Process the unresolved symbols list. This may involve pulling in symbols
// from any included .a units. Such units are lazy linked by default; we
- // generally don't want everything they provide, just what's refenced.
+ // generally don't want everything they provide, just what's referenced.
for(uptr=unresolved; uptr!=NULL; )
{
if (vflag > 1)
//
char * path_tail(char * name)
{
+ // Find last occurance of PATH_DELIMETER
char * temp = strrchr(name, PATH_DELIMITER);
// Return what was passed in if path delimiter was not found
return 1;
}
- // 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;
}
else if (HasDotOSuffix(objName))
{
+
+ // Strip off any trailing forward slash at end of object name
+ int lastChar = strlen(objName) - 1;
+
+ if (objName[lastChar] == '/')
+ objName[lastChar] = 0;
+
//printf("Processing object \"%s\" (size == %i, obj_index == %i)...\n", objName, atoi(objSize), obj_index);
strcpy(obj_fname[obj_index], objName);
obj_segsize[obj_index][0] = (getlong(ptr + 60 + 4) + secalign) & ~secalign;
lseek(handle[i], 0L, 0); // Reset to start of input file
- // Look for RMAC/MAC/GCC ($20107) object files
- if ((getlong(magic) == 0x00000107) || (getlong(magic) == 0x00020107))
+ // Look for RMAC/MAC/GCC (a.out) object files
+ if ((getlong(magic) & 0xFFFF) == 0x0107)
{
// Process input object file
if (LoadObject(name[i], handle[i], 0L))
{
// Close file and error
printf("%s is not a supported object or archive file\n", name[i]);
+ printf("Magic == [%02X][%02X][%02X][%02X]\n", magic[0], magic[1], magic[2], magic[3]);
close(handle[i]);
return 1;
}
printf("Error in text-segment address: cannot be contiguous\n");
return 1;
}
- else if ((ttype = 0), getval(argv[i], &tval))
+ else if ((ttype = 0), GetHexValue(argv[i], &tval))
{
printf("Error in text-segment address: %s is not 'r', 'x' or an address.", argv[i]);
return 1;
{
dtype = -2; // DATA follows TEXT
}
- else if ((dtype = 0), getval(argv[i],&dval))
+ else if ((dtype = 0), GetHexValue(argv[i], &dval))
{
printf("Error in data-segment address: %s is not 'r', 'x' or an address.", argv[i]);
return 1;
{
btype = -3; // BSS follows DATA
}
- else if ((btype = 0), getval(argv[i],&bval))
+ else if ((btype = 0), GetHexValue(argv[i], &bval))
{
printf("Error in bss-segment address: %s is not 'r', 'x[td]', or an address.", argv[i]);
return 1;
void rln_exit(void)
{
char tempbuf[128];
+ char * c;
// Display link status if verbose mode
if (vflag)
if (waitflag)
{
printf("\nPress the [RETURN] key to continue. ");
- fgets(tempbuf, 128, stdin);
+ c = fgets(tempbuf, 128, stdin);
}
exit(errflag);
projects / rln / blobdiff