Fixed a bug in signed int compares

[cc65] / src / cc65 / codelab.c

diff --git a/src/cc65/codelab.c b/src/cc65/codelab.c
index 97ed7e3b8d8addcf6e0dca2aa5dcb577cac8ceeb..f4c14ea752ed038bbfaab45b67f6ab8f91803ae6 100644 (file)
--- a/src/cc65/codelab.c
+++ b/src/cc65/codelab.c
@@ -59,7 +59,6 @@ CodeLabel* NewCodeLabel (const char* Name, unsigned Hash)
     L->Next  = 0;
     L->Name  = xstrdup (Name);
     L->Hash  = Hash;
-    L->Flags = 0;
     L->Owner = 0;
     InitCollection (&L->JumpFrom);
 
@@ -84,7 +83,7 @@ void FreeCodeLabel (CodeLabel* L)
 
 
 
-void AddLabelRef (CodeLabel* L, struct CodeEntry* E)
+void CL_AddRef (CodeLabel* L, struct CodeEntry* E)
 /* Let the CodeEntry E reference the label L */
 {
     /* The insn at E jumps to this label */
@@ -96,33 +95,21 @@ void AddLabelRef (CodeLabel* L, struct CodeEntry* E)
 
 
 
-unsigned RemoveLabelRef (CodeLabel* L, const struct CodeEntry* E)
-/* Remove a reference to this label, return the number of remaining references */
-{
-    /* Delete the item */
-    CollDeleteItem (&L->JumpFrom, E);
-
-    /* Return the number of remaining references */
-    return CollCount (&L->JumpFrom);
-}
-
-
-
-void MoveLabelRefs (CodeLabel* OldLabel, CodeLabel* NewLabel)
+void CL_MoveRefs (CodeLabel* OldLabel, CodeLabel* NewLabel)
 /* Move all references to OldLabel to point to NewLabel. OldLabel will have no
  * more references on return.
  */
 {
     /* Walk through all instructions referencing the old label */
-    unsigned Count = CollCount (&OldLabel->JumpFrom);
+    unsigned Count = CL_GetRefCount (OldLabel);
     while (Count--) {
 
        /* Get the instruction that references the old label */
-       CodeEntry* E = CollAt (&OldLabel->JumpFrom, Count);
+       CodeEntry* E = CL_GetRef (OldLabel, Count);
 
        /* Change the reference to the new label */
        CHECK (E->JumpTo == OldLabel);
-       AddLabelRef (NewLabel, E);
+       CL_AddRef (NewLabel, E);
 
     }
 
@@ -132,11 +119,16 @@ void MoveLabelRefs (CodeLabel* OldLabel, CodeLabel* NewLabel)
 
 
 
-void OutputCodeLabel (const CodeLabel* L, FILE* F)
+void CL_Output (const CodeLabel* L, FILE* F)
 /* Output the code label to a file */
 {
     fprintf (F, "%s:", L->Name);
+    if (strlen (L->Name) > 6) {
+       /* Label is too long, add a linefeed */
+       fputc ('\n', F);
+    }
 }
 
 
 
+