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

Fixed a bug

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@2341 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2003-08-16 08:14:05 +00:00
parent b45d25d60f
commit cc389a3911
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ld65/config.c
View File

@@ -1397,13 +1397,13 @@ void CfgRead (void)
static void CreateRunDefines (SegDesc* S) static void CreateRunDefines (SegDesc* S, unsigned long SegAddr)
/* Create the defines for a RUN segment */ /* Create the defines for a RUN segment */
{ {
char Buf [256]; char Buf [256];
xsprintf (Buf, sizeof (Buf), "__%s_RUN__", GetString (S->Name)); xsprintf (Buf, sizeof (Buf), "__%s_RUN__", GetString (S->Name));
CreateSegmentExport (GetStringId (Buf), S->Seg, 0); CreateMemoryExport (GetStringId (Buf), S->Run, SegAddr - S->Run->Start);
xsprintf (Buf, sizeof (Buf), "__%s_SIZE__", GetString (S->Name)); xsprintf (Buf, sizeof (Buf), "__%s_SIZE__", GetString (S->Name));
CreateConstExport (GetStringId (Buf), S->Seg->Size); CreateConstExport (GetStringId (Buf), S->Seg->Size);
S->Flags |= SF_RUN_DEF; S->Flags |= SF_RUN_DEF;
@@ -1411,13 +1411,13 @@ static void CreateRunDefines (SegDesc* S)
static void CreateLoadDefines (Memory* M, SegDesc* S) static void CreateLoadDefines (SegDesc* S, unsigned long SegAddr)
/* Create the defines for a LOAD segment */ /* Create the defines for a LOAD segment */
{ {
char Buf [256]; char Buf [256];
xsprintf (Buf, sizeof (Buf), "__%s_LOAD__", GetString (S->Name)); xsprintf (Buf, sizeof (Buf), "__%s_LOAD__", GetString (S->Name));
CreateMemoryExport (GetStringId (Buf), M, S->Seg->PC - M->Start); CreateMemoryExport (GetStringId (Buf), S->Load, SegAddr - S->Load->Start);
S->Flags |= SF_LOAD_DEF; S->Flags |= SF_LOAD_DEF;
} }
@@ -1504,10 +1504,10 @@ void CfgAssignSegments (void)
*/ */
if (S->Load == M) { if (S->Load == M) {
if ((S->Flags & SF_LOAD_DEF) == 0) { if ((S->Flags & SF_LOAD_DEF) == 0) {
CreateLoadDefines (M, S); CreateLoadDefines (S, Addr);
} else { } else {
CHECK ((S->Flags & SF_RUN_DEF) == 0); CHECK ((S->Flags & SF_RUN_DEF) == 0);
CreateRunDefines (S); CreateRunDefines (S, Addr);
} }
} }
} else { } else {
@@ -1516,10 +1516,10 @@ void CfgAssignSegments (void)
* have only one copy of the segment in the area. * have only one copy of the segment in the area.
*/ */
if (S->Run == M) { if (S->Run == M) {
CreateRunDefines (S); CreateRunDefines (S, Addr);
} }
if (S->Load == M) { if (S->Load == M) {
CreateLoadDefines (M, S); CreateLoadDefines (S, Addr);
} }
} }
} }