X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fsymentry.h;h=d83113809533ef587ec041db5355badda1f045fa;hb=9b7c16ec4cbb5282642c377272224e3fc825f860;hp=bbef8c227f6e67e4473c98d2bc03d517aa812fbf;hpb=de3a20a8985f10008ec829cc13346a7d0fe232df;p=cc65

diff --git a/src/cc65/symentry.h b/src/cc65/symentry.h
index bbef8c227..d83113809 100644
--- a/src/cc65/symentry.h
+++ b/src/cc65/symentry.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2006 Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2000-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -41,10 +41,12 @@
 #include <stdio.h>
 
 /* common */
+#include "coll.h"
 #include "inline.h"
 
 /* cc65 */
 #include "datatype.h"
+#include "declattr.h"
 
 
 
@@ -65,29 +67,33 @@ struct Segments;
 
 
 /* Storage classes and flags */
-#define SC_AUTO      	0x0001U
-#define SC_REGISTER    	0x0002U	/* Register variable, is in static storage */
-#define SC_STATIC    	0x0004U
-#define SC_EXTERN    	0x0008U
+#define SC_AUTO      	0x0001U         /* Auto variable */
+#define SC_REGISTER    	0x0002U	        /* Register variable */
+#define SC_STATIC    	0x0004U         /* Static */
+#define SC_EXTERN    	0x0008U         /* Extern linkage */
 
-#define SC_ENUM	     	0x0030U	/* An enum (numeric constant) */
-#define SC_CONST     	0x0020U	/* A numeric constant with a type */
-#define SC_LABEL       	0x0040U	/* A goto label */
-#define SC_PARAM       	0x0080U	/* This is a function parameter */
-#define SC_FUNC	     	0x0100U	/* Function entry */
+#define SC_ENUM	     	0x0030U	        /* An enum */
+#define SC_CONST     	0x0020U	        /* A numeric constant with a type */
+#define SC_LABEL       	0x0040U	        /* A goto label */
+#define SC_PARAM       	0x0080U	        /* A function parameter */
+#define SC_FUNC	     	0x0100U	        /* A function */
 
-#define SC_STORAGE     	0x0400U	/* Symbol with associated storage */
-#define SC_DEFAULT     	0x0800U	/* Flag: default storage class was used */
+#define SC_DEFTYPE      0x0200U         /* Parameter has default type (=int, old style) */
+#define SC_STORAGE     	0x0400U	        /* Symbol with associated storage */
+#define SC_DEFAULT     	0x0800U	        /* Flag: default storage class was used */
 
-#define SC_DEF       	0x1000U	/* Symbol is defined */
-#define SC_REF 	     	0x2000U /* Symbol is referenced */
+#define SC_DEF       	0x1000U	        /* Symbol is defined */
+#define SC_REF 	     	0x2000U         /* Symbol is referenced */
 
-#define SC_TYPE	       	0x4000U	/* This is a type, struct, typedef, etc. */
-#define SC_STRUCT      	0x4001U	/* Struct or union */
-#define SC_STRUCTFIELD  0x4002U	/* Struct or union field */
-#define SC_TYPEDEF     	0x4003U	/* A typedef */
+#define SC_TYPE	       	0x4000U	        /* This is a type, struct, typedef, etc. */
+#define SC_STRUCT      	0x4001U	        /* Struct or union */
+#define SC_STRUCTFIELD  0x4002U	        /* Struct or union field */
+#define SC_BITFIELD     0x4004U         /* A bit-field inside a struct or union */
+#define SC_TYPEDEF     	0x4008U	        /* A typedef */
 
-#define SC_ZEROPAGE  	0x8000U	/* Symbol marked as zeropage */
+#define SC_ZEROPAGE  	0x8000U	        /* Symbol marked as zeropage */
+
+#define SC_HAVEATTR     0x10000U        /* Symbol has attributes */
 
 
 
@@ -101,6 +107,7 @@ struct SymEntry {
     struct SymTable*		Owner; 	  /* Symbol table the symbol is in */
     unsigned   			Flags; 	  /* Symbol flags */
     Type*      			Type;  	  /* Symbol type */
+    Collection*                 Attr;     /* Attribute list if any */
     char*                       AsmName;  /* Assembler name if any */
 
     /* Data that differs for the different symbol types */
@@ -129,6 +136,13 @@ struct SymEntry {
 	    unsigned		Size;  	  /* Size of the union/struct */
 	} S;
 
+        /* Data for bit fields */
+        struct {
+            unsigned            Offs;     /* Byte offset into struct */
+            unsigned            BitOffs;  /* Bit offset into storage unit */
+            unsigned            BitWidth; /* Width in bits */
+        } B;
+
 	/* Data for functions */
 	struct {
 	    struct FuncDesc*	Func;	  /* Function descriptor */
@@ -156,6 +170,16 @@ void FreeSymEntry (SymEntry* E);
 void DumpSymEntry (FILE* F, const SymEntry* E);
 /* Dump the given symbol table entry to the file in readable form */
 
+#if defined(HAVE_INLINE)
+INLINE int SymIsBitField (const SymEntry* Sym)
+/* Return true if the given entry is a bit-field entry */
+{
+    return ((Sym->Flags & SC_BITFIELD) == SC_BITFIELD);
+}
+#else
+#  define SymIsBitField(Sym)    (((Sym)->Flags & SC_BITFIELD) == SC_BITFIELD)
+#endif
+
 #if defined(HAVE_INLINE)
 INLINE int SymIsTypeDef (const SymEntry* Sym)
 /* Return true if the given entry is a typedef entry */
@@ -207,6 +231,22 @@ INLINE const char* SymGetAsmName (const SymEntry* Sym)
 #  define SymGetAsmName(Sym)      ((Sym)->AsmName)
 #endif
 
+const DeclAttr* SymGetAttr (const SymEntry* Sym, DeclAttrType AttrType);
+/* Return an attribute for this symbol or NULL if the attribute does not exist */
+
+#if defined(HAVE_INLINE)
+INLINE int SymHasAttr (const SymEntry* Sym, DeclAttrType A)
+/* Return true if the symbol has the given attribute */
+{
+    return (SymGetAttr (Sym, A) != 0);    
+}
+#else
+#  define SymHasAttr(Sym, A)       (SymGetAttr (Sym, A) != 0)
+#endif
+
+void SymUseAttr (SymEntry* Sym, struct Declaration* D);
+/* Use the attributes from the declaration for this symbol */
+
 void CvtRegVarToAuto (SymEntry* Sym);
 /* Convert a register variable to an auto variable */