//
// RMAC - Reboot's Macro Assembler for all Atari computers
// OBJECT.C - Writing Object Files
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
// RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
// Source utilised with the kind permission of Landon Dyer
//
// Copy symbol name to buffer (first 8 chars or less)
register uint8_t * s = sym->sname;
register int i;
+ uint32_t extra = 0;
for(i=0; i<8 && *s; i++)
*buf++ = *s++;
while (i++ < 8)
*buf++ = '\0';
+ register uint16_t w1 = sym->sattr;
+ register uint16_t w = AL_DEFINED | tdb_tab[w1 & TDB];
+
+ if (prg_flag == 3)
+ {
+ // Extended symbol - Check to see if symbol is larger than 8 characters
+ // and write an extra 14 characters where the next symbol would be.
+ // Modify the flag word for this
+ if (*s)
+ {
+ //printf("%s '%i' - will write extended symbol\n", sym->sname,s[0]);
+ uint8_t *buf2 = buf + 6;
+
+ for(i=8; i<8+14 && *s; i++)
+ *buf2++ = *s++;
+
+ while (i++ < 8 + 14)
+ *buf2++ = '\0';
+
+ symsize += 14;
+ w |= 0x48;
+ extra = 14;
+ }
+ }
+
//
// Construct and deposit flag word
//
// o exports (DEFINED) are AL_GLOBAL
// o imports (~DEFINED) are AL_EXTERN
//
- register uint16_t w1 = sym->sattr;
- register uint16_t w = AL_DEFINED | tdb_tab[w1 & TDB];
-
if (w1 & EQUATED) // Equated
w |= AL_EQUATED;
SETBE16(buf, 0, w);
buf += 2;
- register uint32_t z = sym->svalue;
+ register uint32_t z = (uint32_t)sym->svalue;
if (prg_flag) // Relocate value in .PRG segment
{
SETBE32(buf, 0, z); // Deposit symbol value
buf += 4;
+ symsize += 14;
+ buf += extra;
+
return buf;
}
CHUNK * cp; // Chunk (for gather)
uint8_t * buf; // Scratch area
uint8_t * p; // Temporary ptr
- LONG ssize; // Size of symbols
LONG trsize, drsize; // Size of relocations
long unused; // For supressing 'write' warnings
printf("Total : %d bytes\n", sect[TEXT].sloc + sect[DATA].sloc + sect[BSS].sloc);
}
- ssize = sy_assign(NULL, NULL); // Assign index numbers to the symbols
+ sy_assign(NULL, NULL); // Assign index numbers to the symbols
tds = sect[TEXT].sloc + sect[DATA].sloc; // Get size of TEXT and DATA segment
- buf = malloc(0x600000); // Allocate 6mb object file image memory
+ buf = malloc(0x800000); // Allocate 8MB object file image memory
if (buf == NULL)
{
return ERROR;
}
- memset(buf, 0, 0x600000); // Clear allocated memory
+ memset(buf, 0, 0x800000); // Clear allocated memory
objImage = buf; // Set global object image pointer
strtable = malloc(0x200000); // Allocate 2MB string table buffer
if (verb_flag)
{
if (prg_flag)
- {
printf("TOS header : 28 bytes\n");
- printf("Total : %d bytes\n", 28 + sect[TEXT].sloc + sect[DATA].sloc + sect[BSS].sloc);
- }
- else
- {
- printf("Total : %d bytes\n", sect[TEXT].sloc + sect[DATA].sloc + sect[BSS].sloc);
- }
- }
- // Compute size of symbol table; assign numbers to the symbols...
- ssize = 0;
+ printf("Total : %d bytes\n", sect[TEXT].sloc + sect[DATA].sloc + sect[BSS].sloc + (prg_flag ? 28 : 0));
+ }
- // As we grabbed BSD *and* Alcyon in prg_flag == 0 mode, this is *always*
- // false... :-P
- if (prg_flag != 1)
- ssize = sy_assign(NULL, NULL) * 14;
+ // Assign index numbers to the symbols, get # of symbols (we assume
+ // that all symbols can potentially be extended, hence the x28)
+ uint32_t symbolMaxSize = sy_assign(NULL, NULL) * 28;
// Alloc memory for header + text + data, symbol and relocation
// information construction.
- t = tds = sect[TEXT].sloc + sect[DATA].sloc;
-
- if (t < ssize)
- t = ssize;
-
- // Is there any reason to do this this way???
- buf = malloc(t + HDRSIZE);
- buf += HDRSIZE;
+ tds = sect[TEXT].sloc + sect[DATA].sloc;
+ buf = malloc(HDRSIZE + tds + symbolMaxSize);
// Build object file header just before the text+data image
- chptr = buf - HDRSIZE; // -> base of header
+ chptr = buf; // -> base of header
D_word(0x601A); // 00 - magic number
D_long(sect[TEXT].sloc); // 02 - TEXT size
D_long(sect[DATA].sloc); // 06 - DATA size
D_long(sect[BSS].sloc); // 0A - BSS size
- D_long(ssize); // 0E - symbol table size
+ D_long(0); // 0E - symbol table size (filled later)
D_long(0); // 12 - stack size (unused)
D_long(PRGFLAGS); // 16 - PRGFLAGS
D_word(0); // 1A - relocation information exists
// Construct text and data segments; fixup relocatable longs in .PRG
// mode; finally write the header + text + data
- p = buf;
+ p = buf + HDRSIZE;
for(i=TEXT; i<=DATA; i++)
{
// Do a first pass on the Alcyon image, if in PRG mode
if (prg_flag)
- MarkImage(buf, tds, sect[TEXT].sloc, 0);
-
- unused = write(fd, buf - HDRSIZE, tds + HDRSIZE);
+ MarkImage(buf + HDRSIZE, tds, sect[TEXT].sloc, 0);
- // Construct and write symbol table
- if (prg_flag != 1)
+ // Construct symbol table and update the header entry, if necessary
+ if (prg_flag > 1)
{
- sy_assign(buf, AddSymEntry);
- unused = write(fd, buf, ssize);
+ // sy_assign with AddSymEntry updates symsize (stays 0 otherwise)
+ sy_assign(buf + HDRSIZE + tds, AddSymEntry);
+ chptr = buf + 0x0E; // Point to symbol table size entry
+ D_long(symsize);
}
+ // Write out the header + text & data + symbol table (if any)
+ unused = write(fd, buf, HDRSIZE + tds + symsize);
+
// Construct and write relocation information; the size of it changes if
- // we're writing a RELMODed executable.
+ // we're writing a RELMODed executable. N.B.: Destroys buffer!
tds = MarkImage(buf, tds, sect[TEXT].sloc, 1);
unused = write(fd, buf, tds);
}
projects / rmac / blobdiff