Forgot a cast, sorry

[cc65] / src / cc65 / symtab.c

diff --git a/src/cc65/symtab.c b/src/cc65/symtab.c
index 8eefe1178da32b93abd292c4852dba380079d164..56196ea5a3e82b03d441b80a971ef06e75dee932 100644 (file)
--- a/src/cc65/symtab.c
+++ b/src/cc65/symtab.c
@@ -92,7 +92,7 @@ static SymTable*        SymTab          = 0;
 static SymTable*        TagTab0         = 0;
 static SymTable*        TagTab          = 0;
 static SymTable*        LabelTab        = 0;
-
+static SymTable*        SPAdjustTab     = 0;
 
 
 /*****************************************************************************/
@@ -168,11 +168,11 @@ static void CheckSymTable (SymTable* Tab)
                     !SymHasAttr (Entry, atUnused)) {
                     if (Flags & SC_PARAM) {
                         if (IS_Get (&WarnUnusedParam)) {
-                            Warning ("Parameter `%s' is never used", Entry->Name);
+                            Warning ("Parameter '%s' is never used", Entry->Name);
                         }
                     } else {
                         if (IS_Get (&WarnUnusedVar)) {
-                            Warning ("`%s' is defined but never used", Entry->Name);
+                            Warning ("'%s' is defined but never used", Entry->Name);
                         }
                     }
                 }
@@ -182,11 +182,11 @@ static void CheckSymTable (SymTable* Tab)
             if (Flags & SC_LABEL) {
                 if (!SymIsDef (Entry)) {
                     /* Undefined label */
-                    Error ("Undefined label: `%s'", Entry->Name);
+                    Error ("Undefined label: '%s'", Entry->Name);
                 } else if (!SymIsRef (Entry)) {
                     /* Defined but not used */
                     if (IS_Get (&WarnUnusedLabel)) {
-                        Warning ("`%s' is defined but never used", Entry->Name);
+                        Warning ("'%s' is defined but never used", Entry->Name);
                     }
                 }
             }
@@ -225,6 +225,9 @@ void EnterGlobalLevel (void)
 
     /* Create and assign the tag table */
     TagTab0 = TagTab = NewSymTable (SYMTAB_SIZE_GLOBAL);
+
+    /* Create and assign the table of SP adjustment symbols */
+    SPAdjustTab = NewSymTable (SYMTAB_SIZE_GLOBAL);
 }
 
 
