Adapt the generating and dumping of object files to what is observed

in RSX-11M+ files. Use conditional compilation so the RT-11 version can
be restored.
This commit is contained in:
Olaf Seibert
2015-05-19 00:56:40 +02:00
parent f34996452b
commit 12fdea5b21
2 changed files with 34 additions and 1 deletions

View File

@@ -64,6 +64,7 @@ char *readrec(
chksum = 0;
#if RT11
while (c = fgetc(fp), c != EOF && c == 0) ;
if (c == EOF)
@@ -83,6 +84,7 @@ char *readrec(
}
chksum -= c; // even though for 0 the checksum isn't changed...
#endif /* RT11 */
c = fgetc(fp);
if (c == EOF) {
@@ -103,7 +105,9 @@ char *readrec(
chksum -= c;
#if RT11
*len -= 4; // Subtract header and length bytes from length
#endif
if (*len < 0) {
fprintf(stderr, "Improperly formatted OBJ file (5)\n");
return NULL;
@@ -125,15 +129,28 @@ char *readrec(
for (i = 0; i < *len; i++)
chksum -= (buf[i] & 0xff);
#if RT11
c = fgetc(fp);
c &= 0xff;
chksum &= 0xff;
if (c != chksum) {
free(buf);
fprintf(stderr, "Bad record checksum, " "calculated=%d, recorded=%d\n", chksum, c);
fprintf(stderr, "Bad record checksum, " "calculated=$%04x, recorded=$%04x\n", chksum, c);
return NULL;
}
#else
if (*len & 1) {
/* skip 1 byte of padding */
c = fgetc(fp);
if (c == EOF) {
free(buf);
fprintf(stderr, "EOF where padding byte should be");
return NULL;
}
}
#endif /* RT11 */
return buf;
}

View File

@@ -55,6 +55,10 @@ DAMAGE.
Each is preceeded by any number of 0 bytes, begins with a 1,0 pair,
followed by 2 byte length, followed by data, followed by 1 byte
negative checksum.
The RSX version is similar but subtly different:
There are no "any number of 0 bytes", nor the "1,0 pair" following it.
There is no checksum byte, but odd lengths are padded with a 0-byte.
*/
static int writerec(
@@ -65,18 +69,24 @@ static int writerec(
int chksum; /* Checksum is negative sum of all
bytes including header and length */
int i;
#if RT11
unsigned hdrlen = len + 4;
#else
unsigned hdrlen = len;
#endif
if (fp == NULL)
return 1; /* Silently ignore this attempt to write. */
chksum = 0;
#if RT11
if (fputc(FBR_LEAD1, fp) == EOF) /* All recs begin with 1,0 */
return 0;
chksum -= FBR_LEAD1;
if (fputc(FBR_LEAD2, fp) == EOF)
return 0;
chksum -= FBR_LEAD2;
#endif /* RT11 */
i = hdrlen & 0xff; /* length, lsb */
chksum -= i;
@@ -99,7 +109,13 @@ static int writerec(
chksum &= 0xff;
#if RT11
fputc(chksum, fp); /* Followed by the checksum byte */
#else /* RT11 */
if (hdrlen & 1) {
fputc(0, fp); /* Padding to even boundary */
}
#endif /* RT11 */
return 1; /* Worked okay. */
}