X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fsymentry.h;h=b1f8647035d0de46ebe2f0c7d269d708e86f1de5;hb=4a667ead00c10797fb57298b3dd33c2efc6c8d3f;hp=299b0b08efedd1ed7d984842eaba3675ff34bb28;hpb=8ef34472486a80a5f24031c6f764ee195737eba2;p=cc65

diff --git a/src/cc65/symentry.h b/src/cc65/symentry.h
index 299b0b08e..b1f864703 100644
--- a/src/cc65/symentry.h
+++ b/src/cc65/symentry.h
@@ -40,6 +40,9 @@
 
 #include <stdio.h>
 
+/* common */
+#include "inline.h"
+
 /* cc65 */
 #include "datatype.h"
 
@@ -81,7 +84,7 @@ struct Segments;
 
 #define SC_TYPE	       	0x4000U	/* This is a type, struct, typedef, etc. */
 #define SC_STRUCT      	0x4001U	/* Struct or union */
-#define SC_SFLD	       	0x4002U	/* Struct or union field */
+#define SC_STRUCTFIELD  0x4002U	/* Struct or union field */
 #define SC_TYPEDEF     	0x4003U	/* A typedef */
 
 #define SC_ZEROPAGE  	0x8000U	/* Symbol marked as zeropage */
@@ -103,13 +106,21 @@ struct SymEntry {
     /* Data that differs for the different symbol types */
     union {
 
-	/* Offset for locals or struct members */
-	int    			Offs;
+       	/* Offset for locals or struct members */
+       	int    			Offs;
+
+       	/* Label name for static symbols */
+       	unsigned		Label;
 
-	/* Label name for static symbols */
-	unsigned		Label;
+        /* Register bank offset and offset of the saved copy on stack for
+         * register variables.
+         */
+        struct {
+            int                 RegOffs;
+            int                 SaveOffs;
+        } R;
 
-	/* Value for constants (including enums) */
+       	/* Value for constants (including enums) */
        	long			ConstVal;
 
 	/* Data for structs/unions */
@@ -145,8 +156,48 @@ void FreeSymEntry (SymEntry* E);
 void DumpSymEntry (FILE* F, const SymEntry* E);
 /* Dump the given symbol table entry to the file in readable form */
 
-int IsTypeDef (const SymEntry* E);
+#if defined(HAVE_INLINE)
+INLINE int SymIsTypeDef (const SymEntry* Sym)
 /* Return true if the given entry is a typedef entry */
+{
+    return ((Sym->Flags & SC_TYPEDEF) == SC_TYPEDEF);
+}
+#else
+#  define SymIsTypeDef(Sym)     (((Sym)->Flags & SC_TYPEDEF) == SC_TYPEDEF)
+#endif
+
+#if defined(HAVE_INLINE)
+INLINE int SymIsDef (const SymEntry* Sym)
+/* Return true if the given entry is defined */
+{
+    return ((Sym->Flags & SC_DEF) == SC_DEF);
+}
+#else
+#  define SymIsDef(Sym)     (((Sym)->Flags & SC_DEF) == SC_DEF)
+#endif
+
+#if defined(HAVE_INLINE)
+INLINE int SymIsRef (const SymEntry* Sym)
+/* Return true if the given entry is referenced */
+{
+    return ((Sym->Flags & SC_REF) == SC_REF);
+}
+#else
+#  define SymIsRef(Sym)     (((Sym)->Flags & SC_REF) == SC_REF)
+#endif
+
+#if defined(HAVE_INLINE)
+INLINE int SymIsRegVar (const SymEntry* Sym)
+/* Return true if the given entry is a register variable */
+{
+    return ((Sym->Flags & SC_REGISTER) == SC_REGISTER);
+}
+#else
+#  define SymIsRegVar(Sym)      (((Sym)->Flags & SC_REGISTER) == SC_REGISTER)
+#endif
+
+void CvtRegVarToAuto (SymEntry* Sym);
+/* Convert a register variable to an auto variable */
 
 void ChangeSymType (SymEntry* Entry, type* Type);
 /* Change the type of the given symbol */