{
char Buf[1024];
char* L;
+ const char* Comment;
unsigned Line;
unsigned Len;
long Val;
} else {
if (!IgnoreUnknown) {
Error ("%s(%u): Missing `='", Filename, Line);
- }
+ }
continue;
}
/* Skip whitespace again */
L = SkipWhitespace (L);
+ /* Check for a comment */
+ if (*L == CommentStart) {
+ Comment = SkipWhitespace (L+1);
+ if (*Comment == '\0') {
+ Comment = 0;
+ }
+ } else {
+ Comment = 0;
+ }
+
/* Check for a comment character or end of line */
if (*L != CommentStart && *L != '\0') {
if (!IgnoreUnknown) {
Val *= Sign;
/* Define the symbol */
- AddExtLabelRange (Val, SB_GetConstBuf (&Ident), 1);
+ AddExtLabel (Val, SB_GetConstBuf (&Ident), Comment);
}
+/* Label + comment */
+typedef struct {
+ const char* Name;
+ const char* Comment;
+} Label;
+
+/* A whole lot of Labels, so we don't have to allocate them separately */
+static Label* LabelHeap = 0;
+static unsigned LabelsLeft = 0;
+
/* Attribute table */
static unsigned char AttrTab [0x10000];
/* Symbol table */
-static const char* SymTab [0x10000];
+static const Label* SymTab [0x10000];
+
+
+
+/*****************************************************************************/
+/* struct Label */
+/*****************************************************************************/
+
+
+
+Label* NewLabel (const char* Name, const char* Comment)
+/* Create a new Label structure, initialize and return it */
+{
+ Label* L;
+
+ /* Check if we have some free labels left */
+ if (LabelsLeft == 0) {
+ /* Allocate a new block of memory */
+ LabelsLeft = 200;
+ LabelHeap = xmalloc (LabelsLeft * sizeof (Label));
+ }
+
+ /* Get a new one from the buffer */
+ L = LabelHeap++;
+ --LabelsLeft;
+
+ /* Initialize the new label */
+ L->Name = xstrdup (Name);
+ L->Comment = Comment? xstrdup (Comment) : 0;
+
+ /* Return the new label */
+ return L;
+}
-const char* MakeLabelName (unsigned Addr)
+static const char* MakeLabelName (unsigned Addr)
/* Make the default label name from the given address and return it in a
* static buffer.
*/
-void AddLabel (unsigned Addr, attr_t Attr, const char* Name)
+void AddLabel (unsigned Addr, attr_t Attr, const char* Name, const char* Comment)
/* Add a label */
{
/* Get an existing label attribute */
/* Must not have two symbols for one address */
if (ExistingAttr != atNoLabel) {
/* Allow redefinition if identical */
- if (ExistingAttr == Attr && strcmp (SymTab[Addr], Name) == 0) {
+ if (ExistingAttr == Attr && strcmp (SymTab[Addr]->Name, Name) == 0) {
return;
}
- Error ("Duplicate label for address $%04X: %s/%s", Addr, SymTab[Addr], Name);
+ Error ("Duplicate label for address $%04X: %s/%s", Addr, SymTab[Addr]->Name, Name);
}
/* Create a new label */
- SymTab[Addr] = xstrdup (Name);
+ SymTab[Addr] = NewLabel (Name, Comment);
/* Remember the attribute */
AttrTab[Addr] |= Attr;
+void AddIntLabel (unsigned Addr)
+/* Add an internal label using the address to generate the name. */
+{
+ AddLabel (Addr, atIntLabel, MakeLabelName (Addr), 0);
+}
+
+
+
+void AddExtLabel (unsigned Addr, const char* Name, const char* Comment)
+/* Add an external label */
+{
+ AddLabel (Addr, atExtLabel, Name, Comment);
+}
+
+
+
void AddDepLabel (unsigned Addr, attr_t Attr, const char* BaseName, unsigned Offs)
/* Add a dependent label at the given address using "base name+Offs" as the new
* name.
}
/* Define the labels */
- AddLabel (Addr, Attr | atDepLabel, DepName);
+ AddLabel (Addr, Attr | atDepLabel, DepName, 0);
/* Free the name buffer */
xfree (DepName);
-static void AddLabelRange (unsigned Addr, attr_t Attr, const char* Name, unsigned Count)
+static void AddLabelRange (unsigned Addr, attr_t Attr,
+ const char* Name, const char* Comment,
+ unsigned Count)
/* Add a label for a range. The first entry gets the label "Name" while the
* others get "Name+offs".
*/
{
/* Define the label */
- AddLabel (Addr, Attr, Name);
+ AddLabel (Addr, Attr, Name, Comment);
/* Define dependent labels if necessary */
if (Count > 1) {
/* Define the labels */
for (Offs = 1; Offs < Count; ++Offs) {
sprintf (DepOffs, Format, Offs);
- AddLabel (Addr + Offs, Attr | atDepLabel, DepName);
+ AddLabel (Addr + Offs, Attr | atDepLabel, DepName, 0);
}
/* Free the name buffer */
*/
{
/* Define the label range */
- AddLabelRange (Addr, atIntLabel, Name, Count);
+ AddLabelRange (Addr, atIntLabel, Name, 0, Count);
}
-void AddExtLabelRange (unsigned Addr, const char* Name, unsigned Count)
+void AddExtLabelRange (unsigned Addr, const char* Name, const char* Comment, unsigned Count)
/* Add an external label for a range. The first entry gets the label "Name"
* while the others get "Name+offs".
*/
{
/* Define the label range */
- AddLabelRange (Addr, atExtLabel, Name, Count);
+ AddLabelRange (Addr, atExtLabel, Name, Comment, Count);
}
AddrCheck (Addr);
/* Return the label if any */
- return SymTab[Addr];
+ return SymTab[Addr]? SymTab[Addr]->Name : 0;
+}
+
+
+
+const char* GetComment (unsigned Addr)
+/* Return the comment for an address */
+{
+ /* Check the given address */
+ AddrCheck (Addr);
+
+ /* Return the label if any */
+ return SymTab[Addr]? SymTab[Addr]->Comment : 0;
}
static void DefineConst (unsigned Addr)
/* Define an address constant */
{
- Output ("%s", SymTab [Addr]);
+ Output ("%s", SymTab[Addr]->Name);
Indent (AIndent);
Output ("= $%04X", Addr);
LineFeed ();
void MarkAddr (unsigned Addr, attr_t Attr);
/* Mark an address with an attribute */
-const char* MakeLabelName (unsigned Addr);
-/* Make the default label name from the given address and return it in a
- * static buffer.
- */
-
-void AddLabel (unsigned Addr, attr_t Attr, const char* Name);
+void AddLabel (unsigned Addr, attr_t Attr, const char* Name, const char* Comment);
/* Add a label */
+void AddIntLabel (unsigned Addr);
+/* Add an internal label using the address to generate the name. */
+
+void AddExtLabel (unsigned Addr, const char* Name, const char* Comment);
+/* Add an external label */
+
void AddDepLabel (unsigned Addr, attr_t Attr, const char* BaseName, unsigned Offs);
/* Add a dependent label at the given address using "base name+Offs" as the new
* name.
* while the others get "Name+offs".
*/
-void AddExtLabelRange (unsigned Addr, const char* Name, unsigned Count);
+void AddExtLabelRange (unsigned Addr, const char* Name, const char* Comment, unsigned Count);
/* Add an external label for a range. The first entry gets the label "Name"
* while the others get "Name+offs".
*/
const char* GetLabel (unsigned Addr);
/* Return the label for an address or NULL if there is none */
+const char* GetComment (unsigned Addr);
+/* Return the comment for an address */
+
unsigned char GetStyleAttr (unsigned Addr);
/* Return the style attribute for the given address */
/* In pass 1, define a label, in pass 2 output the line */
if (Pass == 1) {
if (!HaveLabel (Addr)) {
- AddLabel (Addr, atIntLabel, MakeLabelName (Addr));
+ AddIntLabel (Addr);
}
} else {
const char* Label = GetLabel (Addr);
/* In pass 1, define a label, in pass 2 output the line */
if (Pass == 1) {
if (!HaveLabel (Addr)) {
- AddLabel (Addr, atIntLabel, MakeLabelName (Addr));
+ AddIntLabel (Addr);
}
} else {
const char* Label = GetLabel (Addr);
if (Granularity == 1) {
/* Just add the label */
- AddLabel (Addr, atIntLabel, MakeLabelName (Addr));
+ AddIntLabel (Addr);
} else {
/* Search for the start of the range or the last non dependent
* label in the range.
/* If the proposed label address doesn't have a label, define one */
if ((GetLabelAttr (LabelAddr) & (atIntLabel|atExtLabel)) == 0) {
- AddLabel (LabelAddr, atIntLabel, MakeLabelName (LabelAddr));
+ AddIntLabel (LabelAddr);
}
/* Create the label */
Offs = Addr - LabelAddr;
if (Offs == 0) {
- AddLabel (Addr, atIntLabel, MakeLabelName (Addr));
+ AddIntLabel (Addr);
} else {
AddDepLabel (Addr, atIntLabel, GetLabel (LabelAddr), Offs);
}
/* Parse a range section */
{
static const IdentTok RangeDefs[] = {
+ { "COMMENT", INFOTOK_COMMENT },
{ "END", INFOTOK_END },
{ "NAME", INFOTOK_NAME },
{ "START", INFOTOK_START },
};
static const IdentTok TypeDefs[] = {
- { "ADDRTABLE", INFOTOK_ADDRTAB },
+ { "ADDRTABLE", INFOTOK_ADDRTAB },
{ "BYTETABLE", INFOTOK_BYTETAB },
{ "CODE", INFOTOK_CODE },
{ "DBYTETABLE", INFOTOK_DBYTETAB },
- { "DWORDTABLE", INFOTOK_DWORDTAB },
+ { "DWORDTABLE", INFOTOK_DWORDTAB },
{ "RTSTABLE", INFOTOK_RTSTAB },
{ "SKIP", INFOTOK_SKIP },
{ "TEXTTABLE", INFOTOK_TEXTTAB },
tEnd = 0x02,
tType = 0x04,
tName = 0x08,
+ tComment= 0x10,
tNeeded = (tStart | tEnd | tType)
};
unsigned Attributes = tNone;
unsigned End = 0;
unsigned char Type = 0;
char* Name = 0;
+ char* Comment = 0;
unsigned MemberSize = 0;
/* Look at the token */
switch (InfoTok) {
+ case INFOTOK_COMMENT:
+ AddAttr ("COMMENT", &Attributes, tComment);
+ InfoNextTok ();
+ InfoAssureStr ();
+ if (InfoSVal[0] == '\0') {
+ InfoError ("Comment may not be empty");
+ }
+ Comment = xstrdup (InfoSVal);
+ Attributes |= tComment;
+ InfoNextTok ();
+ break;
+
case INFOTOK_END:
AddAttr ("END", &Attributes, tEnd);
InfoNextTok ();
/* Do we have a label? */
if (Attributes & tName) {
/* Define a label for the table */
- AddLabel (Start, atExtLabel, Name);
- /* Delete the name */
+ AddExtLabel (Start, Name, Comment);
+ /* Delete name and comment */
xfree (Name);
+ xfree (Comment);
}
/* Consume the closing brace */
/* Parse a label section */
{
static const IdentTok LabelDefs[] = {
- { "NAME", INFOTOK_NAME },
+ { "COMMENT", INFOTOK_COMMENT },
{ "ADDR", INFOTOK_ADDR },
+ { "NAME", INFOTOK_NAME },
{ "SIZE", INFOTOK_SIZE },
};
/* Locals - initialize to avoid gcc warnings */
- char* Name = 0;
- long Value = -1;
- long Size = -1;
+ char* Name = 0;
+ char* Comment = 0;
+ long Value = -1;
+ long Size = -1;
/* Skip the token */
InfoNextTok ();
/* Look at the token */
switch (InfoTok) {
+ case INFOTOK_ADDR:
+ InfoNextTok ();
+ if (Value >= 0) {
+ InfoError ("Value already given");
+ }
+ InfoAssureInt ();
+ InfoRangeCheck (0, 0xFFFF);
+ Value = InfoIVal;
+ InfoNextTok ();
+ break;
+
+ case INFOTOK_COMMENT:
+ InfoNextTok ();
+ if (Comment) {
+ InfoError ("Comment already given");
+ }
+ InfoAssureStr ();
+ if (InfoSVal[0] == '\0') {
+ InfoError ("Comment may not be empty");
+ }
+ Comment = xstrdup (InfoSVal);
+ InfoNextTok ();
+ break;
+
case INFOTOK_NAME:
InfoNextTok ();
if (Name) {
InfoNextTok ();
break;
- case INFOTOK_ADDR:
- InfoNextTok ();
- if (Value >= 0) {
- InfoError ("Value already given");
- }
- InfoAssureInt ();
- InfoRangeCheck (0, 0xFFFF);
- Value = InfoIVal;
- InfoNextTok ();
- break;
-
case INFOTOK_SIZE:
InfoNextTok ();
if (Size >= 0) {
}
/* Define the label(s) */
- AddExtLabelRange ((unsigned) Value, Name, Size);
+ AddExtLabelRange ((unsigned) Value, Name, Comment, Size);
- /* Delete the dynamically allocated memory for Name */
+ /* Delete the dynamically allocated memory for Name and Comment */
xfree (Name);
+ xfree (Comment);
/* Consume the closing brace */
InfoConsumeRCurly ();
/* Get the output style for the current PC */
attr_t Style = GetStyleAttr (PC);
- /* If we have a label at this address, output the label, provided that
- * we aren't in a skip area.
+ /* If we have a label at this address, output the label and an attached
+ * comment, provided that we aren't in a skip area.
*/
if (Style != atSkip && MustDefLabel (PC)) {
+ const char* Comment = GetComment (PC);
+ if (Comment) {
+ UserComment (Comment);
+ }
DefLabel (GetLabel (PC));
}
+void UserComment (const char* Comment)
+/* Output a comment line */
+{
+ Output ("; %s", Comment);
+ LineFeed ();
+}
+
+
+
void LineComment (unsigned PC, unsigned Count)
/* Add a line comment with the PC and data bytes */
{
void SeparatorLine (void);
/* Print a separator line */
+void UserComment (const char* Comment);
+/* Output a comment line */
+
void LineComment (unsigned PC, unsigned Count);
/* Add a line comment with the PC and data bytes */
/* Read the next token from the input stream */
{
unsigned I;
-
+ int Esc;
Again:
/* Skip whitespace */
NextChar ();
I = 0;
while (C != '\"') {
+ Esc = (C == '\\');
+ if (Esc) {
+ NextChar ();
+ }
if (C == EOF || C == '\n') {
InfoError ("Unterminated string");
}
+ if (Esc) {
+ switch (C) {
+ case '\"': C = '\"'; break;
+ case '\'': C = '\''; break;
+ default: InfoError ("Invalid escape char: %c", C);
+ }
+ }
if (I < CFG_MAX_IDENT_LEN) {
InfoSVal [I++] = C;
}
/* Label section */
INFOTOK_NAME,
+ INFOTOK_COMMENT,
INFOTOK_ADDR,
INFOTOK_SIZE,
projects / cc65 / commitdiff