/* */
/* */
/* */
-/* (C) 2001-2002 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@cc65.org */
+/* (C) 2001-2006, Ullrich von Bassewitz */
+/* Römerstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* common */
#include "chartype.h"
#include "check.h"
+#include "debugflag.h"
#include "global.h"
#include "hashstr.h"
+#include "strbuf.h"
#include "strutil.h"
#include "xmalloc.h"
-#include "xsprintf.h"
/* cc65 */
#include "asmlabel.h"
#include "codeent.h"
#include "codeinfo.h"
+#include "codeseg.h"
#include "datatype.h"
#include "error.h"
+#include "global.h"
#include "ident.h"
#include "symentry.h"
-#include "codeseg.h"
-static CodeLabel* CS_AddLabelInternal (CodeSeg* S, const char* Name,
- void (*ErrorFunc) (const char*, ...))
-/* 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 = CS_FindLabel (S, Name, Hash);
-
- /* Did we find it? */
- if (L) {
- /* We found it - be sure it does not already have an owner */
- if (L->Owner) {
- ErrorFunc ("ASM label `%s' is already defined", Name);
- }
- } else {
- /* Not found - create a new one */
- L = CS_NewCodeLabel (S, Name, Hash);
- }
-
- /* Safety. This call is quite costly, but safety is better */
- if (CollIndex (&S->Labels, L) >= 0) {
- ErrorFunc ("ASM label `%s' is already defined", Name);
- }
-
- /* We do now have a valid label. Remember it for later */
- CollAppend (&S->Labels, L);
-
- /* Return the label */
- return L;
-}
-
-
-
/*****************************************************************************/
/* Functions for parsing instructions */
/*****************************************************************************/
L = SkipSpace (L+1);
/* Add the label */
- CS_AddLabelInternal (S, Mnemo, Error);
+ CS_AddLabel (S, Mnemo);
/* If we have reached end of line, bail out, otherwise a mnemonic
* may follow.
switch (*L) {
case '\0':
- /* Implicit */
- AM = AM65_IMP;
+ /* Implicit or accu */
+ if (OPC->Info & OF_NOIMP) {
+ AM = AM65_ACC;
+ } else {
+ AM = AM65_IMP;
+ }
break;
case '#':
AM = AM65_ZPX;
} else {
AM = AM65_ABSX;
- }
+ }
} else if (Reg == 'Y') {
AM = AM65_ABSY;
} else {
/* Create a new code segment, initialize and return it */
{
unsigned I;
- const type* RetType;
+ const Type* RetType;
/* Allocate memory */
CodeSeg* S = xmalloc (sizeof (CodeSeg));
S->ExitRegs = REG_NONE;
}
+ /* Copy the global optimization settings */
+ S->Optimize = (unsigned char) IS_Get (&Optimize);
+ S->CodeSizeFactor = (unsigned) IS_Get (&CodeSizeFactor);
+
/* Return the new struct */
return S;
}
char Token[IDENTSIZE+10];
/* Format the line */
- char Buf [256];
- xvsprintf (Buf, sizeof (Buf), Format, ap);
+ StrBuf Buf = STATIC_STRBUF_INITIALIZER;
+ SB_VPrintf (&Buf, Format, ap);
/* Skip whitespace */
- L = SkipSpace (Buf);
+ L = SkipSpace (SB_GetConstBuf (&Buf));
/* Check which type of instruction we have */
E = 0; /* Assume no insn created */
if (E) {
CS_AddEntry (S, E);
}
+
+ /* Cleanup the string buffer */
+ DoneStrBuf (&Buf);
}
CodeLabel* CS_AddLabel (CodeSeg* S, const char* Name)
/* Add a code label for the next instruction to follow */
{
- return CS_AddLabelInternal (S, Name, Internal);
+ /* 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 = CS_FindLabel (S, Name, Hash);
+
+ /* Did we find it? */
+ if (L) {
+ /* We found it - be sure it does not already have an owner */
+ if (L->Owner) {
+ Error ("ASM label `%s' is already defined", Name);
+ return L;
+ }
+ } else {
+ /* Not found - create a new one */
+ L = CS_NewCodeLabel (S, Name, Hash);
+ }
+
+ /* Safety. This call is quite costly, but safety is better */
+ if (CollIndex (&S->Labels, L) >= 0) {
+ Error ("ASM label `%s' is already defined", Name);
+ return L;
+ }
+
+ /* We do now have a valid label. Remember it for later */
+ CollAppend (&S->Labels, L);
+
+ /* Return the label */
+ return L;
}
/* Get the insn referencing this label */
CodeEntry* E = CollAt (&L->JumpFrom, I);
/* Remove the reference */
- E->JumpTo = 0;
+ CE_ClearJumpTo (E);
}
CollDeleteAll (&L->JumpFrom);
for (J = 0; J < CL_GetRefCount (X); ++J) {
/* Get the entry referencing this label */
CodeEntry* E = CL_GetRef (X, J);
- /* And remove the reference */
+ /* And remove the reference. Do NOT call CE_ClearJumpTo
+ * here, because this will also clear the label name,
+ * which is not what we want.
+ */
E->JumpTo = 0;
}
CollDeleteItem (&L->JumpFrom, E);
/* The entry jumps no longer to L */
- E->JumpTo = 0;
+ CE_ClearJumpTo (E);
/* If there are no more references, delete the label */
if (CollCount (&L->JumpFrom) == 0) {
* segment before outputing the function label.
*/
if (Func) {
+ /* Get the function descriptor */
+ const FuncDesc* D = GetFuncDesc (Func->Type);
CS_PrintFunctionHeader (S, F);
- fprintf (F, ".segment\t\"%s\"\n\n.proc\t_%s\n\n", S->SegName, Func->Name);
+ fprintf (F, ".segment\t\"%s\"\n\n.proc\t_%s", S->SegName, Func->Name);
+ if (D->Flags & FD_NEAR) {
+ fputs (": near", F);
+ } else if (D->Flags & FD_FAR) {
+ fputs (": far", F);
+ }
+ fputs ("\n\n", F);
}
}
*/
{
if (S->Func) {
- fprintf (F, "\n.endproc\n\n");
+ fputs ("\n.endproc\n\n", F);
}
}
-void CS_Output (const CodeSeg* S, FILE* F)
+void CS_Output (CodeSeg* S, FILE* F)
/* Output the code segment data to a file */
{
unsigned I;
return;
}
+ /* Generate register info */
+ CS_GenRegInfo (S);
+
/* Output the segment directive */
fprintf (F, ".segment\t\"%s\"\n\n", S->SegName);
/* Line info has changed, remember the new line info */
LI = E->LI;
- /* Add the source line as a comment */
+ /* Add the source line as a comment. Beware: When line continuation
+ * was used, the line may contain newlines.
+ */
if (AddSource) {
- fprintf (F, ";\n; %s\n;\n", LI->Line);
+ const char* L = LI->Line;
+ fputs (";\n; ", F);
+ while (*L) {
+ if (*L == '\n') {
+ fputs ("\n; ", F);
+ } else {
+ fputc (*L, F);
+ }
+ ++L;
+ }
+ fputs ("\n;\n", F);
}
/* Add line debug info */
if (DebugInfo) {
fprintf (F, "\t.dbg\tline, \"%s\", %u\n",
- GetInputName (LI), GetInputLine (LI));
+ GetInputName (LI), GetInputLine (LI));
}
}
/* Output the code */
/* If debug info is enabled, terminate the last line number information */
if (DebugInfo) {
- fprintf (F, "\t.dbg\tline\n");
+ fputs ("\t.dbg\tline\n", F);
}
+
+ /* Free register info */
+ CS_FreeRegInfo (S);
}
break;
}
if (J->RI->Out2.RegA != Regs.RegA) {
- Regs.RegA = UNKNOWN_REGVAL;
+ Regs.RegA = UNKNOWN_REGVAL;
}
if (J->RI->Out2.RegX != Regs.RegX) {
Regs.RegX = UNKNOWN_REGVAL;
/* Check the previous instruction */
switch (P->OPC) {
- case OP65_ADC:
+ case OP65_ADC:
case OP65_AND:
case OP65_DEA:
case OP65_EOR:
/* A is zero in one execution flow direction */
if (BC == BC_EQ) {
E->RI->Out2.RegA = 0;
- } else {
+ } else {
E->RI->Out.RegA = 0;
}
break;
/* If this is an immidiate compare, the A register has
* the value of the compare later.
*/
- if (CE_KnownImm (P)) {
+ if (CE_IsConstImm (P)) {
if (BC == BC_EQ) {
E->RI->Out2.RegA = (unsigned char)P->Num;
} else {
E->RI->Out.RegA = (unsigned char)P->Num;
- }
+ }
}
break;
/* If this is an immidiate compare, the X register has
* the value of the compare later.
*/
- if (CE_KnownImm (P)) {
+ if (CE_IsConstImm (P)) {
if (BC == BC_EQ) {
E->RI->Out2.RegX = (unsigned char)P->Num;
} else {
case OP65_CPY:
/* If this is an immidiate compare, the Y register has
* the value of the compare later.
- */
- if (CE_KnownImm (P)) {
+ */
+ if (CE_IsConstImm (P)) {
if (BC == BC_EQ) {
E->RI->Out2.RegY = (unsigned char)P->Num;
} else {
E->RI->Out2.RegX = 0;
} else {
E->RI->Out.RegX = 0;
- }
+ }
break;
case OP65_DEY:
projects / cc65 / blobdiff