]> git.sur5r.net Git - cc65/blobdiff - src/cc65/symentry.c
Fix regression of #pragma bss-name
[cc65] / src / cc65 / symentry.c
index 718cd470e7e0489caca3274cd8c06ff938645940..d6e68d1bbbdd291b51d175ba28a600add40acae9 100644 (file)
@@ -1,12 +1,12 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                               symentry.c                                 */
+/*                                symentry.c                                 */
 /*                                                                           */
-/*              Symbol table entries for the cc65 C compiler                */
+/*               Symbol table entries for the cc65 C compiler                */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2009, Ullrich von Bassewitz                                      */
+/* (C) 2000-2013, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
 
 /* cc65 */
 #include "anonname.h"
+#include "declare.h"
+#include "error.h"
 #include "symentry.h"
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -60,14 +62,16 @@ SymEntry* NewSymEntry (const char* Name, unsigned Flags)
     SymEntry* E = xmalloc (sizeof (SymEntry) + Len);
 
     /* Initialize the entry */
-    E->NextHash        = 0;
-    E->PrevSym = 0;
-    E->NextSym = 0;
-    E->Link    = 0;
-    E->Owner   = 0;
-    E->Flags   = Flags;
-    E->Type    = 0;
+    E->NextHash = 0;
+    E->PrevSym  = 0;
+    E->NextSym  = 0;
+    E->Link     = 0;
+    E->Owner    = 0;
+    E->Flags    = Flags;
+    E->Type     = 0;
+    E->Attr     = 0;
     E->AsmName  = 0;
+    E->V.BssName = 0;
     memcpy (E->Name, Name, Len+1);
 
     /* Return the new entry */
@@ -90,27 +94,28 @@ void DumpSymEntry (FILE* F, const SymEntry* E)
 /* Dump the given symbol table entry to the file in readable form */
 {
     static const struct {
-       const char*         Name;
-       unsigned            Val;
+        const char*         Name;
+        unsigned            Val;
     } Flags [] = {
-       /* Beware: Order is important! */
-       { "SC_TYPEDEF",     SC_TYPEDEF          },
+        /* Beware: Order is important! */
+        { "SC_TYPEDEF",     SC_TYPEDEF          },
         { "SC_BITFIELD",    SC_BITFIELD         },
-               { "SC_STRUCTFIELD", SC_STRUCTFIELD      },
-       { "SC_STRUCT",      SC_STRUCT           },
-       { "SC_AUTO",        SC_AUTO             },
-       { "SC_REGISTER",    SC_REGISTER         },
-       { "SC_STATIC",      SC_STATIC           },
-       { "SC_EXTERN",      SC_EXTERN           },
-       { "SC_ENUM",        SC_ENUM             },
-       { "SC_CONST",       SC_CONST            },
-       { "SC_LABEL",       SC_LABEL            },
-       { "SC_PARAM",       SC_PARAM            },
-       { "SC_FUNC",        SC_FUNC             },
-       { "SC_STORAGE",     SC_STORAGE          },
-       { "SC_DEF",         SC_DEF              },
-       { "SC_REF",         SC_REF              },
-       { "SC_ZEROPAGE",    SC_ZEROPAGE         },
+        { "SC_STRUCTFIELD", SC_STRUCTFIELD      },
+        { "SC_UNION",       SC_UNION            },
+        { "SC_STRUCT",      SC_STRUCT           },
+        { "SC_AUTO",        SC_AUTO             },
+        { "SC_REGISTER",    SC_REGISTER         },
+        { "SC_STATIC",      SC_STATIC           },
+        { "SC_EXTERN",      SC_EXTERN           },
+        { "SC_ENUM",        SC_ENUM             },
+        { "SC_CONST",       SC_CONST            },
+        { "SC_LABEL",       SC_LABEL            },
+        { "SC_PARAM",       SC_PARAM            },
+        { "SC_FUNC",        SC_FUNC             },
+        { "SC_STORAGE",     SC_STORAGE          },
+        { "SC_DEF",         SC_DEF              },
+        { "SC_REF",         SC_REF              },
+        { "SC_ZEROPAGE",    SC_ZEROPAGE         },
     };
 
     unsigned I;
@@ -126,30 +131,103 @@ void DumpSymEntry (FILE* F, const SymEntry* E)
 
     /* Print the flags */
     SymFlags = E->Flags;
-    fprintf (F, "    Flags: ");
+    fprintf (F, "    Flags:");
     for (I = 0; I < sizeof (Flags) / sizeof (Flags[0]) && SymFlags != 0; ++I) {
-       if ((SymFlags & Flags[I].Val) == Flags[I].Val) {
-           SymFlags &= ~Flags[I].Val;
-           fprintf (F, "%s ", Flags[I].Name);
-       }
+        if ((SymFlags & Flags[I].Val) == Flags[I].Val) {
+            SymFlags &= ~Flags[I].Val;
+            fprintf (F, " %s", Flags[I].Name);
+        }
     }
     if (SymFlags != 0) {
-       fprintf (F, "%04X", SymFlags);
+        fprintf (F, " 0x%05X", SymFlags);
     }
     fprintf (F, "\n");
 
     /* Print the type */
     fprintf (F, "    Type:  ");
     if (E->Type) {
-       PrintType (F, E->Type);
+        PrintType (F, E->Type);
     } else {
-       fprintf (F, "(none)");
+        fprintf (F, "(none)");
     }
     fprintf (F, "\n");
 }
 
 
 
