X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fcodelab.c;h=9e3b93765f64ebf69b57dd13a45433e4d7b1ec6d;hb=c6ee5a841878ccdbf9ab85d3dafdd088648b93ba;hp=e02fd794638afddf257cbd4d4e2b9ef4dfa949e5;hpb=1fbf554c6370e8d4c50393e3b78cdae9c32129f9;p=cc65

diff --git a/src/cc65/codelab.c b/src/cc65/codelab.c
index e02fd7946..9e3b93765 100644
--- a/src/cc65/codelab.c
+++ b/src/cc65/codelab.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				    label.c				     */
+/*				   codelab.c				     */
 /*                                                                           */
 /*			     Code label structure			     */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (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       */
@@ -34,11 +34,13 @@
 
 
 /* common */
+#include "check.h"
 #include "xmalloc.h"
 
-/* b6502 */
-#include "codeent.h"	 
-#include "label.h"
+/* cc65 */
+#include "codeent.h"
+#include "codelab.h"
+#include "output.h"
 
 
 
@@ -58,7 +60,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);
 
@@ -83,35 +84,55 @@ 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 */
     E->JumpTo = L;
 
+    /* Replace the code entry argument with the name of the new label */
+    CE_SetArg (E, L->Name);
+
     /* Remember that in the label */
     CollAppend (&L->JumpFrom, E);
 }
 
 
 
-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.
+ */
 {
-    /* Delete the item */
-    CollDeleteItem (&L->JumpFrom, E);
+    /* Walk through all instructions referencing the old label */
+    unsigned Count = CL_GetRefCount (OldLabel);
+    while (Count--) {
+
+	/* Get the instruction that references the old label */
+	CodeEntry* E = CL_GetRef (OldLabel, Count);
+
+	/* Change the reference to the new label */
+	CHECK (E->JumpTo == OldLabel);
+	CL_AddRef (NewLabel, E);
 
-    /* Return the number of remaining references */
-    return CollCount (&L->JumpFrom);
+    }
+
+    /* There are no more references to the old label */
+    CollDeleteAll (&OldLabel->JumpFrom);
 }
 
 
 
-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 */
 {
-    fprintf (F, "%s:", L->Name);
+    WriteOutput ("%s:", L->Name);
+    if (strlen (L->Name) > 6) {
+	/* Label is too long, add a linefeed */
+     	WriteOutput ("\n");
+    }
 }
 
 
 
+