empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20 from greg-king5/linker

Browse source 
Fixed ld65's precalculation of memory-area sizes and file-offsets.
This commit is contained in:
Oliver Schmidt 2013-07-10 02:37:45 -07:00
commit c9c66dcfdd
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ld65/config.c
View file

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2012, Ullrich von Bassewitz */ /* (c) 1998-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@ -1959,8 +1959,11 @@ unsigned CfgProcess (void)
/* Calculate the new address */ /* Calculate the new address */
Addr += S->Seg->Size; Addr += S->Seg->Size;
/* If this segment goes out to the file, increase the file size */ /* If this segment will go out to the file, or its place
if ((S->Flags & SF_BSS) == 0 && S->Load == M) { * in the file will be filled, then increase the file size.
*/
if (S->Load == M &&
((S->Flags & SF_BSS) == 0 || (M->Flags & MF_FILL) != 0)) {
M->F->Size += Addr - StartAddr; M->F->Size += Addr - StartAddr;
} }