When using GetQualifier, pass correct params :-)

[cc65] / src / cc65 / codelab.h

diff --git a/src/cc65/codelab.h b/src/cc65/codelab.h
index 203d16bd899299f5fdf76806cfaafa0598ab7d90..649c0a2b7aa8703817d03bab719edbdd0cf2cfd4 100644 (file)
--- a/src/cc65/codelab.h
+++ b/src/cc65/codelab.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2001     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (C) 2001-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -38,8 +38,6 @@
 
 
 
-#include <stdio.h>
-
 /* common */
 #include "coll.h"
 
@@ -61,16 +59,12 @@ struct CodeEntry;
 
 
 
-/* Label flags, bitmapped */
-#define LF_DEF         0x0001U         /* Label was defined */
-
 /* Label structure */
 typedef struct CodeLabel CodeLabel;
 struct CodeLabel {
     CodeLabel*         Next;           /* Next in hash list */
     char*              Name;           /* Label name */
-    unsigned short     Hash;           /* Hash over the name */
-    unsigned short     Flags;          /* Flag flags */
+    unsigned            Hash;          /* Hash over the name */
     struct CodeEntry*  Owner;          /* Owner entry */
     Collection         JumpFrom;       /* Entries that jump here */
 };
@@ -89,14 +83,36 @@ CodeLabel* NewCodeLabel (const char* Name, unsigned Hash);
 void FreeCodeLabel (CodeLabel* L);
 /* Free the given code label */
 
-void AddLabelRef (CodeLabel* L, struct CodeEntry* E);
+#if defined(HAVE_INLINE)
+INLINE unsigned CL_GetRefCount (const CodeLabel* L)
+/* Get the number of references for this label */
+{
+    return CollCount (&L->JumpFrom);
+}
+#else
+#  define CL_GetRefCount(L)            CollCount (&(L)->JumpFrom)
+#endif
+
+#if defined(HAVE_INLINE)
+INLINE struct CodeEntry* CL_GetRef (CodeLabel* L, unsigned Index)
+/* Get a code entry referencing this label */
+{
+    return CollAt (&L->JumpFrom, Index);
+}
+#else
+#  define CL_GetRef(L, Index)          CollAt (&(L)->JumpFrom, (Index))
+#endif
+
+void CL_AddRef (CodeLabel* L, struct CodeEntry* E);
 /* Let the CodeEntry E reference the label L */
 
-unsigned RemoveLabelRef (CodeLabel* L, const struct CodeEntry* E);
-/* Remove a reference to this label, return the number of remaining references */
+void CL_MoveRefs (CodeLabel* OldLabel, CodeLabel* NewLabel);
+/* Move all references to OldLabel to point to NewLabel. OldLabel will have no
+ * more references on return.
+ */
 
-void OutputCodeLabel (FILE* F, const CodeLabel* L);
-/* Output the code label to a file */
+void CL_Output (const CodeLabel* L);
+/* Output the code label to the output file */