6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-10 19:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1995 from bbbradsmith/overwrite_segment_fix

Browse Source 
ld65 fix overwrite segments adding wrong padding or causing internal errors
This commit is contained in:
Bob Andrews 2023-02-24 21:27:33 +01:00 committed by GitHub
commit a299ef4210
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ld65/bin.c
View File

@ -193,8 +193,16 @@ static void BinWriteMem (BinDesc* D, MemoryArea* M)
NewAddr += M->Start;
}
if (DoWrite || (M->Flags & MF_FILL) != 0) {
/* Seek in "overwrite" segments */
if (S->Flags & SF_OVERWRITE) {
/* Seek in "overwrite" segments. Fill if the seek position has not been reached yet. */
unsigned long FileLength;
unsigned long SeekTarget = NewAddr - M->Start + M->FileOffs;
fseek (D->F, 0, SEEK_END);
FileLength = ftell (D->F);
if (SeekTarget > FileLength) {
WriteMult (D->F, M->FillVal, SeekTarget - FileLength);
PrintNumVal ("SF_OVERWRITE", SeekTarget - FileLength);
}
fseek (D->F, NewAddr - M->Start + M->FileOffs, SEEK_SET);
} else {
WriteMult (D->F, M->FillVal, NewAddr-Addr);

26
src/ld65/config.c
View File

@ -1950,6 +1950,10 @@ unsigned CfgProcess (void)
/* Remember the start address before handling this segment */
unsigned long StartAddr = Addr;
/* For computing FillLevel */
unsigned long FillLevel;
unsigned long FillAdded = 0;
/* Take note of "overwrite" segments and make sure there are no
** other segment types following them in current memory region.
*/
@ -2086,14 +2090,19 @@ unsigned CfgProcess (void)
/* Increment the fill level of the memory area; and, check for an
** overflow.
*/
M->FillLevel = Addr + S->Seg->Size - M->Start;
if (M->FillLevel > M->Size && (M->Flags & MF_OVERFLOW) == 0) {
FillLevel = Addr + S->Seg->Size - M->Start;
if (FillLevel > M->Size && (M->Flags & MF_OVERFLOW) == 0) {
++Overflows;
M->Flags |= MF_OVERFLOW;
CfgWarning (GetSourcePos (M->LI),
"Segment '%s' overflows memory area '%s' by %lu byte%c",
GetString (S->Name), GetString (M->Name),
M->FillLevel - M->Size, (M->FillLevel - M->Size == 1) ? ' ' : 's');
FillLevel - M->Size, (FillLevel - M->Size == 1) ? ' ' : 's');
}
if (FillLevel > M->FillLevel) {
/* Regular segments increase FillLevel. Overwrite segments may increase but not decrease FillLevel. */
FillAdded = FillLevel - M->FillLevel;
M->FillLevel = FillLevel;
}
/* If requested, define symbols for the start and size of the
@ -2112,13 +2121,14 @@ unsigned CfgProcess (void)
Addr += S->Seg->Size;
/* If this segment will go out to the file, or its place
** in the file will be filled, then increase the file size,
** unless it's an OVERWRITE segment.
** in the file will be filled, then increase the file size.
** An OVERWRITE segment will only increase the size if it overlapped some of the fill area.
*/
if (S->Load == M &&
((S->Flags & SF_BSS) == 0 || (M->Flags & MF_FILL) != 0) &&
(S->Flags & SF_OVERWRITE) == 0) {
M->F->Size += Addr - StartAddr;
((S->Flags & SF_BSS) == 0 || (M->Flags & MF_FILL) != 0)) {
M->F->Size += (!(S->Flags & SF_OVERWRITE)) ?
(Addr - StartAddr) :
FillAdded;
}
}