Finished implemenation of commands to delete macros. Added the new commands to

[cc65] / src / ca65 / symentry.h

diff --git a/src/ca65/symentry.h b/src/ca65/symentry.h
index b30d07241299bfaa2cc8b6973ab64e8230ee80f2..82ca46c551d957ba0c450805903d5a89b9c501d5 100644 (file)
--- a/src/ca65/symentry.h
+++ b/src/ca65/symentry.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2006 Ullrich von Bassewitz                                       */
-/*               Römerstraße 52                                              */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -43,6 +43,7 @@
 #include "coll.h"
 #include "filepos.h"
 #include "inline.h"
+#include "strbuf.h"
 
 /* ca65 */
 #include "spool.h"
@@ -66,7 +67,6 @@
 #define SF_LABEL        0x0080          /* Used as a label */
 #define SF_VAR          0x0100          /* Variable symbol */
 #define SF_FORCED       0x0400          /* Forced import, SF_IMPORT also set */
-#define SF_INDEXED     0x0800          /* Index is valid */
 #define SF_MULTDEF             0x2000          /* Multiply defined symbol */
 #define        SF_DEFINED      0x4000          /* Defined */
 #define SF_REFERENCED  0x8000          /* Referenced */
@@ -82,8 +82,11 @@ struct SymEntry {
     SymEntry*                  Right;          /* Lexically larger entry */
     SymEntry*                  List;           /* List of all entries */
     SymEntry*                  Locals;         /* Root of subtree for local symbols */
-    struct SymTable*   SymTab;         /* Table this symbol is in, 0 for locals */
-    FilePos                    Pos;            /* File position for this symbol */
+    union {
+        struct SymTable*    Tab;               /* Table this symbol is in */
+        struct SymEntry*    Entry;
+    } Sym;
+    Collection          LineInfos;      /* Line infos for this symbol */
     FilePos*            GuessedUse[1];  /* File position where symbol
                                          * address size was guessed, and the
                                          * smallest possible addressing was NOT
@@ -91,13 +94,14 @@ struct SymEntry {
                                          * addressing
                                          */
     unsigned            Flags;         /* Symbol flags */
-    unsigned           Index;          /* Index of import/export entries */
+    unsigned            DebugSymId;     /* Debug symbol id */
+    unsigned                   ImportId;       /* Id of import if this is one */
     struct ExprNode*    Expr;          /* Symbol expression */
     Collection          ExprRefs;       /* Expressions using this symbol */
     unsigned char       ExportSize;     /* Export address size */
     unsigned char       AddrSize;       /* Address size of label */
     unsigned char              ConDesPrio[CD_TYPE_COUNT];      /* ConDes priorities... */
-                                       /* ...actually value+1 (used as flag) */
+                                       /* ...actually value+1 (used as flag) */
     unsigned            Name;          /* Name index in global string pool */
 };
 
@@ -115,10 +119,10 @@ extern SymEntry* SymLast;
 
 
 
-SymEntry* NewSymEntry (const char* Name, unsigned Flags);
+SymEntry* NewSymEntry (const StrBuf* Name, unsigned Flags);
 /* Allocate a symbol table entry, initialize and return it */
 
-int SymSearchTree (SymEntry* T, const char* Name, SymEntry** E);
+int SymSearchTree (SymEntry* T, const StrBuf* Name, SymEntry** E);
 /* Search in the given tree for a name. If we find the symbol, the function
  * will return 0 and put the entry pointer into E. If we did not find the
  * symbol, and the tree is empty, E is set to NULL. If the tree is not empty,
@@ -242,7 +246,7 @@ INLINE int SymIsVar (const SymEntry* S)
 #  define SymIsVar(S)   (((S)->Flags & SF_VAR) != 0)
 #endif
 
-int SymIsConst (SymEntry* Sym, long* Val);
+int SymIsConst (const SymEntry* Sym, long* Val);
 /* Return true if the given symbol has a constant value. If Val is not NULL
  * and the symbol has a constant value, store it's value there.
  */
@@ -305,13 +309,13 @@ const struct ExprNode* SymResolve (const SymEntry* Sym);
  */
 
 #if defined(HAVE_INLINE)
-INLINE const char* GetSymName (const SymEntry* S)
+INLINE const StrBuf* GetSymName (const SymEntry* S)
 /* Return the name of the symbol */
 {
-    return GetString (S->Name);
+    return GetStrBuf (S->Name);
 }
 #else
-#  define GetSymName(S)   GetString ((S)->Name)
+#  define GetSymName(S)   GetStrBuf ((S)->Name)
 #endif
 
 #if defined(HAVE_INLINE)
@@ -331,18 +335,18 @@ long GetSymVal (SymEntry* Sym);
  * in case the symbol is undefined or not constant.
  */
 
-unsigned GetSymIndex (const SymEntry* Sym);
-/* Return the symbol index for the given symbol */
+unsigned GetSymImportId (const SymEntry* Sym);
+/* Return the import id for the given symbol */
 
-#if defined(HAVE_INLINE)
-INLINE const FilePos* GetSymPos (const SymEntry* S)
+unsigned GetSymInfoFlags (const SymEntry* Sym, long* ConstVal);
+/* Return a set of flags used when writing symbol information into a file.
+ * If the SYM_CONST bit is set, ConstVal will contain the constant value
+ * of the symbol. The result does not include the condes count.
+ * See common/symdefs.h for more information.
+ */
+
+const FilePos* GetSymPos (const SymEntry* S);
 /* Return the position of first occurence in the source for the given symbol */
-{
-    return &S->Pos;
-}
-#else
-#  define GetSymPos(S)   (&(S)->Pos)
-#endif
 
 
 
@@ -352,3 +356,4 @@ INLINE const FilePos* GetSymPos (const SymEntry* S)
 
 
 
+