/* */
/* */
/* */
-/* (C) 1998-2005 Ullrich von Bassewitz */
-/* Römerstraße 52 */
-/* D-70794 Filderstadt */
-/* EMail: uz@cc65.org */
+/* (C) 1998-2010, Ullrich von Bassewitz */
+/* Roemerstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* common */
#include "addrsize.h"
+#include "attrib.h"
#include "chartype.h"
#include "check.h"
#include "fname.h"
-enum Token Tok = TOK_NONE; /* Current token */
+Token Tok = TOK_NONE; /* Current token */
int WS; /* Flag: Whitespace before token */
long IVal; /* Integer token attribute */
-char SVal[MAX_STR_LEN+1]; /* String token attribute */
+StrBuf SVal = STATIC_STRBUF_INITIALIZER;/* String token attribute */
FilePos CurPos = { 0, 0, 0 }; /* Name and position in current file */
struct InputFile {
FILE* F; /* Input file descriptor */
FilePos Pos; /* Position in file */
- enum Token Tok; /* Last token */
+ Token Tok; /* Last token */
int C; /* Last character */
char Line[256]; /* The current input line */
InputFile* Next; /* Linked list of input files */
/* Struct to handle textual input data */
typedef struct InputData InputData;
struct InputData {
- char* Data; /* Pointer to the data */
+ char* Text; /* Pointer to the text data */
const char* Pos; /* Pointer to current position */
int Malloced; /* Memory was malloced */
- enum Token Tok; /* Last token */
+ Token Tok; /* Last token */
int C; /* Last character */
InputData* Next; /* Linked list of input data */
};
+/* Input source: Either file or data */
+typedef struct CharSource CharSource;
+
+/* Set of input functions */
+typedef struct CharSourceFunctions CharSourceFunctions;
+struct CharSourceFunctions {
+ void (*MarkStart) (CharSource*); /* Mark the start pos of a token */
+ void (*NextChar) (CharSource*); /* Read next char from input */
+ void (*Done) (CharSource*); /* Close input source */
+};
+
+/* Input source: Either file or data */
+struct CharSource {
+ CharSource* Next; /* Linked list of char sources */
+ Token Tok; /* Last token */
+ int C; /* Last character */
+ const CharSourceFunctions* Func; /* Pointer to function table */
+ union {
+ InputFile File; /* File data */
+ InputData Data; /* Textual data */
+ } V;
+};
+
/* Current input variables */
-static InputFile* IFile = 0; /* Current input file */
-static InputData* IData = 0; /* Current input memory data */
-static unsigned ICount = 0; /* Count of input files */
-static int C = 0; /* Current input character */
+static CharSource* Source = 0; /* Current char source */
+static unsigned FCount = 0; /* Count of input files */
+static int C = 0; /* Current input character */
/* Force end of assembly */
int ForcedEnd = 0;
/* List of dot keywords with the corresponding tokens */
struct DotKeyword {
const char* Key; /* MUST be first field */
- enum Token Tok;
+ Token Tok;
} DotKeywords [] = {
{ ".A16", TOK_A16 },
{ ".A8", TOK_A8 },
{ ".ASSERT", TOK_ASSERT },
{ ".AUTOIMPORT", TOK_AUTOIMPORT },
{ ".BANKBYTE", TOK_BANKBYTE },
+ { ".BANKBYTES", TOK_BANKBYTES },
{ ".BITAND", TOK_AND },
{ ".BITNOT", TOK_NOT },
{ ".BITOR", TOK_OR },
{ ".GLOBAL", TOK_GLOBAL },
{ ".GLOBALZP", TOK_GLOBALZP },
{ ".HIBYTE", TOK_HIBYTE },
+ { ".HIBYTES", TOK_HIBYTES },
{ ".HIWORD", TOK_HIWORD },
{ ".I16", TOK_I16 },
{ ".I8", TOK_I8 },
{ ".LIST", TOK_LIST },
{ ".LISTBYTES", TOK_LISTBYTES },
{ ".LOBYTE", TOK_LOBYTE },
+ { ".LOBYTES", TOK_LOBYTES },
{ ".LOCAL", TOK_LOCAL },
{ ".LOCALCHAR", TOK_LOCALCHAR },
{ ".LOWORD", TOK_LOWORD },
{ ".MACPACK", TOK_MACPACK },
{ ".MACRO", TOK_MACRO },
{ ".MATCH", TOK_MATCH },
+ { ".MAX", TOK_MAX },
{ ".MID", TOK_MID },
+ { ".MIN", TOK_MIN },
{ ".MOD", TOK_MOD },
{ ".NOT", TOK_BOOLNOT },
- { ".NULL", TOK_NULL },
+ { ".NULL", TOK_NULL },
{ ".OR", TOK_BOOLOR },
{ ".ORG", TOK_ORG },
{ ".OUT", TOK_OUT },
/*****************************************************************************/
-/* Forwards */
+/* CharSource functions */
/*****************************************************************************/
-static void NextChar (void);
-/* Read the next character from the input file */
+static void UseCharSource (CharSource* S)
+/* Initialize a new input source and start to use it. */
+{
+ /* Remember the current input char and token */
+ S->Tok = Tok;
+ S->C = C;
+
+ /* Use the new input source */
+ S->Next = Source;
+ Source = S;
+
+ /* Read the first character from the new file */
+ S->Func->NextChar (S);
+
+ /* Setup the next token so it will be skipped on the next call to
+ * NextRawTok().
+ */
+ Tok = TOK_SEP;
+}
+
+
+
+static void DoneCharSource (void)
+/* Close the top level character source */
+{
+ CharSource* S;
+
+ /* First, call the type specific function */
+ Source->Func->Done (Source);
+
+ /* Restore the old token */
+ Tok = Source->Tok;
+ C = Source->C;
+
+ /* Remember the last stacked input source */
+ S = Source->Next;
+
+ /* Delete the top level one ... */
+ xfree (Source);
+
+ /* ... and use the one before */
+ Source = S;
+}
/*****************************************************************************/
-/* Character classification functions */
+/* InputFile functions */
/*****************************************************************************/
-int IsIdChar (int C)
-/* Return true if the character is a valid character for an identifier */
+static void IFMarkStart (CharSource* S)
+/* Mark the start of the next token */
{
- return IsAlNum (C) ||
- (C == '_') ||
- (C == '@' && AtInIdents) ||
- (C == '$' && DollarInIdents);
+ CurPos = S->V.File.Pos;
}
-int IsIdStart (int C)
-/* Return true if the character may start an identifier */
+static void IFNextChar (CharSource* S)
+/* Read the next character from the input file */
{
- return IsAlpha (C) || C == '_';
+ /* Check for end of line, read the next line if needed */
+ while (S->V.File.Line [S->V.File.Pos.Col] == '\0') {
+
+ unsigned Len, Removed;
+
+ /* End of current line reached, read next line */
+ if (fgets (S->V.File.Line, sizeof (S->V.File.Line), S->V.File.F) == 0) {
+ /* End of file. Add an empty line to the listing. This is a
+ * small hack needed to keep the PC output in sync.
+ */
+ NewListingLine ("", S->V.File.Pos.Name, FCount);
+ C = EOF;
+ return;
+ }
+
+ /* For better handling of files with unusual line endings (DOS
+ * files that are accidently translated on Unix for example),
+ * first remove all whitespace at the end, then add a single
+ * newline.
+ */
+ Len = strlen (S->V.File.Line);
+ Removed = 0;
+ while (Len > 0 && IsSpace (S->V.File.Line[Len-1])) {
+ ++Removed;
+ --Len;
+ }
+ if (Removed) {
+ S->V.File.Line[Len+0] = '\n';
+ S->V.File.Line[Len+1] = '\0';
+ }
+
+ /* One more line */
+ S->V.File.Pos.Line++;
+ S->V.File.Pos.Col = 0;
+
+ /* Remember the new line for the listing */
+ NewListingLine (S->V.File.Line, S->V.File.Pos.Name, FCount);
+
+ }
+
+ /* Return the next character from the file */
+ C = S->V.File.Line [S->V.File.Pos.Col++];
}
-/*****************************************************************************/
-/* Code */
-/*****************************************************************************/
+void IFDone (CharSource* S)
+/* Close the current input file */
+{
+ /* We're at the end of an include file. Check if we have any
+ * open .IFs, or any open token lists in this file. This
+ * enforcement is artificial, using conditionals that start
+ * in one file and end in another are uncommon, and don't
+ * allowing these things will help finding errors.
+ */
+ CheckOpenIfs ();
+ /* Close the input file and decrement the file count. We will ignore
+ * errors here, since we were just reading from the file.
+ */
+ (void) fclose (S->V.File.F);
+ --FCount;
+}
+
+
+
+/* Set of input file handling functions */
+static const CharSourceFunctions IFFunc = {
+ IFMarkStart,
+ IFNextChar,
+ IFDone
+};
-void NewInputFile (const char* Name)
-/* Open a new input file */
+
+int NewInputFile (const char* Name)
+/* Open a new input file. Returns true if the file could be successfully opened
+ * and false otherwise.
+ */
{
- InputFile* I;
- FILE* F;
+ int RetCode = 0; /* Return code. Assume an error. */
+ char* PathName = 0;
/* First try to open the file */
- F = fopen (Name, "r");
+ FILE* F = fopen (Name, "r");
if (F == 0) {
- char* PathName;
-
/* Error (fatal error if this is the main file) */
- if (ICount == 0) {
+ if (FCount == 0) {
Fatal ("Cannot open input file `%s': %s", Name, strerror (errno));
}
/* We are on include level. Search for the file in the include
* directories.
*/
- PathName = FindInclude (Name);
+ PathName = FindInclude (Name, INC_STD);
if (PathName == 0 || (F = fopen (PathName, "r")) == 0) {
/* Not found or cannot open, print an error and bail out */
Error ("Cannot open include file `%s': %s", Name, strerror (errno));
+ goto ExitPoint;
}
- /* Free the allocated memory */
- xfree (PathName);
-
+ /* Use the path name from now on */
+ Name = PathName;
}
/* check again if we do now have an open file */
if (F != 0) {
- unsigned FileIdx;
-
- /* Stat the file and remember the values */
+ StrBuf NameBuf;
+ unsigned FileIdx;
+ CharSource* S;
+
+ /* Stat the file and remember the values. There a race condition here,
+ * since we cannot use fileno() (non standard identifier in standard
+ * header file), and therefore not fstat. When using stat with the
+ * file name, there's a risk that the file was deleted and recreated
+ * while it was open. Since mtime and size are only used to check
+ * if a file has changed in the debugger, we will ignore this problem
+ * here.
+ */
struct stat Buf;
- if (fstat (fileno (F), &Buf) != 0) {
+ if (stat (Name, &Buf) != 0) {
Fatal ("Cannot stat input file `%s': %s", Name, strerror (errno));
}
/* Add the file to the input file table and remember the index */
- FileIdx = AddFile (Name, Buf.st_size, Buf.st_mtime);
-
- /* Create a new state variable and initialize it */
- I = xmalloc (sizeof (*I));
- I->F = F;
- I->Pos.Line = 0;
- I->Pos.Col = 0;
- I->Pos.Name = FileIdx;
- I->Tok = Tok;
- I->C = C;
- I->Line[0] = '\0';
-
- /* Use the new file */
- I->Next = IFile;
- IFile = I;
- ++ICount;
-
- /* Read the first character from the new file */
- NextChar ();
+ FileIdx = AddFile (SB_InitFromString (&NameBuf, Name), Buf.st_size, Buf.st_mtime);
+
+ /* Create a new input source variable and initialize it */
+ S = xmalloc (sizeof (*S));
+ S->Func = &IFFunc;
+ S->V.File.F = F;
+ S->V.File.Pos.Line = 0;
+ S->V.File.Pos.Col = 0;
+ S->V.File.Pos.Name = FileIdx;
+ S->V.File.Line[0] = '\0';
+
+ /* Count active input files */
+ ++FCount;
+
+ /* Use this input source */
+ UseCharSource (S);
+ }
- /* Setup the next token so it will be skipped on the next call to
- * NextRawTok().
- */
- Tok = TOK_SEP;
+ /* File successfully opened */
+ RetCode = 1;
- }
+ExitPoint:
+ /* Free an allocated name buffer */
+ xfree (PathName);
+
+ /* Return the success code */
+ return RetCode;
}
-void DoneInputFile (void)
-/* Close the current input file */
+/*****************************************************************************/
+/* InputData functions */
+/*****************************************************************************/
+
+
+
+static void IDMarkStart (CharSource* S attribute ((unused)))
+/* Mark the start of the next token */
{
- InputFile* I;
+ /* Nothing to do here */
+}
- /* Restore the old token */
- Tok = IFile->Tok;
- C = IFile->C;
- /* Save a pointer to the current struct, then set it back */
- I = IFile;
- IFile = I->Next;
+static void IDNextChar (CharSource* S)
+/* Read the next character from the input text */
+{
+ C = *S->V.Data.Pos++;
+ if (C == '\0') {
+ /* End of input data */
+ --S->V.Data.Pos;
+ C = EOF;
+ }
+}
+
+
+
+void IDDone (CharSource* S)
+/* Close the current input data */
+{
/* Cleanup the current stuff */
- fclose (I->F);
- xfree (I);
- --ICount;
+ if (S->V.Data.Malloced) {
+ xfree (S->V.Data.Text);
+ }
}
-void NewInputData (char* Data, int Malloced)
+/* Set of input data handling functions */
+static const CharSourceFunctions IDFunc = {
+ IDMarkStart,
+ IDNextChar,
+ IDDone
+};
+
+
+
+void NewInputData (char* Text, int Malloced)
/* Add a chunk of input data to the input stream */
{
- InputData* I;
+ CharSource* S;
- /* Create a new state variable and initialize it */
- I = xmalloc (sizeof (*I));
- I->Data = Data;
- I->Pos = Data;
- I->Malloced = Malloced;
- I->Tok = Tok;
- I->C = C;
+ /* Create a new input source variable and initialize it */
+ S = xmalloc (sizeof (*S));
+ S->Func = &IDFunc;
+ S->V.Data.Text = Text;
+ S->V.Data.Pos = Text;
+ S->V.Data.Malloced = Malloced;
- /* Use the new data */
- I->Next = IData;
- IData = I;
+ /* Use this input source */
+ UseCharSource (S);
+}
- /* Read the first character from the new file */
- NextChar ();
- /* Setup the next token so it will be skipped on the next call to
- * NextRawTok().
- */
- Tok = TOK_SEP;
-}
+
+/*****************************************************************************/
+/* Character classification functions */
+/*****************************************************************************/
-static void DoneInputData (void)
-/* End the current input data stream */
+int IsIdChar (int C)
+/* Return true if the character is a valid character for an identifier */
{
- InputData* I;
+ return IsAlNum (C) ||
+ (C == '_') ||
+ (C == '@' && AtInIdents) ||
+ (C == '$' && DollarInIdents);
+}
- /* Restore the old token */
- Tok = IData->Tok;
- C = IData->C;
- /* Save a pointer to the current struct, then set it back */
- I = IData;
- IData = I->Next;
- /* Cleanup the current stuff */
- if (I->Malloced) {
- xfree (I->Data);
- }
- xfree (I);
+int IsIdStart (int C)
+/* Return true if the character may start an identifier */
+{
+ return IsAlpha (C) || C == '_';
}
+/*****************************************************************************/
+/* Code */
+/*****************************************************************************/
+
+
+
static unsigned DigitVal (unsigned char C)
/* Convert a digit into it's numerical representation */
{
static void NextChar (void)
/* Read the next character from the input file */
{
- /* If we have an input data structure, read from there */
- if (IData) {
-
- C = *IData->Pos++;
- if (C == '\0') {
- /* End of input data */
- C = EOF;
- }
-
- } else {
-
- /* Check for end of line, read the next line if needed */
- while (IFile->Line [IFile->Pos.Col] == '\0') {
-
- unsigned Len, Removed;
-
- /* End of current line reached, read next line */
- if (fgets (IFile->Line, sizeof (IFile->Line), IFile->F) == 0) {
- /* End of file. Add an empty line to the listing. This is a
- * small hack needed to keep the PC output in sync.
- */
- NewListingLine ("", IFile->Pos.Name, ICount);
- C = EOF;
- return;
- }
-
- /* For better handling of files with unusual line endings (DOS
- * files that are accidently translated on Unix for example),
- * first remove all whitespace at the end, then add a single
- * newline.
- */
- Len = strlen (IFile->Line);
- Removed = 0;
- while (Len > 0 && IsSpace (IFile->Line[Len-1])) {
- ++Removed;
- --Len;
- }
- if (Removed) {
- IFile->Line[Len+0] = '\n';
- IFile->Line[Len+1] = '\0';
- }
-
- /* One more line */
- IFile->Pos.Line++;
- IFile->Pos.Col = 0;
-
- /* Remember the new line for the listing */
- NewListingLine (IFile->Line, IFile->Pos.Name, ICount);
-
- }
-
- /* Return the next character from the file */
- C = IFile->Line [IFile->Pos.Col++];
-
- }
+ Source->Func->NextChar (Source);
}
void LocaseSVal (void)
/* Make SVal lower case */
{
- unsigned I = 0;
- while (SVal [I]) {
- SVal [I] = tolower (SVal [I]);
- ++I;
- }
+ SB_ToLower (&SVal);
}
void UpcaseSVal (void)
/* Make SVal upper case */
{
- unsigned I = 0;
- while (SVal [I]) {
- SVal [I] = toupper (SVal [I]);
- ++I;
- }
+ SB_ToUpper (&SVal);
}
* return TOK_NONE if not found.
*/
{
- static const struct DotKeyword K = { SVal, 0 };
+ struct DotKeyword K;
struct DotKeyword* R;
+ /* Initialize K */
+ K.Key = SB_GetConstBuf (&SVal);
+ K.Tok = 0;
+
/* If we aren't in ignore case mode, we have to uppercase the keyword */
if (!IgnoreCase) {
UpcaseSVal ();
-static void ReadIdent (unsigned Index)
+static void ReadIdent (void)
/* Read an identifier from the current input position into Ident. Filling SVal
- * starts at Index with the current character in C. It is assumed that any
- * characters already filled in are ok, and the character in C is checked.
+ * starts at the current position with the next character in C. It is assumed
+ * that any characters already filled in are ok, and the character in C is
+ * checked.
*/
{
/* Read the identifier */
do {
- if (Index < MAX_STR_LEN) {
- SVal [Index++] = C;
- }
- NextChar ();
+ SB_AppendChar (&SVal, C);
+ NextChar ();
} while (IsIdChar (C));
- SVal [Index] = '\0';
+ SB_Terminate (&SVal);
/* If we should ignore case, convert the identifier to upper case */
if (IgnoreCase) {
-static unsigned ReadStringConst (int StringTerm)
-/* Read a string constant into SVal. Check for maximum string length and all
- * other stuff. The length of the string is returned.
- */
+static void ReadStringConst (int StringTerm)
+/* Read a string constant into SVal. */
{
- unsigned I;
-
/* Skip the leading string terminator */
NextChar ();
/* Read the string */
- I = 0;
while (1) {
if (C == StringTerm) {
break;
break;
}
- /* Check for string length, print an error message once */
- if (I == MAX_STR_LEN) {
- Error ("Maximum string size exceeded");
- } else if (I < MAX_STR_LEN) {
- SVal [I] = C;
- }
- ++I;
+ /* Append the char to the string */
+ SB_AppendChar (&SVal, C);
/* Skip the character */
NextChar ();
NextChar ();
/* Terminate the string */
- if (I >= MAX_STR_LEN) {
- I = MAX_STR_LEN;
- }
- SVal [I] = '\0';
-
- /* Return the length of the string */
- return I;
+ SB_Terminate (&SVal);
}
-static int Sweet16Reg (const char* Ident)
+static int Sweet16Reg (const StrBuf* Id)
/* Check if the given identifier is a sweet16 register. Return -1 if this is
* not the case, return the register number otherwise.
*/
unsigned RegNum;
char Check;
- if (Ident[0] != 'r' && Ident[0] != 'R') {
+ if (SB_GetLen (Id) < 2) {
+ return -1;
+ }
+ if (toupper (SB_AtUnchecked (Id, 0)) != 'R') {
return -1;
}
- if (!IsDigit (Ident[1])) {
+ if (!IsDigit (SB_AtUnchecked (Id, 1))) {
return -1;
}
- if (sscanf (Ident+1, "%u%c", &RegNum, &Check) != 1 || RegNum > 15) {
+ if (sscanf (SB_GetConstBuf (Id)+1, "%u%c", &RegNum, &Check) != 1 || RegNum > 15) {
/* Invalid register */
return -1;
}
} while (IsBlank (C));
}
- /* If we're reading from the file, update the location from where the
- * next token will be read. If we're reading from input data, keep the
- * current position.
- */
- if (IData == 0) {
- CurPos = IFile->Pos;
- }
+ /* Mark the file position of the next token */
+ Source->Func->MarkStart (Source);
+
+ /* Clear the string attribute */
+ SB_Clear (&SVal);
/* Hex number or PC symbol? */
if (C == '$') {
}
}
- /* Read the number */
+ /* Read the number */
IVal = 0;
while (IsXDigit (C)) {
if (IVal & 0xF0000000) {
Error ("Binary digit expected");
}
- /* Read the number */
+ /* Read the number */
IVal = 0;
while (IsBDigit (C)) {
if (IVal & 0x80000000) {
/* This is an integer constant */
Tok = TOK_INTCON;
- return;
+ return;
}
/* Control command? */
} else {
/* Read the remainder of the identifier */
- SVal[0] = '.';
- ReadIdent (1);
+ SB_AppendChar (&SVal, '.');
+ ReadIdent ();
/* Dot keyword, search for it */
Tok = FindDotKeyword ();
if (Tok == TOK_NONE) {
- /* Not found */
+ /* Not found */
if (!LeadingDotInIdents) {
/* Invalid pseudo instruction */
- Error ("`%s' is not a recognized control command", SVal);
+ Error ("`%m%p' is not a recognized control command", &SVal);
goto Again;
}
/* An identifier with a dot. Check if it's a define style
* macro.
*/
- if (IsDefine (SVal)) {
+ if (IsDefine (&SVal)) {
/* This is a define style macro - expand it */
MacExpandStart ();
goto Restart;
/* Local symbol? */
if (C == LocalStart) {
- /* Read the identifier */
- ReadIdent (0);
+ /* Read the identifier. */
+ ReadIdent ();
/* Start character alone is not enough */
- if (SVal [1] == '\0') {
+ if (SB_GetLen (&SVal) == 1) {
Error ("Invalid cheap local symbol");
goto Again;
}
if (IsIdStart (C)) {
/* Read the identifier */
- ReadIdent (0);
+ ReadIdent ();
/* Check for special names. Bail out if we have identified the type of
* the token. Go on if the token is an identifier.
*/
- if (SVal[1] == '\0') {
- switch (toupper (SVal [0])) {
+ if (SB_GetLen (&SVal) == 1) {
+ switch (toupper (SB_AtUnchecked (&SVal, 0))) {
case 'A':
if (C == ':') {
break;
case 'S':
- Tok = TOK_S;
- return;
+ if (CPU == CPU_65816) {
+ Tok = TOK_S;
+ return;
+ }
+ break;
case 'X':
Tok = TOK_X;
}
break;
- default:
+ default:
break;
}
- } else if (CPU == CPU_SWEET16 && (IVal = Sweet16Reg (SVal)) >= 0) {
+ } else if (CPU == CPU_SWEET16 && (IVal = Sweet16Reg (&SVal)) >= 0) {
/* A sweet16 register number in sweet16 mode */
Tok = TOK_REG;
}
/* Check for define style macro */
- if (IsDefine (SVal)) {
+ if (IsDefine (&SVal)) {
/* Macro - expand it */
MacExpandStart ();
goto Restart;
case '/':
NextChar ();
- Tok = TOK_DIV;
+ if (C != '*') {
+ Tok = TOK_DIV;
+ } else if (CComments) {
+ /* Remember the position, then skip the '*' */
+ FilePos Pos = CurPos;
+ NextChar ();
+ do {
+ while (C != '*') {
+ if (C == EOF) {
+ PError (&Pos, "Unterminated comment");
+ goto CharAgain;
+ }
+ NextChar ();
+ }
+ NextChar ();
+ } while (C != '/');
+ NextChar ();
+ goto Again;
+ }
return;
case '*':
case '^':
NextChar ();
- Tok = TOK_XOR;
+ Tok = TOK_XOR;
return;
case '&':
case ':':
NextChar ();
- switch (C) {
+ switch (C) {
case ':':
NextChar ();
case '#':
NextChar ();
- Tok = TOK_HASH;
+ Tok = TOK_HASH;
return;
case '(':
case '{':
NextChar ();
- Tok = TOK_LCURLY;
+ Tok = TOK_LCURLY;
return;
case '}':
return;
case '=':
- NextChar ();
+ NextChar ();
Tok = TOK_EQ;
return;
case '~':
NextChar ();
Tok = TOK_NOT;
- return;
+ return;
case '\'':
/* Hack: If we allow ' as terminating character for strings, read
* string later.
*/
if (LooseStringTerm) {
- if (ReadStringConst ('\'') == 1) {
- IVal = SVal[0];
+ ReadStringConst ('\'');
+ if (SB_GetLen (&SVal) == 1) {
+ IVal = SB_AtUnchecked (&SVal, 0);
Tok = TOK_CHARCON;
} else {
Tok = TOK_STRCON;
case '\\':
/* Line continuation? */
if (LineCont) {
- NextChar ();
- if (C == '\n') {
- /* Handle as white space */
- NextChar ();
- C = ' ';
- goto Again;
- }
- }
- break;
+ NextChar ();
+ if (C == '\n') {
+ /* Handle as white space */
+ NextChar ();
+ C = ' ';
+ goto Again;
+ }
+ }
+ break;
case '\n':
- NextChar ();
- Tok = TOK_SEP;
- return;
+ NextChar ();
+ Tok = TOK_SEP;
+ return;
case EOF:
- /* Check if we have any open .IFs in this file */
- CheckOpenIfs ();
- /* Check if we have any open token lists in this file */
- CheckInputStack ();
-
- /* If this was an include file, then close it and read the next
- * token. When an include file is opened, the last token of the
- * old file is not skipped, to prevent the lookahead to read
- * the next line of the old input file. So we do effectively
- * skip the last token in the old file (the file name of the
- * include statement).
- * In case of the main file, do not close it, but return EOF.
- */
- if (IData) {
- /* Input came from internal data */
- DoneInputData ();
- goto Again;
- } else if (ICount > 1) {
- DoneInputFile ();
+ CheckInputStack ();
+ /* In case of the main file, do not close it, but return EOF. */
+ if (Source && Source->Next) {
+ DoneCharSource ();
goto Again;
- } else {
- Tok = TOK_EOF;
- }
- return;
-
+ } else {
+ Tok = TOK_EOF;
+ }
+ return;
}
/* If we go here, we could not identify the current character. Skip it
-int TokHasSVal (enum Token Tok)
-/* Return true if the given token has an attached SVal */
-{
- return (Tok == TOK_IDENT || TOK_LOCAL_IDENT || Tok == TOK_STRCON);
-}
-
-
-
-int TokHasIVal (enum Token Tok)
-/* Return true if the given token has an attached IVal */
-{
- return (Tok == TOK_INTCON || Tok == TOK_CHARCON || Tok == TOK_REG);
-}
-
-
-
int GetSubKey (const char** Keys, unsigned Count)
/* Search for a subkey in a table of keywords. The current token must be an
* identifier and all keys must be in upper case. The identifier will be
/* Do a linear search (a binary search is not worth the effort) */
for (I = 0; I < Count; ++I) {
- if (strcmp (SVal, Keys [I]) == 0) {
+ if (SB_CompareStr (&SVal, Keys [I]) == 0) {
/* Found it */
return I;
}
* error message and return ADDR_SIZE_DEFAULT.
*/
{
- static const char* Keys[] = {
- "DIRECT", "ZEROPAGE", "ZP",
- "ABSOLUTE", "ABS", "NEAR",
- "FAR",
- "LONG", "DWORD",
- };
+ unsigned char AddrSize;
/* Check for an identifier */
if (Tok != TOK_IDENT) {
return ADDR_SIZE_DEFAULT;
}
- /* Search for the attribute */
- switch (GetSubKey (Keys, sizeof (Keys) / sizeof (Keys [0]))) {
- case 0:
- case 1:
- case 2: return ADDR_SIZE_ZP;
- case 3:
- case 4:
- case 5: return ADDR_SIZE_ABS;
- case 6: return ADDR_SIZE_FAR;
- case 7:
- case 8: return ADDR_SIZE_LONG;
- default:
- Error ("Address size specifier expected");
- return ADDR_SIZE_DEFAULT;
+ /* Convert the attribute */
+ AddrSize = AddrSizeFromStr (SB_GetConstBuf (&SVal));
+ if (AddrSize == ADDR_SIZE_INVALID) {
+ Error ("Address size specifier expected");
+ AddrSize = ADDR_SIZE_DEFAULT;
}
+
+ /* Done */
+ return AddrSize;
}
void DoneScanner (void)
/* Release scanner resources */
{
- DoneInputFile ();
+ DoneCharSource ();
}
projects / cc65 / blobdiff