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

Fixed an error: When determining where to place initialized data, the compiler

Browse Source 
didn't look "deep enough" into nested arrays to determine the constness
correctly.


git-svn-id: svn://svn.cc65.org/cc65/trunk@5622 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2012-03-24 14:28:59 +00:00
parent 515661e5f4
commit 724d1b9160
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cc65/compile.c
View File

@@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000-2009, Ullrich von Bassewitz */ /* (C) 2000-2012, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@@ -93,7 +93,7 @@ static void Parse (void)
/* Disallow ASM statements on global level */ /* Disallow ASM statements on global level */
if (CurTok.Tok == TOK_ASM) { if (CurTok.Tok == TOK_ASM) {
Error ("__asm__ is not allowed here"); Error ("__asm__ is not allowed here");
/* Parse and remove the statement for error recovery */ /* Parse and remove the statement for error recovery */
AsmStatement (); AsmStatement ();
ConsumeSemi (); ConsumeSemi ();
@@ -209,9 +209,7 @@ static void Parse (void)
* the element qualifiers, since not the array but its * the element qualifiers, since not the array but its
* elements are const. * elements are const.
*/ */
if (IsQualConst (Decl.Type) || if (IsQualConst (GetBaseElementType (Decl.Type))) {
(IsTypeArray (Decl.Type) &&
IsQualConst (GetElementType (Decl.Type)))) {
g_userodata (); g_userodata ();
} else { } else {
g_usedata (); g_usedata ();

22
src/cc65/datatype.c
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2008 Ullrich von Bassewitz */ /* (C) 1998-2012, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -654,6 +654,20 @@ Type* GetElementType (Type* T)
Type* GetBaseElementType (Type* T)
/* Return the base element type of a given type. If T is not an array, this
* will return. Otherwise it will return the base element type, which means
* the element type that is not an array.
*/
{
while (IsTypeArray (T)) {
++T;
}
return T;
}
SymEntry* GetSymEntry (const Type* T) SymEntry* GetSymEntry (const Type* T)
/* Return a SymEntry pointer from a type */ /* Return a SymEntry pointer from a type */
{ {

8
src/cc65/datatype.h
View File

@@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2010, Ullrich von Bassewitz */ /* (C) 1998-2012, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@@ -640,6 +640,12 @@ void SetElementCount (Type* T, long Count);
Type* GetElementType (Type* T); Type* GetElementType (Type* T);
/* Return the element type of the given array type. */ /* Return the element type of the given array type. */
Type* GetBaseElementType (Type* T);
/* Return the base element type of a given type. If T is not an array, this
* will return. Otherwise it will return the base element type, which means
* the element type that is not an array.
*/
struct SymEntry* GetSymEntry (const Type* T) attribute ((const)); struct SymEntry* GetSymEntry (const Type* T) attribute ((const));
/* Return a SymEntry pointer from a type */ /* Return a SymEntry pointer from a type */

5
src/cc65/locals.c
View File

@@ -356,11 +356,10 @@ static unsigned ParseStaticDecl (Declaration* Decl, unsigned* SC)
if (CurTok.Tok == TOK_ASSIGN) { if (CurTok.Tok == TOK_ASSIGN) {
/* Initialization ahead, switch to data segment and define a label. /* Initialization ahead, switch to data segment and define a label.
* For arrays, we need to check the elements of the array for * For arrays, we need to check the elements of the array for
* constness, not the array itself. * constness, not the array itself.
*/ */
if (IsQualConst (Decl->Type) || if (IsQualConst (GetBaseElementType (Decl->Type))) {
(IsTypeArray (Decl->Type) && IsQualConst (GetElementType (Decl->Type)))) {
SymData = AllocLabel (g_userodata); SymData = AllocLabel (g_userodata);
} else { } else {
SymData = AllocLabel (g_usedata); SymData = AllocLabel (g_usedata);