6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-04-08 19:38:55 +00:00
Code Issues Projects Releases Wiki Activity

Rename more stuff from "overlay" to "replace".

Browse Source
This commit is contained in:
Laubzega 2018-09-06 00:18:39 -07:00
parent cd9efd53fe
commit c7bb27bac9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ld65/bin.c
View File

@ -193,7 +193,7 @@ static void BinWriteMem (BinDesc* D, MemoryArea* M)
NewAddr += M->Start;
}
if (DoWrite || (M->Flags & MF_FILL) != 0) {
/* Seek in "overlay" segments */
/* Seek in "replace" segments */
if (S->Flags & SF_REPLACE) {
fseek (D->F, NewAddr - M->Start, SEEK_SET);
} else {

12
src/ld65/config.c
View File

@ -1797,7 +1797,7 @@ unsigned CfgProcess (void)
for (I = 0; I < CollCount (&MemoryAreas); ++I) {
unsigned J;
unsigned long Addr;
unsigned Overlays = 0;
unsigned Replaces = 0;
/* Get the next memory area */
MemoryArea* M = CollAtUnchecked (&MemoryAreas, I);
@ -1851,23 +1851,23 @@ unsigned CfgProcess (void)
/* Remember the start address before handling this segment */
unsigned long StartAddr = Addr;
/* Take note of overlayed segments and make sure there are no other
/* Take note of "replace" segments and make sure there are no other
** segment types following them in current memory region.
*/
if (S->Flags & SF_REPLACE) {
if (S->Flags & (SF_OFFSET | SF_START)) {
++Overlays;
++Replaces;
} else {
CfgError (GetSourcePos (M->LI),
"Segment `%s' of type `overlay' requires either"
"Segment `%s' of type `replace' requires either"
" `Start' or `Offset' attribute to be specified",
GetString (S->Name));
}
} else {
if (Overlays > 0) {
if (Replaces > 0) {
CfgError (GetSourcePos (M->LI),
"Segment `%s' is preceded by at least one segment"
" of type `overlay'",
" of type `replace'",
GetString (S->Name));
}
}