d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

aslod: fix: use section alignments when computing section sizes

Browse source 
The follows( ) function uses pa->os_lign when determining
whether an output section pa immediately follows another
section pb.

However, emits( ) was not using this alignment information
when laying out and padding the output sections.  This seems
to be a bug.

I suspect that mach/arm/cv/cv.c might need a similar fix.
This commit is contained in:
Tee-Kiah Chia 2021-03-18 18:25:04 +00:00
parent bda4239464
commit a29507d9e4
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
util/amisc/aslod.c
View file

@ -95,9 +95,10 @@ int follows(struct outsect* pa, struct outsect* pb)
* to the output stream, zero filling any uninitialised * to the output stream, zero filling any uninitialised
* space. */ * space. */
void emits(struct outsect* section) void emits(struct outsect* section, struct outsect* nextsect)
{ {
char buffer[BUFSIZ]; char buffer[BUFSIZ];
uint32_t real_size;
/* Copy the actual data. */ /* Copy the actual data. */
@ -111,12 +112,19 @@ void emits(struct outsect* section)
n -= blocksize; n -= blocksize;
} }
} }
/* Calculate the actual size of the section in the final memory
* layout. Take into account the next section's alignment, if any. */
real_size = section->os_size;
if (nextsect)
real_size = align(section->os_base + real_size, nextsect->os_lign)
- section->os_base;
/* Zero fill any remaining space. */ /* Zero fill any remaining space. */
if (section->os_flen != section->os_size) if (section->os_flen != real_size)
{ {
long n = section->os_size - section->os_flen; uint32_t n = real_size - section->os_flen;
memset(buffer, 0, BUFSIZ); memset(buffer, 0, BUFSIZ);
while (n > 0) while (n > 0)
@ -280,9 +288,9 @@ int main(int argc, char* argv[])
/* And go! */ /* And go! */
emits(&outsect[TEXT]); emits(&outsect[TEXT], &outsect[ROM]);
emits(&outsect[ROM]); emits(&outsect[ROM], &outsect[DATA]);
emits(&outsect[DATA]); emits(&outsect[DATA], NULL);
if (ferror(output)) if (ferror(output))
fatal("output write error"); fatal("output write error");