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

Fix regression of #pragma bss-name

Browse Source 
Closes #409
This commit is contained in:
Piotr Fusik
2017-03-21 22:35:25 +01:00
parent fe59626953
commit 8e35a82c91
8 changed files with 87 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/cc65/compile.c
View File

@@ -242,16 +242,24 @@ static void Parse (void)
Error ("Variable `%s' has unknown size", Decl.Ident);
}
Entry->Flags &= ~(SC_STORAGE | SC_DEF);
} else {
/* A global (including static) uninitialized variable
** is only a tentative definition. For example, this is valid:
** int i;
** int i;
** static int j;
** static int j = 42;
** Code for these will be generated in FinishCompile.
** For now, just save the BSS segment name
** (can be set with #pragma bss-name)
*/
const char* bssName = GetSegName (SEG_BSS);
if (Entry->V.BssName && strcmp (Entry->V.BssName, bssName) != 0) {
Error ("Global variable `%s' has already been defined in `%s' segment",
Entry->Name, Entry->V.BssName);
}
Entry->V.BssName = xstrdup (bssName);
}
/* A global (including static) uninitialized variable
** is only a tentative definition. For example, this is valid:
** int i;
** int i;
** static int j;
** static int j = 42;
** Code for these will be generated in FinishCompile.
*/
}
}
@@ -418,6 +426,8 @@ void FinishCompile (void)
} else if ((Entry->Flags & (SC_STORAGE | SC_DEF | SC_STATIC)) == (SC_STORAGE | SC_STATIC)) {
/* Tentative definition of uninitialized global variable */
g_usebss ();
SetSegName (SEG_BSS, Entry->V.BssName);
g_segname (SEG_BSS); /* TODO: skip if same as before */
g_defgloblabel (Entry->Name);
g_res (SizeOf (Entry->Type));
/* Mark as defined, so that it will be exported not imported */