6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-08-08 22:25:28 +00:00
Code Issues Projects Releases Wiki Activity

Don't support overwrite segments.

Browse Source 
This simplifies the memory area size calculations.
This commit is contained in:
Daniel Serpell
2018-09-25 23:51:51 -03:00
parent 63d9b492b7
commit 4e51fcbdd4
1 changed files with 10 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/ld65/xex.c
View File

@@ -138,58 +138,18 @@ static void XexWriteMem (XexDesc* D, MemoryArea* M)
/* Get the start address and size of this memory area */ /* Get the start address and size of this memory area */
unsigned long Addr = M->Start; unsigned long Addr = M->Start;
/* Walk over segments twice: first to get real area size, then to write /* Real size of the memory area, either the FillLevel or the Size */
* all segments. */ unsigned long Size = M->FillLevel;
for (I = 0; I < CollCount (&M->SegList); ++I) { if ((M->Flags & MF_FILL) != 0 && M->FillLevel < M->Size)
Size = M->Size;
/* Get the segment */
SegDesc* S = CollAtUnchecked (&M->SegList, I);
/* Keep the user happy */
Print (stdout, 1, " Allocating `%s'\n", GetString (S->Name));
/* If this is the run memory area, we must apply run alignment. If
** this is not the run memory area but the load memory area (which
** means that both are different), we must apply load alignment.
** Beware: DoWrite may be true even if this is the run memory area,
** because it may be also the load memory area.
*/
if (S->Run == M) {
/* Handle ALIGN and OFFSET/START */
if (S->Flags & SF_ALIGN) {
/* Align the address */
Addr = AlignAddr (Addr, S->RunAlignment);
} else if (S->Flags & (SF_OFFSET | SF_START)) {
Addr = S->Addr;
if (S->Flags & SF_OFFSET) {
/* It's an offset, not a fixed address, make an address */
Addr += M->Start;
}
}
} else if (S->Load == M) {
/* Handle ALIGN_LOAD */
if (S->Flags & SF_ALIGN_LOAD) {
/* Align the address */
Addr = AlignAddr (Addr, S->LoadAlignment);
}
}
/* Calculate the new address */
Addr += S->Seg->Size;
}
/* Write header */ /* Write header */
if (ftell (D->F) == 0) if (ftell (D->F) == 0)
Write16(D->F, 0xFFFF); Write16(D->F, 0xFFFF);
Write16(D->F, M->Start); Write16(D->F, Addr);
Write16(D->F, Addr-1); Write16(D->F, Addr + Size - 1);
/* Redo */ /* Walk over all segments in this memory area */
Addr = M->Start;
for (I = 0; I < CollCount (&M->SegList); ++I) { for (I = 0; I < CollCount (&M->SegList); ++I) {
int DoWrite; int DoWrite;
@@ -229,9 +189,10 @@ static void XexWriteMem (XexDesc* D, MemoryArea* M)
NewAddr += M->Start; NewAddr += M->Start;
} }
if (DoWrite || (M->Flags & MF_FILL) != 0) { if (DoWrite || (M->Flags & MF_FILL) != 0) {
/* Seek in "overwrite" segments */ /* "overwrite" segments are not supported */
if (S->Flags & SF_OVERWRITE) { if (S->Flags & SF_OVERWRITE) {
fseek (D->F, NewAddr - M->Start, SEEK_SET); Error ("ATARI file format does not support overwrite for segment '%s'.",
GetString (S->Name));
} else { } else {
WriteMult (D->F, M->FillVal, NewAddr-Addr); WriteMult (D->F, M->FillVal, NewAddr-Addr);
PrintNumVal ("SF_OFFSET", NewAddr - Addr); PrintNumVal ("SF_OFFSET", NewAddr - Addr);