+int SymIsOutputFunc (const SymEntry* Sym)
+/* Return true if this is a function that must be output */
+{
+    /* Symbol must be a function which is defined and either extern or
+    ** static and referenced.
+    */
+    return IsTypeFunc (Sym->Type)               &&
+           SymIsDef (Sym)                       &&
+           (Sym->Flags & (SC_REF | SC_EXTERN));
+}
+
+
+
+const DeclAttr* SymGetAttr (const SymEntry* Sym, DeclAttrType AttrType)
+/* Return an attribute for this symbol or NULL if the attribute does not exist */
+{
+    /* Beware: We may not even have a collection */
+    if (Sym->Attr) {
+        unsigned I;
+        for (I = 0; I < CollCount (Sym->Attr); ++I) {
+
+            /* Get the next attribute */
+            const DeclAttr* A = CollConstAt (Sym->Attr, I);
+
+            /* If this is the one we're searching for, return it */
+            if (A->AttrType == AttrType) {
+                return A;
+            }
+        }
+    }
+
+    /* Not found */
+    return 0;
+}
+
+
+
+void SymUseAttr (SymEntry* Sym, struct Declaration* D)
+/* Use the attributes from the declaration for this symbol */
+{
+    /* We cannot specify attributes twice */
+    if ((Sym->Flags & SC_HAVEATTR) != 0) {
+        if (D->Attributes != 0) {
+            Error ("Attributes must be specified in the first declaration");
+        }
+        return;
+    }
+
+    /* Move the attributes */
+    Sym->Attr = D->Attributes;
+    D->Attributes = 0;
+    Sym->Flags |= SC_HAVEATTR;
+}
+
+
+
+void SymSetAsmName (SymEntry* Sym)
+/* Set the assembler name for an external symbol from the name of the symbol */
+{
+    unsigned Len;
+
+    /* Cannot be used to change the name */
+    PRECONDITION (Sym->AsmName == 0);
+
+    /* The assembler name starts with an underline */
+    Len = strlen (Sym->Name);
+    Sym->AsmName = xmalloc (Len + 2);
+    Sym->AsmName[0] = '_';
+    memcpy (Sym->AsmName+1, Sym->Name, Len+1);
+}
+
+
+
 void CvtRegVarToAuto (SymEntry* Sym)
 /* Convert a register variable to an auto variable */
 {
@@ -185,6 +263,3 @@ int HasAnonName (const SymEntry* Entry)
 {
     return IsAnonName (Entry->Name);
 }
-
-
-