/* */
/* */
/* */
-/* (C) 2001 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@musoftware.de */
+/* (C) 2001 Ullrich von Bassewitz */
+/* Wacholderweg 14 */
+/* D-70597 Stuttgart */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* common */
#include "chartype.h"
#include "check.h"
+#include "global.h"
#include "hashstr.h"
#include "strutil.h"
#include "xmalloc.h"
#include "xsprintf.h"
/* cc65 */
-#include "error.h"
-
-/* b6502 */
+#include "asmlabel.h"
#include "codeent.h"
#include "codeinfo.h"
+#include "datatype.h"
+#include "error.h"
+#include "symentry.h"
#include "codeseg.h"
/*****************************************************************************/
-/* Code */
+/* Helper functions */
/*****************************************************************************/
-static CodeLabel* NewCodeSegLabel (CodeSeg* S, const char* Name, unsigned Hash)
+static void CS_MoveLabelsToPool (CodeSeg* S, CodeEntry* E)
+/* Move the labels of the code entry E to the label pool of the code segment */
+{
+ unsigned LabelCount = CE_GetLabelCount (E);
+ while (LabelCount--) {
+ CodeLabel* L = CE_GetLabel (E, LabelCount);
+ L->Owner = 0;
+ CollAppend (&S->Labels, L);
+ }
+ CollDeleteAll (&E->Labels);
+}
+
+
+
+static CodeLabel* CS_FindLabel (CodeSeg* S, const char* Name, unsigned Hash)
+/* Find the label with the given name. Return the label or NULL if not found */
+{
+ /* Get the first hash chain entry */
+ CodeLabel* L = S->LabelHash[Hash];
+
+ /* Search the list */
+ while (L) {
+ if (strcmp (Name, L->Name) == 0) {
+ /* Found */
+ break;
+ }
+ L = L->Next;
+ }
+ return L;
+}
+
+
+
+static CodeLabel* CS_NewCodeLabel (CodeSeg* S, const char* Name, unsigned Hash)
/* Create a new label and insert it into the label hash table */
{
- /* Not found - create a new one */
+ /* Create a new label */
CodeLabel* L = NewCodeLabel (Name, Hash);
/* Enter the label into the hash table */
+static void CS_RemoveLabelFromHash (CodeSeg* S, CodeLabel* L)
+/* Remove the given code label from the hash list */
+{
+ /* Get the first entry in the hash chain */
+ CodeLabel* List = S->LabelHash[L->Hash];
+ CHECK (List != 0);
+
+ /* First, remove the label from the hash chain */
+ if (List == L) {
+ /* First entry in hash chain */
+ S->LabelHash[L->Hash] = L->Next;
+ } else {
+ /* Must search through the chain */
+ while (List->Next != L) {
+ /* If we've reached the end of the chain, something is *really* wrong */
+ CHECK (List->Next != 0);
+ /* Next entry */
+ List = List->Next;
+ }
+ /* The next entry is the one, we have been searching for */
+ List->Next = L->Next;
+ }
+}
+
+
+
+/*****************************************************************************/
+/* Functions for parsing instructions */
+/*****************************************************************************/
+
+
+
static const char* SkipSpace (const char* S)
/* Skip white space and return an updated pointer */
{
static const char* ReadToken (const char* L, const char* Term,
- char* Buf, unsigned BufSize)
+ char* Buf, unsigned BufSize)
/* Read the next token into Buf, return the updated line pointer. The
* token is terminated by one of the characters given in term.
*/
-static CodeEntry* ParseInsn (CodeSeg* S, const char* L)
+static CodeEntry* ParseInsn (CodeSeg* S, LineInfo* LI, const char* L)
/* Parse an instruction nnd generate a code entry from it. If the line contains
* errors, output an error message and return NULL.
* For simplicity, we don't accept the broad range of input a "real" assembler
* white space, for example.
*/
{
- char Mnemo[16];
+ char Mnemo[16];
const OPCDesc* OPC;
- am_t AM = 0; /* Initialize to keep gcc silent */
- char Expr[64];
- char Reg;
- CodeEntry* E;
+ am_t AM = 0; /* Initialize to keep gcc silent */
+ char Arg[64];
+ char Reg;
+ CodeEntry* E;
CodeLabel* Label;
/* Mnemonic */
L = ReadToken (L, " \t", Mnemo, sizeof (Mnemo));
/* Try to find the opcode description for the mnemonic */
- OPC = FindOpcode (Mnemo);
+ OPC = FindOP65 (Mnemo);
/* If we didn't find the opcode, print an error and bail out */
if (OPC == 0) {
L = SkipSpace (L);
/* Get the addressing mode */
- Expr[0] = '\0';
+ Arg[0] = '\0';
switch (*L) {
case '\0':
/* Implicit */
- AM = AM_IMP;
+ AM = AM65_IMP;
break;
case '#':
/* Immidiate */
- StrCopy (Expr, sizeof (Expr), L+1);
- AM = AM_IMM;
+ StrCopy (Arg, sizeof (Arg), L+1);
+ AM = AM65_IMM;
break;
case '(':
/* Indirect */
- L = ReadToken (L+1, ",)", Expr, sizeof (Expr));
+ L = ReadToken (L+1, ",)", Arg, sizeof (Arg));
/* Check for errors */
- if (*L == '\0') {
+ if (*L == '\0') {
Error ("ASM code error: syntax error");
return 0;
}
return 0;
}
L = SkipSpace (L+1);
- if (*L != '\0') {
+ if (*L != '\0') {
Error ("ASM code error: syntax error");
return 0;
}
- AM = AM_ZPX_IND;
+ AM = AM65_ZPX_IND;
} else if (*L == ')') {
/* zp indirect or zp indirect, y */
L = SkipSpace (L+1);
}
L = SkipSpace (L+1);
if (*L != '\0') {
- Error ("ASM code error: syntax error");
+ Error ("ASM code error: syntax error");
return 0;
}
- AM = AM_ZP_INDY;
+ AM = AM65_ZP_INDY;
} else if (*L == '\0') {
- AM = AM_ZP_IND;
+ AM = AM65_ZP_IND;
} else {
Error ("ASM code error: syntax error");
- return 0;
+ return 0;
}
}
break;
case 'A':
/* Accumulator? */
if (L[1] == '\0') {
- AM = AM_ACC;
+ AM = AM65_ACC;
break;
}
/* FALLTHROUGH */
default:
/* Absolute, maybe indexed */
- L = ReadToken (L, ",", Expr, sizeof (Expr));
+ L = ReadToken (L, ",", Arg, sizeof (Arg));
if (*L == '\0') {
- /* Assume absolute */
- AM = AM_ABS;
+ /* Absolute, zeropage or branch */
+ if ((OPC->Info & OF_BRA) != 0) {
+ /* Branch */
+ AM = AM65_BRA;
+ } else if (IsZPName (Arg)) {
+ AM = AM65_ZP;
+ } else {
+ AM = AM65_ABS;
+ }
} else if (*L == ',') {
/* Indexed */
L = SkipSpace (L+1);
Reg = toupper (*L);
L = SkipSpace (L+1);
if (Reg == 'X') {
- AM = AM_ABSX;
+ if (IsZPName (Arg)) {
+ AM = AM65_ZPX;
+ } else {
+ AM = AM65_ABSX;
+ }
} else if (Reg == 'Y') {
- AM = AM_ABSY;
+ AM = AM65_ABSY;
} else {
Error ("ASM code error: syntax error");
- return 0;
+ return 0;
}
if (*L != '\0') {
Error ("ASM code error: syntax error");
}
/* If the instruction is a branch, check for the label and generate it
- * if it does not exist.
+ * if it does not exist. Ignore anything but local labels here.
*/
Label = 0;
- if ((OPC->Info & CI_MASK_BRA) == CI_BRA) {
+ if (AM == AM65_BRA && Arg[0] == 'L') {
- unsigned Hash;
+ /* Generate the hash over the label, then search for the label */
+ unsigned Hash = HashStr (Arg) % CS_LABEL_HASH_SIZE;
+ Label = CS_FindLabel (S, Arg, Hash);
- /* ### Check for local labels here */
- CHECK (AM == AM_ABS);
- AM = AM_BRA;
- Hash = HashStr (Expr) % CS_LABEL_HASH_SIZE;
- Label = FindCodeLabel (S, Expr, Hash);
+ /* If we don't have the label, it's a forward ref - create it */
if (Label == 0) {
/* Generate a new label */
- Label = NewCodeSegLabel (S, Expr, Hash);
+ Label = CS_NewCodeLabel (S, Arg, Hash);
}
}
/* We do now have the addressing mode in AM. Allocate a new CodeEntry
* structure and initialize it.
*/
- E = NewCodeEntry (OPC, AM, Label);
- if (Expr[0] != '\0') {
- /* We have an additional expression */
- E->Arg.Expr = xstrdup (Expr);
- }
+ E = NewCodeEntry (OPC->OPC, AM, Arg, Label, LI);
/* Return the new code entry */
return E;
-CodeSeg* NewCodeSeg (const char* Name)
+/*****************************************************************************/
+/* Code */
+/*****************************************************************************/
+
+
+
+CodeSeg* NewCodeSeg (const char* SegName, SymEntry* Func)
/* Create a new code segment, initialize and return it */
{
unsigned I;
CodeSeg* S = xmalloc (sizeof (CodeSeg));
/* Initialize the fields */
- S->Name = xstrdup (Name);
+ S->SegName = xstrdup (SegName);
+ S->Func = Func;
InitCollection (&S->Entries);
InitCollection (&S->Labels);
for (I = 0; I < sizeof(S->LabelHash) / sizeof(S->LabelHash[0]); ++I) {
S->LabelHash[I] = 0;
}
+ /* If we have a function given, get the return type of the function.
+ * Assume ANY return type besides void will use the A and X registers.
+ */
+ if (S->Func && !IsTypeVoid (GetFuncReturn (Func->Type))) {
+ S->ExitRegs = REG_AX;
+ } else {
+ S->ExitRegs = REG_NONE;
+ }
+
/* Return the new struct */
return S;
}
-void FreeCodeSeg (CodeSeg* S)
-/* Free a code segment including all code entries */
+void CS_AddEntry (CodeSeg* S, struct CodeEntry* E)
+/* Add an entry to the given code segment */
{
- unsigned I, Count;
+ /* Transfer the labels if we have any */
+ unsigned I;
+ unsigned LabelCount = CollCount (&S->Labels);
+ for (I = 0; I < LabelCount; ++I) {
- /* Free the name */
- xfree (S->Name);
+ /* Get the label */
+ CodeLabel* L = CollAt (&S->Labels, I);
- /* Free the entries */
- Count = CollCount (&S->Entries);
- for (I = 0; I < Count; ++I) {
- FreeCodeEntry (CollAt (&S->Entries, I));
+ /* Attach it to the entry */
+ CE_AttachLabel (E, L);
}
- /* Free the collections */
- DoneCollection (&S->Entries);
- DoneCollection (&S->Labels);
+ /* Delete the transfered labels */
+ CollDeleteAll (&S->Labels);
- /* Free all labels */
- for (I = 0; I < sizeof(S->LabelHash) / sizeof(S->LabelHash[0]); ++I) {
- CodeLabel* L = S->LabelHash[I];
- while (L) {
- CodeLabel* Tmp = L;
- L = L->Next;
- FreeCodeLabel (Tmp);
- }
- }
-
- /* Free the struct */
- xfree (S);
+ /* Add the entry to the list of code entries in this segment */
+ CollAppend (&S->Entries, E);
}
-void AddCodeSegLine (CodeSeg* S, const char* Format, ...)
+void CS_AddLine (CodeSeg* S, LineInfo* LI, const char* Format, va_list ap)
/* Add a line to the given code segment */
{
const char* L;
CodeEntry* E;
- char Token[64];
+ char Token[64];
/* Format the line */
- va_list ap;
char Buf [256];
- va_start (ap, Format);
xvsprintf (Buf, sizeof (Buf), Format, ap);
- va_end (ap);
/* Skip whitespace */
L = SkipSpace (Buf);
/* Check which type of instruction we have */
- E = 0; /* Assume no insn created */
+ E = 0; /* Assume no insn created */
switch (*L) {
- case '\0':
+ case '\0':
/* Empty line, just ignore it */
break;
case ';':
/* Comment or hint, ignore it for now */
- break;
+ break;
case '.':
/* Control instruction */
break;
default:
- E = ParseInsn (S, L);
+ E = ParseInsn (S, LI, L);
break;
}
/* If we have a code entry, transfer the labels and insert it */
if (E) {
+ CS_AddEntry (S, E);
+ }
+}
- /* Transfer the labels if we have any */
- unsigned I;
- unsigned LabelCount = CollCount (&S->Labels);
- for (I = 0; I < LabelCount; ++I) {
- /* Get the label */
- CodeLabel* L = CollAt (&S->Labels, I);
- /* Mark it as defined */
- L->Flags |= LF_DEF;
- /* Move it to the code entry */
- CollAppend (&E->Labels, L);
- }
-
- /* Delete the transfered labels */
- CollDeleteAll (&S->Labels);
- /* Add the entry to the list of code entries in this segment */
- CollAppend (&S->Entries, E);
- }
+void CS_InsertEntry (CodeSeg* S, struct CodeEntry* E, unsigned Index)
+/* Insert the code entry at the index given. Following code entries will be
+ * moved to slots with higher indices.
+ */
+{
+ /* Insert the entry into the collection */
+ CollInsert (&S->Entries, E, Index);
}
-CodeLabel* AddCodeLabel (CodeSeg* S, const char* Name)
-/* Add a code label for the next instruction to follow */
+void CS_DelEntry (CodeSeg* S, unsigned Index)
+/* Delete an entry from the code segment. This includes moving any associated
+ * labels, removing references to labels and even removing the referenced labels
+ * if the reference count drops to zero.
+ */
{
- /* Calculate the hash from the name */
- unsigned Hash = HashStr (Name) % CS_LABEL_HASH_SIZE;
+ /* Get the code entry for the given index */
+ CodeEntry* E = CS_GetEntry (S, Index);
+
+ /* If the entry has a labels, we have to move this label to the next insn.
+ * If there is no next insn, move the label into the code segement label
+ * pool. The operation is further complicated by the fact that the next
+ * insn may already have a label. In that case change all reference to
+ * this label and delete the label instead of moving it.
+ */
+ unsigned Count = CE_GetLabelCount (E);
+ if (Count > 0) {
- /* Try to find the code label if it does already exist */
- CodeLabel* L = FindCodeLabel (S, Name, Hash);
+ /* The instruction has labels attached. Check if there is a next
+ * instruction.
+ */
+ if (Index == CS_GetEntryCount (S)-1) {
- /* Did we find it? */
- if (L) {
- /* We found it - be sure it does not already have an owner */
- CHECK (L->Owner == 0);
- } else {
- /* Not found - create a new one */
- L = NewCodeSegLabel (S, Name, Hash);
+ /* No next instruction, move to the codeseg label pool */
+ CS_MoveLabelsToPool (S, E);
+
+ } else {
+
+ /* There is a next insn, get it */
+ CodeEntry* N = CS_GetEntry (S, Index+1);
+
+ /* Move labels to the next entry */
+ CS_MoveLabels (S, E, N);
+
+ }
}
- /* We do now have a valid label. Remember it for later */
- CollAppend (&S->Labels, L);
+ /* If this insn references a label, remove the reference. And, if the
+ * the reference count for this label drops to zero, remove this label.
+ */
+ if (E->JumpTo) {
+ /* Remove the reference */
+ CS_RemoveLabelRef (S, E);
+ }
- /* Return the label */
- return L;
+ /* Delete the pointer to the insn */
+ CollDelete (&S->Entries, Index);
+
+ /* Delete the instruction itself */
+ FreeCodeEntry (E);
}
-void AddExtCodeLabel (CodeSeg* S, const char* Name)
-/* Add an external code label for the next instruction to follow */
+void CS_DelEntries (CodeSeg* S, unsigned Start, unsigned Count)
+/* Delete a range of code entries. This includes removing references to labels,
+ * labels attached to the entries and so on.
+ */
{
- /* Add the code label */
- CodeLabel* L = AddCodeLabel (S, Name);
-
- /* Mark it as external label */
- L->Flags |= LF_EXT;
+ /* Start deleting the entries from the rear, because this involves less
+ * memory moving.
+ */
+ while (Count--) {
+ CS_DelEntry (S, Start + Count);
+ }
}
-void AddLocCodeLabel (CodeSeg* S, const char* Name)
-/* Add a local code label for the next instruction to follow */
+struct CodeEntry* CS_GetNextEntry (CodeSeg* S, unsigned Index)
+/* Get the code entry following the one with the index Index. If there is no
+ * following code entry, return NULL.
+ */
{
- /* Add the code label */
- AddCodeLabel (S, Name);
+ if (Index >= CollCount (&S->Entries)-1) {
+ /* This is the last entry */
+ return 0;
+ } else {
+ /* Code entries left */
+ return CollAtUnchecked (&S->Entries, Index+1);
+ }
}
-void AddCodeSegHint (CodeSeg* S, unsigned Hint)
-/* Add a hint for the preceeding instruction */
+int CS_GetEntries (CodeSeg* S, struct CodeEntry** List,
+ unsigned Start, unsigned Count)
+/* Get Count code entries into List starting at index start. Return true if
+ * we got the lines, return false if not enough lines were available.
+ */
{
- CodeEntry* E;
+ /* Check if enough entries are available */
+ if (Start + Count > CollCount (&S->Entries)) {
+ return 0;
+ }
- /* Get the number of entries in this segment */
- unsigned EntryCount = CollCount (&S->Entries);
+ /* Copy the entries */
+ while (Count--) {
+ *List++ = CollAtUnchecked (&S->Entries, Start++);
+ }
+
+ /* We have the entries */
+ return 1;
+}
- /* Must have at least one entry */
- CHECK (EntryCount > 0);
- /* Get the last entry */
- E = CollAt (&S->Entries, EntryCount-1);
- /* Add the hint */
- E->Hints |= Hint;
+unsigned CS_GetEntryIndex (CodeSeg* S, struct CodeEntry* E)
+/* Return the index of a code entry */
+{
+ int Index = CollIndex (&S->Entries, E);
+ CHECK (Index >= 0);
+ return Index;
}
-void DelCodeSegAfter (CodeSeg* S, unsigned Last)
-/* Delete all entries including the given one */
+CodeLabel* CS_AddLabel (CodeSeg* S, const char* Name)
+/* Add a code label for the next instruction to follow */
{
- /* Get the number of entries in this segment */
- unsigned Count = CollCount (&S->Entries);
+ /* Calculate the hash from the name */
+ unsigned Hash = HashStr (Name) % CS_LABEL_HASH_SIZE;
- /* Remove all entries after the given one */
- while (Last < Count) {
+ /* Try to find the code label if it does already exist */
+ CodeLabel* L = CS_FindLabel (S, Name, Hash);
- /* Get the next entry */
- CodeEntry* E = CollAt (&S->Entries, Count-1);
-
- /* We have to transfer all labels to the code segment label pool */
- unsigned LabelCount = CollCount (&E->Labels);
- while (LabelCount--) {
- CodeLabel* L = CollAt (&E->Labels, LabelCount);
- L->Flags &= ~LF_DEF;
- CollAppend (&S->Labels, L);
- }
- CollDeleteAll (&E->Labels);
+ /* Did we find it? */
+ if (L) {
+ /* We found it - be sure it does not already have an owner */
+ CHECK (L->Owner == 0);
+ } else {
+ /* Not found - create a new one */
+ L = CS_NewCodeLabel (S, Name, Hash);
+ }
- /* Remove the code entry */
- FreeCodeEntry (CollAt (&S->Entries, Count-1));
- CollDelete (&S->Entries, Count-1);
- --Count;
+ /* Safety. This call is quite costly, but safety is better */
+ if (CollIndex (&S->Labels, L) >= 0) {
+ Internal ("AddCodeLabel: Label `%s' already defined", Name);
}
+
+ /* We do now have a valid label. Remember it for later */
+ CollAppend (&S->Labels, L);
+
+ /* Return the label */
+ return L;
}
-void OutputCodeSeg (FILE* F, const CodeSeg* S)
-/* Output the code segment data to a file */
+CodeLabel* CS_GenLabel (CodeSeg* S, struct CodeEntry* E)
+/* If the code entry E does already have a label, return it. Otherwise
+ * create a new label, attach it to E and return it.
+ */
{
- unsigned I;
+ CodeLabel* L;
- /* Get the number of entries in this segment */
- unsigned Count = CollCount (&S->Entries);
+ if (CE_HasLabel (E)) {
- /* Output the segment directive */
- fprintf (F, ".segment\t\"%s\"\n", S->Name);
+ /* Get the label from this entry */
+ L = CE_GetLabel (E, 0);
+
+ } else {
+
+ /* Get a new name */
+ const char* Name = LocalLabelName (GetLocalLabel ());
+
+ /* Generate the hash over the name */
+ unsigned Hash = HashStr (Name) % CS_LABEL_HASH_SIZE;
+
+ /* Create a new label */
+ L = CS_NewCodeLabel (S, Name, Hash);
+
+ /* Attach this label to the code entry */
+ CE_AttachLabel (E, L);
- /* Output all entries */
- for (I = 0; I < Count; ++I) {
- OutputCodeEntry (F, CollConstAt (&S->Entries, I));
}
+
+ /* Return the label */
+ return L;
}
-CodeLabel* FindCodeLabel (CodeSeg* S, const char* Name, unsigned Hash)
-/* Find the label with the given name. Return the label or NULL if not found */
+void CS_DelLabel (CodeSeg* S, CodeLabel* L)
+/* Remove references from this label and delete it. */
{
- /* Get the first hash chain entry */
- CodeLabel* L = S->LabelHash[Hash];
+ unsigned Count, I;
- /* Search the list */
- while (L) {
- if (strcmp (Name, L->Name) == 0) {
- /* Found */
- break;
- }
- L = L->Next;
+ /* First, remove the label from the hash chain */
+ CS_RemoveLabelFromHash (S, L);
+
+ /* Remove references from insns jumping to this label */
+ Count = CollCount (&L->JumpFrom);
+ for (I = 0; I < Count; ++I) {
+ /* Get the insn referencing this label */
+ CodeEntry* E = CollAt (&L->JumpFrom, I);
+ /* Remove the reference */
+ E->JumpTo = 0;
}
- return L;
+ CollDeleteAll (&L->JumpFrom);
+
+ /* Remove the reference to the owning instruction if it has one. The
+ * function may be called for a label without an owner when deleting
+ * unfinished parts of the code. This is unfortunate since it allows
+ * errors to slip through.
+ */
+ if (L->Owner) {
+ CollDeleteItem (&L->Owner->Labels, L);
+ }
+
+ /* All references removed, delete the label itself */
+ FreeCodeLabel (L);
}
-void MergeCodeLabels (CodeSeg* S)
+void CS_MergeLabels (CodeSeg* S)
/* Merge code labels. That means: For each instruction, remove all labels but
- * one and adjust the code entries accordingly.
+ * one and adjust references accordingly.
*/
{
unsigned I;
/* Walk over all code entries */
- unsigned EntryCount = CollCount (&S->Entries);
- for (I = 0; I < EntryCount; ++I) {
+ for (I = 0; I < CS_GetEntryCount (S); ++I) {
CodeLabel* RefLab;
- unsigned J;
+ unsigned J;
/* Get a pointer to the next entry */
- CodeEntry* E = CollAt (&S->Entries, I);
+ CodeEntry* E = CS_GetEntry (S, I);
- /* If this entry has zero labels, continue with the next one */
- unsigned LabelCount = CollCount (&E->Labels);
+ /* If this entry has zero labels, continue with the next one */
+ unsigned LabelCount = CE_GetLabelCount (E);
if (LabelCount == 0) {
continue;
}
- /* We have at least one label. Use the first one as reference label.
- * We don't have a notification for global labels for now, and using
- * the first one will also keep the global function labels, since these
- * are inserted at position 0.
- */
- RefLab = CollAt (&E->Labels, 0);
+ /* We have at least one label. Use the first one as reference label. */
+ RefLab = CE_GetLabel (E, 0);
/* Walk through the remaining labels and change references to these
* labels to a reference to the one and only label. Delete the labels
*/
for (J = LabelCount-1; J >= 1; --J) {
- unsigned K;
-
/* Get the next label */
- CodeLabel* L = CollAt (&E->Labels, J);
-
- /* Walk through all instructions referencing this label */
- unsigned RefCount = CollCount (&L->JumpFrom);
- for (K = 0; K < RefCount; ++K) {
-
- /* Get the next instrcuction that references this label */
- CodeEntry* E = CollAt (&L->JumpFrom, K);
-
- /* Change the reference */
- CHECK (E->JumpTo == L);
- E->JumpTo = RefLab;
- CollAppend (&RefLab->JumpFrom, E);
-
- }
-
- /* If the label is not an external label, we may remove the
- * label completely.
- */
-#if 0
- if ((L->Flags & LF_EXT) == 0) {
- FreeCodeLabel (L);
- CollDelete (&E->Labels, J);
- }
-#endif
+ CodeLabel* L = CE_GetLabel (E, J);
+
+ /* Move all references from this label to the reference label */
+ CL_MoveRefs (L, RefLab);
+
+ /* Remove the label completely. */
+ CS_DelLabel (S, L);
}
- /* The reference label is the only remaining label. If it is not an
- * external label, check if there are any references to this label,
- * and delete it if this is not the case.
+ /* The reference label is the only remaining label. Check if there
+ * are any references to this label, and delete it if this is not
+ * the case.
*/
-#if 0
- if ((RefLab->Flags & LF_EXT) == 0 && CollCount (&RefLab->JumpFrom) == 0) {
+ if (CollCount (&RefLab->JumpFrom) == 0) {
/* Delete the label */
- FreeCodeLabel (RefLab);
- /* Remove it from the list */
- CollDelete (&E->Labels, 0);
+ CS_DelLabel (S, RefLab);
+ }
+ }
+}
+
+
+
+void CS_MoveLabels (CodeSeg* S, struct CodeEntry* Old, struct CodeEntry* New)
+/* Move all labels from Old to New. The routine will move the labels itself
+ * if New does not have any labels, and move references if there is at least
+ * a label for new. If references are moved, the old label is deleted
+ * afterwards.
+ */
+{
+ /* Get the number of labels to move */
+ unsigned OldLabelCount = CE_GetLabelCount (Old);
+
+ /* Does the new entry have itself a label? */
+ if (CE_HasLabel (New)) {
+
+ /* The new entry does already have a label - move references */
+ CodeLabel* NewLabel = CE_GetLabel (New, 0);
+ while (OldLabelCount--) {
+
+ /* Get the next label */
+ CodeLabel* OldLabel = CE_GetLabel (Old, OldLabelCount);
+
+ /* Move references */
+ CL_MoveRefs (OldLabel, NewLabel);
+
+ /* Delete the label */
+ CS_DelLabel (S, OldLabel);
+
}
-#endif
+
+ } else {
+
+ /* The new entry does not have a label, just move them */
+ while (OldLabelCount--) {
+
+ /* Move the label to the new entry */
+ CE_MoveLabel (CE_GetLabel (Old, OldLabelCount), New);
+
+ }
+
+ }
+}
+
+
+
+void CS_RemoveLabelRef (CodeSeg* S, struct CodeEntry* E)
+/* Remove the reference between E and the label it jumps to. The reference
+ * will be removed on both sides and E->JumpTo will be 0 after that. If
+ * the reference was the only one for the label, the label will get
+ * deleted.
+ */
+{
+ /* Get a pointer to the label and make sure it exists */
+ CodeLabel* L = E->JumpTo;
+ CHECK (L != 0);
+
+ /* Delete the entry from the label */
+ CollDeleteItem (&L->JumpFrom, E);
+
+ /* The entry jumps no longer to L */
+ E->JumpTo = 0;
+
+ /* If there are no more references, delete the label */
+ if (CollCount (&L->JumpFrom) == 0) {
+ CS_DelLabel (S, L);
+ }
+}
+
+
+
+void CS_MoveLabelRef (CodeSeg* S, struct CodeEntry* E, CodeLabel* L)
+/* Change the reference of E to L instead of the current one. If this
+ * was the only reference to the old label, the old label will get
+ * deleted.
+ */
+{
+ /* Get the old label */
+ CodeLabel* OldLabel = E->JumpTo;
+
+ /* Be sure that code entry references a label */
+ PRECONDITION (OldLabel != 0);
+
+ /* Remove the reference to our label */
+ CS_RemoveLabelRef (S, E);
+
+ /* Use the new label */
+ CL_AddRef (L, E);
+}
+
+
+
+void CS_DelCodeAfter (CodeSeg* S, unsigned Last)
+/* Delete all entries including the given one */
+{
+ /* Get the number of entries in this segment */
+ unsigned Count = CS_GetEntryCount (S);
+
+ /* First pass: Delete all references to labels. If the reference count
+ * for a label drops to zero, delete it.
+ */
+ unsigned C = Count;
+ while (Last < C--) {
+
+ /* Get the next entry */
+ CodeEntry* E = CS_GetEntry (S, C);
+
+ /* Check if this entry has a label reference */
+ if (E->JumpTo) {
+ /* If the label is a label in the label pool and this is the last
+ * reference to the label, remove the label from the pool.
+ */
+ CodeLabel* L = E->JumpTo;
+ int Index = CollIndex (&S->Labels, L);
+ if (Index >= 0 && CollCount (&L->JumpFrom) == 1) {
+ /* Delete it from the pool */
+ CollDelete (&S->Labels, Index);
+ }
+
+ /* Remove the reference to the label */
+ CS_RemoveLabelRef (S, E);
+ }
+
+ }
+
+ /* Second pass: Delete the instructions. If a label attached to an
+ * instruction still has references, it must be references from outside
+ * the deleted area. Don't delete the label in this case, just make it
+ * ownerless and move it to the label pool.
+ */
+ C = Count;
+ while (Last < C--) {
+
+ /* Get the next entry */
+ CodeEntry* E = CS_GetEntry (S, C);
+
+ /* Check if this entry has a label attached */
+ if (CE_HasLabel (E)) {
+ /* Move the labels to the pool and clear the owner pointer */
+ CS_MoveLabelsToPool (S, E);
+ }
+
+ /* Delete the pointer to the entry */
+ CollDelete (&S->Entries, C);
+
+ /* Delete the entry itself */
+ FreeCodeEntry (E);
}
}
-unsigned GetCodeSegEntries (const CodeSeg* S)
-/* Return the number of entries for the given code segment */
+void CS_Output (const CodeSeg* S, FILE* F)
+/* Output the code segment data to a file */
{
- return CollCount (&S->Entries);
+ unsigned I;
+ const LineInfo* LI;
+
+ /* Get the number of entries in this segment */
+ unsigned Count = CS_GetEntryCount (S);
+
+ /* If the code segment is empty, bail out here */
+ if (Count == 0) {
+ return;
+ }
+
+ /* Output the segment directive */
+ fprintf (F, ".segment\t\"%s\"\n\n", S->SegName);
+
+ /* If this is a segment for a function, enter a function */
+ if (S->Func) {
+ fprintf (F, ".proc\t_%s\n\n", S->Func->Name);
+ }
+
+ /* Output all entries, prepended by the line information if it has changed */
+ LI = 0;
+ for (I = 0; I < Count; ++I) {
+ /* Get the next entry */
+ const CodeEntry* E = CollConstAt (&S->Entries, I);
+ /* Check if the line info has changed. If so, output the source line
+ * if the option is enabled and output debug line info if the debug
+ * option is enabled.
+ */
+ if (E->LI != LI) {
+ /* Line info has changed, remember the new line info */
+ LI = E->LI;
+
+ /* Add the source line as a comment */
+ if (AddSource) {
+ fprintf (F, ";\n; %s\n;\n", LI->Line);
+ }
+
+ /* Add line debug info */
+ if (DebugInfo) {
+ fprintf (F, "\t.dbg\tline, \"%s\", %u\n",
+ GetInputName (LI), GetInputLine (LI));
+ }
+ }
+ /* Output the code */
+ CE_Output (E, F);
+ }
+
+ /* If debug info is enabled, terminate the last line number information */
+ if (DebugInfo) {
+ fprintf (F, "\t.dbg\tline\n");
+ }
+
+ /* If this is a segment for a function, leave the function */
+ if (S->Func) {
+ fprintf (F, "\n.endproc\n\n");
+ }
}