X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rln;a=blobdiff_plain;f=rln.c;h=a0b5ab02aa040e7e4c071822b100bba2956addba;hp=f97b49034143fe66b20f3dd7b16b6e1ec805daee;hb=52963cddfc29b2981d549ff785c1a24d814f7290;hpb=05f3a96e41a1c2ad78a080a192876517a8aefc78 diff --git a/rln.c b/rln.c index f97b490..a0b5ab0 100644 --- a/rln.c +++ b/rln.c @@ -1,6 +1,6 @@ // // RLN - Reboot's Linker for the Atari Jaguar console system -// Copyright (C) 199x, Allan K. Pratt, 2014-2015 Reboot & Friends +// Copyright (C) 199x, Allan K. Pratt, 2014-2018 Reboot & Friends // #include "rln.h" @@ -71,6 +71,10 @@ struct HREC * LookupHREC(char *); char * PathTail(char *); void ShowHelp(void); void ShowVersion(void); +int OSTLookup(char * sym); +int OSTAdd(char * name, int type, long value); +int ProcessFiles(void); +int doargs(int argc, char * argv[]); // @@ -585,8 +589,12 @@ int RelocateSegment(struct OFILE * ofile, int flag) unsigned glblreloc; // Global relocation flag unsigned absreloc; // Absolute relocation flag unsigned relreloc; // Relative relocation flag + unsigned wordreloc; // Relocate word only flag + unsigned opreloc; // Relocate OP data address only flag unsigned swcond; // Switch statement condition unsigned relocsize; // Relocation record size + unsigned saveBits; // OP data leftover bits save + unsigned saveBits2; // 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 @@ -664,8 +672,10 @@ int RelocateSegment(struct OFILE * ofile, int flag) 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 + absreloc = (rflg & 0x00000040 ? 1 : 0); // Set absolute relocation flag + relreloc = (rflg & 0x000000A0 ? 1 : 0); // Set relative relocation flag + wordreloc = (rflg & 0x00000002 ? 1 : 0); // Set word relocation flag + opreloc = (rflg & 0x00000004 ? 1 : 0); // Set OP relocation flag // Additional processing required for global relocations if (glblreloc) @@ -682,9 +692,22 @@ int RelocateSegment(struct OFILE * ofile, int flag) newdata = GetLong(ost + ((ssidx - 1) * 12) + 8); } - // Obtain the existing long word segment data and flip words if the - // relocation flags indicate it relates to a RISC MOVEI instruction - olddata = GetLong(sptr + addr); + // Obtain the existing long word (or word) segment data and flip words + // if the relocation flags indicate it relates to a RISC MOVEI + // instruction + olddata = (wordreloc ? GetWord(sptr + addr) : GetLong(sptr + addr)); + + // If it's a OP QUAD relocation, get the data out of the DATA bits. + // Note that because we can't afford to lose the bottom 3 bits of the + // relocation record, we lose 3 off the top--which means the maximum + // this can store is $1FFFF8 (vs. $FFFFF8). + if (opreloc) + { + saveBits2 = (GetLong(sptr + addr + 8) & 0xE0000000) >> 8; // Upper 3 of data addr + saveBits = olddata & 0x7FF; + olddata = (olddata & 0xFFFFF800) >> 11; + olddata |= saveBits2; // Restore upper 3 bits of data addr + } if (rflg & 0x01) olddata = _SWAPWORD(olddata); @@ -703,7 +726,7 @@ int RelocateSegment(struct OFILE * ofile, int flag) break; case 0x00000400: // TEXT segment relocation record // SCPCD : the symbol point to a text segment, we should use the textoffset - newdata = tbase + textoffset + olddata; + newdata = tbase + textoffset + olddata; break; case 0x00000600: // DATA segment relocation record @@ -734,7 +757,21 @@ int RelocateSegment(struct OFILE * ofile, int flag) if (rflg & 0x01) newdata = _SWAPWORD(newdata); - PutLong(sptr + addr, newdata); + if (wordreloc) + PutWord(sptr + addr, newdata); + else if (opreloc) + { + if (vflag > 1) + printf("OP reloc: oldata=$%X, newdata=$%X\n", olddata, newdata); + + newdata = ((newdata & 0x00FFFFF8) << 8) | saveBits; + PutLong(sptr + addr, newdata); + // Strip out extraneous data hitchhikers from 2nd phrase... + newdata = GetLong(sptr + addr + 8) & 0x007FFFFF; + PutLong(sptr + addr + 8, newdata); + } + else + PutLong(sptr + addr, newdata); } else if (relreloc) { @@ -2411,7 +2448,8 @@ int LoadArchive(char * fname, int fd) } // Check to see if a long filename was requested - if (objName[0] == 0x20) + // N.B.: " " is for GNU archives, and "/" is for BSD archives + if ((objName[0] == 0x20) || (objName[0] == '/')) { uint32_t fnSize = atoi(objName + 1); @@ -2813,6 +2851,10 @@ int doargs(int argc, char * argv[]) case 'e': case 'E': // Output COFF (absolute only) cflag = 1; + + if (noheaderflag) + printf("Warning: -e overridden by -n, output will be headerless\n"); + break; case 'g': case 'G': // Output source level debugging @@ -2871,6 +2913,9 @@ int doargs(int argc, char * argv[]) if (noheaderflag) warn('n', 1); + if (cflag) + printf("Warning: -e overridden by -n, output will be headerless\n"); + noheaderflag = 1; break; case 'o': @@ -2939,6 +2984,22 @@ int doargs(int argc, char * argv[]) wflag = 1; break; + case 'y': + case 'Y': + if (i >= argc) + { + printf("No directory filename following -y switch\n"); + return 1; + } + + if (strlen(argv[i]) > FARGSIZE * 3) + { + printf("Directory file name too long (sorry!)\n"); + return 1; + } + + strcpy(libdir, argv[i++]); + break; case 'z': case 'Z': // Suppress banner flag if (zflag) @@ -2990,7 +3051,7 @@ void ShowVersion(void) "| | | | | | |\n" "|_| |_|_| |_|\n" "\nReboot's Linker for Atari Jaguar\n" - "Copyright (c) 199x Allan K. Pratt, 2014-2015 Reboot\n" + "Copyright (c) 199x Allan K. Pratt, 2014-2018 Reboot\n" "V%i.%i.%i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM); } } @@ -3006,7 +3067,7 @@ void ShowHelp(void) printf("\n"); printf("Options:\n"); printf(" -? or -h display usage information\n"); - printf(" -a output absolute file\n"); + printf(" -a output absolute file (default: ABS)\n"); printf(" hex value: segment address\n"); printf(" r: relocatable segment\n"); printf(" x: contiguous segment\n"); @@ -3019,7 +3080,7 @@ void ShowHelp(void) printf(" -ii