bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2710 from kugelfuhr/kugelfuhr/fix-2694

Browse Source 
Fix wrong file offset handling for a memory area with only run segments written to a file
This commit is contained in:
Bob Andrews
2025-06-23 14:17:55 +02:00
committed by GitHub
parent 540a6a7658 e4b610994c
commit c832af8a71
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ld65/config.c
View File

@@ -2107,7 +2107,9 @@ unsigned CfgProcess (void)
FillLevel - M->Size, (FillLevel - M->Size == 1) ? "" : "s"); FillLevel - M->Size, (FillLevel - M->Size == 1) ? "" : "s");
} }
if (FillLevel > M->FillLevel) { if (FillLevel > M->FillLevel) {
/* Regular segments increase FillLevel. Overwrite segments may increase but not decrease FillLevel. */ /* Regular segments increase FillLevel. Overwrite segments may
** increase but not decrease FillLevel.
*/
FillAdded = FillLevel - M->FillLevel; FillAdded = FillLevel - M->FillLevel;
M->FillLevel = FillLevel; M->FillLevel = FillLevel;
} }
@@ -2127,15 +2129,18 @@ unsigned CfgProcess (void)
/* Calculate the new address */ /* Calculate the new address */
Addr += S->Seg->Size; Addr += S->Seg->Size;
/* If this segment will go out to the file, or its place /* If this segment will go out to the file, or its place in the
** in the file will be filled, then increase the file size. ** file will be filled, then increase the file size. An OVERWRITE
** An OVERWRITE segment will only increase the size if it overlapped some of the fill area. ** segment will only increase the size if it overlapped some of
** the fill area.
*/ */
if (S->Load == M && if (S->Load == M &&
((S->Flags & SF_BSS) == 0 || (M->Flags & MF_FILL) != 0)) { ((S->Flags & SF_BSS) == 0 || (M->Flags & MF_FILL) != 0)) {
M->F->Size += (!(S->Flags & SF_OVERWRITE)) ? if ((S->Flags & SF_OVERWRITE) == 0) {
(Addr - StartAddr) : M->F->Size += Addr - StartAddr;
FillAdded; } else {
M->F->Size += FillAdded;
}
} }
} }
@@ -2173,7 +2178,7 @@ unsigned CfgProcess (void)
** area, account for that in the file size. ** area, account for that in the file size.
*/ */
if ((M->Flags & MF_OVERFLOW) == 0 && (M->Flags & MF_FILL) != 0) { if ((M->Flags & MF_OVERFLOW) == 0 && (M->Flags & MF_FILL) != 0) {
M->F->Size += (M->Size - M->FillLevel); M->F->Size = M->FileOffs + M->Size;
} }
} }