X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fcodeseg.c;h=325eee20f67558d14d682df3d9a156fce59d73ab;hb=0529c2044a7006eb9092d419a59916acc8522c23;hp=5c54b223154b1502c9a5356c1210630c08b44484;hpb=e6a5e57b472f091fb48dfd749c4012f9d65c1da0;p=cc65 diff --git a/src/cc65/codeseg.c b/src/cc65/codeseg.c index 5c54b2231..325eee20f 100644 --- a/src/cc65/codeseg.c +++ b/src/cc65/codeseg.c @@ -39,15 +39,19 @@ /* common */ #include "chartype.h" #include "check.h" +#include "global.h" #include "hashstr.h" #include "strutil.h" #include "xmalloc.h" #include "xsprintf.h" /* cc65 */ +#include "asmlabel.h" #include "codeent.h" #include "codeinfo.h" +#include "datatype.h" #include "error.h" +#include "symentry.h" #include "codeseg.h" @@ -58,13 +62,35 @@ -static void MoveLabelsToPool (CodeSeg* S, CodeEntry* E) +static void CS_MoveLabelsToEntry (CodeSeg* S, CodeEntry* E) +/* Move all labels from the label pool to the given entry and remove them + * from the pool. + */ +{ + /* 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); + + /* Attach it to the entry */ + CE_AttachLabel (E, L); + } + + /* Delete the transfered labels */ + CollDeleteAll (&S->Labels); +} + + + +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 = CollCount (&E->Labels); + unsigned LabelCount = CE_GetLabelCount (E); while (LabelCount--) { - CodeLabel* L = GetCodeLabel (E, LabelCount); - L->Flags &= ~LF_DEF; + CodeLabel* L = CE_GetLabel (E, LabelCount); L->Owner = 0; CollAppend (&S->Labels, L); } @@ -73,7 +99,7 @@ static void MoveLabelsToPool (CodeSeg* S, CodeEntry* E) -static CodeLabel* FindCodeLabel (CodeSeg* S, const char* Name, unsigned Hash) +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 */ @@ -92,16 +118,10 @@ static CodeLabel* FindCodeLabel (CodeSeg* S, const char* Name, unsigned Hash) -/*****************************************************************************/ -/* Functions for parsing instructions */ -/*****************************************************************************/ - - - -static CodeLabel* NewCodeSegLabel (CodeSeg* S, const char* Name, unsigned Hash) +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 */ @@ -114,6 +134,38 @@ static CodeLabel* NewCodeSegLabel (CodeSeg* S, const char* Name, unsigned Hash) +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 */ { @@ -126,7 +178,7 @@ static const char* SkipSpace (const char* S) 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. */ @@ -155,7 +207,7 @@ static const char* ReadToken (const char* L, const char* 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 @@ -165,17 +217,17 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) { char Mnemo[16]; const OPCDesc* OPC; - am_t AM = 0; /* Initialize to keep gcc silent */ - char Arg[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) { @@ -192,13 +244,13 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) case '\0': /* Implicit */ - AM = AM_IMP; + AM = AM65_IMP; break; case '#': /* Immidiate */ StrCopy (Arg, sizeof (Arg), L+1); - AM = AM_IMM; + AM = AM65_IMM; break; case '(': @@ -206,7 +258,7 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) L = ReadToken (L+1, ",)", Arg, sizeof (Arg)); /* Check for errors */ - if (*L == '\0') { + if (*L == '\0') { Error ("ASM code error: syntax error"); return 0; } @@ -225,11 +277,11 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) 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); @@ -244,12 +296,12 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) 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; @@ -258,7 +310,7 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) case 'A': /* Accumulator? */ if (L[1] == '\0') { - AM = AM_ACC; + AM = AM65_ACC; break; } /* FALLTHROUGH */ @@ -267,8 +319,15 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) /* Absolute, maybe indexed */ 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); @@ -279,9 +338,13 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) 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; @@ -300,31 +363,23 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) * if it does not exist. Ignore anything but local labels here. */ Label = 0; - if ((OPC->Info & OF_BRA) != 0 && Arg[0] == 'L') { - - unsigned Hash; - - /* Addressing mode must be alsobute or something is really wrong */ - CHECK (AM == AM_ABS); - - /* Addressing mode is a branch/jump */ - AM = AM_BRA; + if (AM == AM65_BRA && Arg[0] == 'L') { /* Generate the hash over the label, then search for the label */ - Hash = HashStr (Arg) % CS_LABEL_HASH_SIZE; - Label = FindCodeLabel (S, Arg, Hash); + unsigned Hash = HashStr (Arg) % CS_LABEL_HASH_SIZE; + Label = CS_FindLabel (S, Arg, 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, Arg, 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, Arg, Label); + E = NewCodeEntry (OPC->OPC, AM, Arg, Label, LI); /* Return the new code entry */ return E; @@ -333,7 +388,7 @@ static CodeEntry* ParseInsn (CodeSeg* S, const char* L) /*****************************************************************************/ -/* Code */ +/* Code */ /*****************************************************************************/ @@ -355,18 +410,39 @@ CodeSeg* NewCodeSeg (const char* SegName, SymEntry* Func) 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 AddCodeEntry (CodeSeg* S, const char* Format, va_list ap) +void CS_AddEntry (CodeSeg* S, struct CodeEntry* E) +/* Add an entry to the given code segment */ +{ + /* Transfer the labels if we have any */ + CS_MoveLabelsToEntry (S, E); + + /* Add the entry to the list of code entries in this segment */ + CollAppend (&S->Entries, E); +} + + + +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 */ char Buf [256]; @@ -376,7 +452,7 @@ void AddCodeEntry (CodeSeg* S, const char* Format, va_list ap) 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': @@ -385,7 +461,7 @@ void AddCodeEntry (CodeSeg* S, const char* Format, va_list ap) case ';': /* Comment or hint, ignore it for now */ - break; + break; case '.': /* Control instruction */ @@ -394,46 +470,37 @@ void AddCodeEntry (CodeSeg* S, const char* Format, va_list ap) 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); - /* Tell the label about it's owner */ - L->Owner = E; - } - - /* 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); } -void DelCodeEntry (CodeSeg* S, unsigned Index) +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. */ { /* Get the code entry for the given index */ - CodeEntry* E = GetCodeEntry (S, 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 @@ -441,94 +508,156 @@ void DelCodeEntry (CodeSeg* S, unsigned Index) * 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 = CollCount (&E->Labels); + unsigned Count = CE_GetLabelCount (E); if (Count > 0) { - /* The instruction has labels attached. Check if there is a next - * instruction. - */ - if (Index == GetCodeSegEntries (S)-1) { + /* The instruction has labels attached. Check if there is a next + * instruction. + */ + if (Index == CS_GetEntryCount (S)-1) { + + /* 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); + + } + } + + /* 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); + } - /* No next instruction, move to the codeseg label pool */ - MoveLabelsToPool (S, E); + /* Delete the pointer to the insn */ + CollDelete (&S->Entries, Index); - } else { + /* Delete the instruction itself */ + FreeCodeEntry (E); +} - /* There is a next insn, get it */ - CodeEntry* N = GetCodeEntry (S, Index+1); - /* Does this next insn have itself a label? */ - if (CodeEntryHasLabel (N)) { - /* The next insn does already have a label - move references */ - CodeLabel* NewLabel = GetCodeLabel (N, 0); - while (Count--) { +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. + */ +{ + /* Start deleting the entries from the rear, because this involves less + * memory moving. + */ + while (Count--) { + CS_DelEntry (S, Start + Count); + } +} - /* Get the next label */ - CodeLabel* L = GetCodeLabel (E, Count); - /* Move references */ - MoveLabelRefs (L, NewLabel); - /* Delete the label */ - DelCodeLabel (S, L); +void CS_MoveEntries (CodeSeg* S, unsigned Start, unsigned Count, unsigned NewPos) +/* Move a range of entries from one position to another. Start is the index + * of the first entry to move, Count is the number of entries and NewPos is + * the index of the target entry. The entry with the index Start will later + * have the index NewPos. All entries with indices NewPos and above are + * moved to higher indices. If the code block is moved to the end of the + * current code, and if pending labels exist, these labels will get attached + * to the first instruction of the moved block (the first one after the + * current code end) + */ +{ + /* If NewPos is at the end of the code segment, move any labels from the + * label pool to the first instruction of the moved range. + */ + if (NewPos == CS_GetEntryCount (S)) { + CS_MoveLabelsToEntry (S, CS_GetEntry (S, Start)); + } + + /* Move the code block to the destination */ + CollMoveMultiple (&S->Entries, Start, Count, NewPos); +} - } - } else { - /* The next insn does not have a label, just move them */ - while (Count--) { +struct CodeEntry* CS_GetPrevEntry (CodeSeg* S, unsigned Index) +/* Get the code entry preceeding the one with the index Index. If there is no + * preceeding code entry, return NULL. + */ +{ + if (Index == 0) { + /* This is the first entry */ + return 0; + } else { + /* Previous entry available */ + return CollAtUnchecked (&S->Entries, Index-1); + } +} - /* Move the label to the new entry */ - MoveCodeLabel (GetCodeLabel (E, Count), N); - } - } - } +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. + */ +{ + if (Index >= CollCount (&S->Entries)-1) { + /* This is the last entry */ + return 0; + } else { + /* Code entries left */ + return CollAtUnchecked (&S->Entries, Index+1); } +} - /* 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 */ - if (RemoveLabelRef (E->JumpTo, E) == 0) { - /* No references remaining, remove the label */ - DelCodeLabel (S, E->JumpTo); - } - /* Reset the label pointer to avoid problems later */ - E->JumpTo = 0; +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. + */ +{ + /* Check if enough entries are available */ + if (Start + Count > CollCount (&S->Entries)) { + return 0; } - /* Delete the pointer to the insn */ - CollDelete (&S->Entries, Index); + /* Copy the entries */ + while (Count--) { + *List++ = CollAtUnchecked (&S->Entries, Start++); + } - /* Delete the instruction itself */ - FreeCodeEntry (E); + /* We have the entries */ + return 1; } -struct CodeEntry* GetCodeEntry (CodeSeg* S, unsigned Index) -/* Get an entry from the given code segment */ +unsigned CS_GetEntryIndex (CodeSeg* S, struct CodeEntry* E) +/* Return the index of a code entry */ { - return CollAt (&S->Entries, Index); + int Index = CollIndex (&S->Entries, E); + CHECK (Index >= 0); + return Index; } -void AddCodeLabel (CodeSeg* S, const char* Name) +CodeLabel* CS_AddLabel (CodeSeg* S, const char* Name) /* Add a code label for the next instruction to follow */ { /* Calculate the hash from the name */ unsigned Hash = HashStr (Name) % CS_LABEL_HASH_SIZE; /* Try to find the code label if it does already exist */ - CodeLabel* L = FindCodeLabel (S, Name, Hash); + CodeLabel* L = CS_FindLabel (S, Name, Hash); /* Did we find it? */ if (L) { @@ -536,39 +665,65 @@ void AddCodeLabel (CodeSeg* S, const char* Name) CHECK (L->Owner == 0); } else { /* Not found - create a new one */ - L = NewCodeSegLabel (S, Name, Hash); + L = CS_NewCodeLabel (S, Name, Hash); + } + + /* 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 DelCodeLabel (CodeSeg* S, CodeLabel* L) -/* Remove references from this label and delete it. */ +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 Count, I; + CodeLabel* L; - /* Get the first entry in the hash chain */ - CodeLabel* List = S->LabelHash[L->Hash]; + if (CE_HasLabel (E)) { + + /* Get the label from this entry */ + L = CE_GetLabel (E, 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; + + /* 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); + } + /* Return the label */ + return L; +} + + + +void CS_DelLabel (CodeSeg* S, CodeLabel* L) +/* Remove references from this label and delete it. */ +{ + unsigned Count, I; + + /* 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) { @@ -579,8 +734,14 @@ void DelCodeLabel (CodeSeg* S, CodeLabel* L) } CollDeleteAll (&L->JumpFrom); - /* Remove the reference to the owning instruction */ - CollDeleteItem (&L->Owner->Labels, L); + /* 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); @@ -588,57 +749,218 @@ void DelCodeLabel (CodeSeg* S, CodeLabel* L) -void AddCodeSegHint (CodeSeg* S, unsigned Hint) -/* Add a hint for the preceeding instruction */ +void CS_MergeLabels (CodeSeg* S) +/* Merge code labels. That means: For each instruction, remove all labels but + * one and adjust references accordingly. + */ { - CodeEntry* E; + unsigned I; - /* Get the number of entries in this segment */ - unsigned EntryCount = CollCount (&S->Entries); + /* Walk over all code entries */ + for (I = 0; I < CS_GetEntryCount (S); ++I) { + + CodeLabel* RefLab; + unsigned J; - /* Must have at least one entry */ - CHECK (EntryCount > 0); + /* Get a pointer to the next entry */ + CodeEntry* E = CS_GetEntry (S, I); - /* Get the last entry */ - E = GetCodeEntry (S, EntryCount-1); + /* If this entry has zero labels, continue with the next one */ + unsigned LabelCount = CE_GetLabelCount (E); + if (LabelCount == 0) { + continue; + } - /* Add the hint */ - E->Hints |= Hint; + /* 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 + * that are no longer used. To increase performance, walk backwards + * through the list. + */ + for (J = LabelCount-1; J >= 1; --J) { + + /* Get the next label */ + 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. Check if there + * are any references to this label, and delete it if this is not + * the case. + */ + if (CollCount (&RefLab->JumpFrom) == 0) { + /* Delete the label */ + 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); + + } + + } 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 DelCodeSegAfter (CodeSeg* S, unsigned Last) +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 = CollCount (&S->Entries); + 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); + } - /* Remove all entries after the given one */ - while (Last < Count) { + } - /* Get the next entry */ - CodeEntry* E = GetCodeEntry (S, Count-1); + /* 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); - /* We have to transfer all labels to the code segment label pool */ - MoveLabelsToPool (S, E); + /* 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); - /* Remove the code entry */ - FreeCodeEntry (E); - CollDelete (&S->Entries, Count-1); - --Count; + /* Delete the entry itself */ + FreeCodeEntry (E); } } -void OutputCodeSeg (const CodeSeg* S, FILE* F) +void CS_Output (const CodeSeg* S, FILE* F) /* Output the code segment data to a file */ { unsigned I; + const LineInfo* LI; /* Get the number of entries in this segment */ - unsigned Count = CollCount (&S->Entries); + unsigned Count = CS_GetEntryCount (S); /* If the code segment is empty, bail out here */ if (Count == 0) { @@ -653,9 +975,37 @@ void OutputCodeSeg (const CodeSeg* S, FILE* F) fprintf (F, ".proc\t_%s\n\n", S->Func->Name); } - /* Output all entries */ + /* Output all entries, prepended by the line information if it has changed */ + LI = 0; for (I = 0; I < Count; ++I) { - OutputCodeEntry (CollConstAt (&S->Entries, I), F); + /* 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 */ @@ -666,68 +1016,230 @@ void OutputCodeSeg (const CodeSeg* S, FILE* F) -void MergeCodeLabels (CodeSeg* S) -/* Merge code labels. That means: For each instruction, remove all labels but - * one and adjust the code entries accordingly. - */ +void CS_FreeRegInfo (CodeSeg* S) +/* Free register infos for all instructions */ { unsigned I; + for (I = 0; I < CS_GetEntryCount (S); ++I) { + CE_FreeRegInfo (CS_GetEntry(S, I)); + } +} - /* Walk over all code entries */ - unsigned EntryCount = CollCount (&S->Entries); - for (I = 0; I < EntryCount; ++I) { - CodeLabel* RefLab; - unsigned J; - /* Get a pointer to the next entry */ - CodeEntry* E = GetCodeEntry (S, I); +void CS_GenRegInfo (CodeSeg* S) +/* Generate register infos for all instructions */ +{ + unsigned I; + RegContents Regs; + RegContents* CurrentRegs; + int WasJump; - /* If this entry has zero labels, continue with the next one */ - unsigned LabelCount = CollCount (&E->Labels); - if (LabelCount == 0) { - continue; - } + /* Be sure to delete all register infos */ + CS_FreeRegInfo (S); - /* We have at least one label. Use the first one as reference label. */ - RefLab = GetCodeLabel (E, 0); + /* On entry, the register contents are unknown */ + RC_Invalidate (&Regs); + CurrentRegs = &Regs; - /* Walk through the remaining labels and change references to these - * labels to a reference to the one and only label. Delete the labels - * that are no longer used. To increase performance, walk backwards - * through the list. - */ - for (J = LabelCount-1; J >= 1; --J) { + /* First pass. Walk over all insns an note just the changes from one + * insn to the next one. + */ + WasJump = 0; + for (I = 0; I < CS_GetEntryCount (S); ++I) { + + CodeEntry* P; + + /* Get the next instruction */ + CodeEntry* E = CollAtUnchecked (&S->Entries, I); + + /* If the instruction has a label, we need some special handling */ + unsigned LabelCount = CE_GetLabelCount (E); + if (LabelCount > 0) { + + /* Loop over all entry points that jump here. If these entry + * points already have register info, check if all values are + * known and identical. If all values are identical, and the + * preceeding instruction was not an unconditional branch, check + * if the register value on exit of the preceeding instruction + * is also identical. If all these values are identical, the + * value of a register is known, otherwise it is unknown. + */ + CodeLabel* Label = CE_GetLabel (E, 0); + unsigned Entry; + if (WasJump) { + /* Preceeding insn was an unconditional branch */ + CodeEntry* J = CL_GetRef(Label, 0); + if (J->RI) { + Regs = J->RI->Out2; + } else { + RC_Invalidate (&Regs); + } + Entry = 1; + } else { + Regs = *CurrentRegs; + Entry = 0; + } - /* Get the next label */ - CodeLabel* L = GetCodeLabel (E, J); + while (Entry < CL_GetRefCount (Label)) { + /* Get this entry */ + CodeEntry* J = CL_GetRef (Label, Entry); + if (J->RI == 0) { + /* No register info for this entry, bail out */ + RC_Invalidate (&Regs); + break; + } + if (J->RI->Out2.RegA != Regs.RegA) { + Regs.RegA = -1; + } + if (J->RI->Out2.RegX != Regs.RegX) { + Regs.RegX = -1; + } + if (J->RI->Out2.RegY != Regs.RegY) { + Regs.RegY = -1; + } + ++Entry; + } - /* Move all references from this label to the reference label */ - MoveLabelRefs (L, RefLab); + /* Use this register info */ + CurrentRegs = &Regs; - /* Remove the label completely. */ - DelCodeLabel (S, L); } - /* 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 (CollCount (&RefLab->JumpFrom) == 0) { - /* Delete the label */ - DelCodeLabel (S, RefLab); - } - } -} + /* Generate register info for this instruction */ + CE_GenRegInfo (E, CurrentRegs); + /* Remember for the next insn if this insn was an uncondition branch */ + WasJump = (E->Info & OF_UBRA) != 0; + /* Output registers for this insn are input for the next */ + CurrentRegs = &E->RI->Out; -unsigned GetCodeSegEntries (const CodeSeg* S) -/* Return the number of entries for the given code segment */ -{ - return CollCount (&S->Entries); -} + /* If this insn is a branch on zero flag, we may have more info on + * register contents for one of both flow directions, but only if + * there is a previous instruction. + */ + if ((E->Info & OF_ZBRA) != 0 && (P = CS_GetPrevEntry (S, I)) != 0) { + + /* Get the branch condition */ + bc_t BC = GetBranchCond (E->OPC); + + /* Check the previous instruction */ + switch (P->OPC) { + + case OP65_ADC: + case OP65_AND: + case OP65_DEA: + case OP65_EOR: + case OP65_INA: + case OP65_LDA: + case OP65_ORA: + case OP65_PLA: + case OP65_SBC: + /* A is zero in one execution flow direction */ + if (BC == BC_EQ) { + E->RI->Out2.RegA = 0; + } else { + E->RI->Out.RegA = 0; + } + break; + + case OP65_CMP: + /* If this is an immidiate compare, the A register has + * the value of the compare later. + */ + if (CE_KnownImm (P)) { + if (BC == BC_EQ) { + E->RI->Out2.RegA = (unsigned char)P->Num; + } else { + E->RI->Out.RegA = (unsigned char)P->Num; + } + } + break; + + case OP65_CPX: + /* If this is an immidiate compare, the X register has + * the value of the compare later. + */ + if (CE_KnownImm (P)) { + if (BC == BC_EQ) { + E->RI->Out2.RegX = (unsigned char)P->Num; + } else { + E->RI->Out.RegX = (unsigned char)P->Num; + } + } + break; + + case OP65_CPY: + /* If this is an immidiate compare, the Y register has + * the value of the compare later. + */ + if (CE_KnownImm (P)) { + if (BC == BC_EQ) { + E->RI->Out2.RegY = (unsigned char)P->Num; + } else { + E->RI->Out.RegY = (unsigned char)P->Num; + } + } + break; + + case OP65_DEX: + case OP65_INX: + case OP65_LDX: + case OP65_PLX: + /* X is zero in one execution flow direction */ + if (BC == BC_EQ) { + E->RI->Out2.RegX = 0; + } else { + E->RI->Out.RegX = 0; + } + break; + + case OP65_DEY: + case OP65_INY: + case OP65_LDY: + case OP65_PLY: + /* X is zero in one execution flow direction */ + if (BC == BC_EQ) { + E->RI->Out2.RegY = 0; + } else { + E->RI->Out.RegY = 0; + } + break; + + case OP65_TAX: + case OP65_TXA: + /* If the branch is a beq, both A and X are zero at the + * branch target, otherwise they are zero at the next + * insn. + */ + if (BC == BC_EQ) { + E->RI->Out2.RegA = E->RI->Out2.RegX = 0; + } else { + E->RI->Out.RegA = E->RI->Out.RegX = 0; + } + break; + + case OP65_TAY: + case OP65_TYA: + /* If the branch is a beq, both A and Y are zero at the + * branch target, otherwise they are zero at the next + * insn. + */ + if (BC == BC_EQ) { + E->RI->Out2.RegA = E->RI->Out2.RegY = 0; + } else { + E->RI->Out.RegA = E->RI->Out.RegY = 0; + } + break; + default: + break; + + } + } + } +}