@@ -563,10 +566,10 @@ SymEntry* AddStructSym (const char* Name, unsigned Type, unsigned Size, SymTable
         /* We do have an entry. This may be a forward, so check it. */
         if ((Entry->Flags & SC_TYPEMASK) != Type) {
             /* Existing symbol is not a struct */
-            Error ("Symbol `%s' is already different kind", Name);
+            Error ("Symbol '%s' is already different kind", Name);
         } else if (Size > 0 && Entry->V.S.Size > 0) {
             /* Both structs are definitions. */
-            Error ("Multiple definition for `%s'", Name);
+            Error ("Multiple definition for '%s'", Name);
         } else {
             /* Define the struct size if it is given */
             if (Size > 0) {
@@ -602,7 +605,7 @@ SymEntry* AddBitField (const char* Name, unsigned Offs, unsigned BitOffs, unsign
     if (Entry) {
 
         /* We have a symbol with this name already */
-        Error ("Multiple definition for `%s'", Name);
+        Error ("Multiple definition for '%s'", Name);
 
     } else {
 
@@ -636,9 +639,9 @@ SymEntry* AddConstSym (const char* Name, const Type* T, unsigned Flags, long Val
     SymEntry* Entry = FindSymInTable (Tab, Name, HashStr (Name));
     if (Entry) {
         if ((Entry->Flags & SC_CONST) != SC_CONST) {
-            Error ("Symbol `%s' is already different kind", Name);
+            Error ("Symbol '%s' is already different kind", Name);
         } else {
-            Error ("Multiple definition for `%s'", Name);
+            Error ("Multiple definition for '%s'", Name);
         }
         return Entry;
     }
@@ -660,7 +663,7 @@ SymEntry* AddConstSym (const char* Name, const Type* T, unsigned Flags, long Val
 }
 
 
-DefOrRef* AddDefOrRef(SymEntry* E, unsigned Flags)
+DefOrRef* AddDefOrRef (SymEntry* E, unsigned Flags)
 /* Add definition or reference to the SymEntry and preserve its attributes */
 {
     DefOrRef *DOR;
@@ -677,6 +680,18 @@ DefOrRef* AddDefOrRef(SymEntry* E, unsigned Flags)
     return DOR;
 }
 
+unsigned short FindSPAdjustment (const char* Name)
+/* Search for an entry in the table of SP adjustments */
+{
+    SymEntry* Entry = FindSymInTable (SPAdjustTab, Name, HashStr (Name));
+
+    if (!Entry) {
+        Internal ("No SP adjustment label entry found");
+    }
+
+    return Entry->V.SPAdjustment;
+}
+
 SymEntry* AddLabelSym (const char* Name, unsigned Flags)
 /* Add a goto label to the label table */
 {
@@ -691,7 +706,7 @@ SymEntry* AddLabelSym (const char* Name, unsigned Flags)
 
         if (SymIsDef (Entry) && (Flags & SC_DEF) != 0) {
             /* Trying to define the label more than once */
-            Error ("Label `%s' is defined more than once", Name);
+            Error ("Label '%s' is defined more than once", Name);
         }
 
         NewDOR = AddDefOrRef (Entry, Flags);
@@ -728,10 +743,18 @@ SymEntry* AddLabelSym (const char* Name, unsigned Flags)
                 /* We're processing a label, let's update all gotos encountered
                 ** so far
                 */
+                SymEntry *E;
                 g_userodata();
                 g_defdatalabel (DOR->LateSP_Label);
                 g_defdata (CF_CONST | CF_INT, StackPtr - DOR->StackPtr, 0);
 
+                /* Optimizer will need the information about the value of SP adjustment
+                ** later, so let's preserve it.
+                */
+                E = NewSymEntry (LocalLabelName (DOR->LateSP_Label), SC_SPADJUSTMENT);
+                E->V.SPAdjustment = StackPtr - DOR->StackPtr;
+                AddSymEntry (SPAdjustTab, E);
+
                 /* Are we jumping into a block with initalization of an object that
                 ** has automatic storage duration? Let's emit a warning.
                 */
@@ -786,7 +809,7 @@ SymEntry* AddLocalSym (const char* Name, const Type* T, unsigned Flags, int Offs
     if (Entry) {
 
         /* We have a symbol with this name already */
-        Error ("Multiple definition for `%s'", Name);
+        Error ("Multiple definition for '%s'", Name);
 
     } else {
 
@@ -842,12 +865,12 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
         ** then avoid a compiler crash.  See GitHub issue #728.
         */
         if (Entry->Flags & SC_ENUM) {
-            Fatal ("Can't redeclare enum constant `%s' as global variable", Name);
+            Fatal ("Can't redeclare enum constant '%s' as global variable", Name);
         }
 
         /* We have a symbol with this name already */
         if (Entry->Flags & SC_TYPE) {
-            Error ("Multiple definition for `%s'", Name);
+            Error ("Multiple definition for '%s'", Name);
             return Entry;
         }
 
@@ -867,7 +890,7 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
             if ((Size != UNSPECIFIED && ESize != UNSPECIFIED && Size != ESize) ||
                 TypeCmp (T + 1, EType + 1) < TC_EQUAL) {
                 /* Types not identical: Conflicting types */
-                Error ("Conflicting types for `%s'", Name);
+                Error ("Conflicting types for '%s'", Name);
                 return Entry;
             } else {
                 /* Check if we have a size in the existing definition */
@@ -880,7 +903,7 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
         } else {
             /* New type must be identical */
             if (TypeCmp (EType, T) < TC_EQUAL) {
-                Error ("Conflicting types for `%s'", Name);
+                Error ("Conflicting types for '%s'", Name);
                 return Entry;
             }
 
@@ -907,7 +930,7 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
         ** warn about the conflict.  (It will compile a public declaration.)
         */
         if ((Flags & SC_EXTERN) == 0 && (Entry->Flags & SC_EXTERN) != 0) {
-            Warning ("static declaration follows non-static declaration of `%s'.", Name);
+            Warning ("static declaration follows non-static declaration of '%s'.", Name);
         }
 
         /* An extern declaration must not change the current linkage. */
@@ -919,7 +942,7 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
         ** warn about the conflict.  (It will compile a public declaration.)
         */
         if ((Flags & SC_EXTERN) != 0 && (Entry->Flags & SC_EXTERN) == 0) {
-            Warning ("public declaration follows static declaration of `%s'.", Name);
+            Warning ("public declaration follows static declaration of '%s'.", Name);
         }
 
         /* Add the new flags */
@@ -994,7 +1017,7 @@ void MakeZPSym (const char* Name)
     if (Entry) {
         Entry->Flags |= SC_ZEROPAGE;
     } else {
-        Error ("Undefined symbol: `%s'", Name);
+        Error ("Undefined symbol: '%s'", Name);
     }
 }