6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-27 00:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix a problem with conditional assembly: The scanner has to be switched into

Browse Source 
raw token mode when skipping a section of input because otherwise pseudo
functions may trigger errors.


git-svn-id: svn://svn.cc65.org/cc65/trunk@5033 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2011-06-05 14:28:56 +00:00
parent 6a56201046
commit 6a48359d23
3 changed files with 115 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
src/ca65/condasm.c
View File

@ -59,9 +59,12 @@ enum {
ifNone = 0x0000, /* No flag */ ifNone = 0x0000, /* No flag */
ifCond = 0x0001, /* IF condition was true */ ifCond = 0x0001, /* IF condition was true */
ifElse = 0x0002, /* We had a .ELSE branch */ ifElse = 0x0002, /* We had a .ELSE branch */
ifNeedTerm = 0x0004 /* Need .ENDIF termination */ ifNeedTerm = 0x0004, /* Need .ENDIF termination */
}; };
/* The overall .IF condition */
int IfCond = 1;
/*****************************************************************************/ /*****************************************************************************/
@ -126,12 +129,12 @@ static void FreeIf (void)
{ {
int Done; int Done;
do { do {
IfDesc* D = GetCurrentIf(); IfDesc* ID = GetCurrentIf();
if (D == 0) { if (ID == 0) {
Error (" Unexpected .ENDIF"); Error (" Unexpected .ENDIF");
Done = 1; Done = 1;
} else { } else {
Done = (D->Flags & ifNeedTerm) != 0; Done = (ID->Flags & ifNeedTerm) != 0;
--IfCount; --IfCount;
} }
} while (!Done); } while (!Done);
@ -139,16 +142,17 @@ static void FreeIf (void)
static int GetCurrentIfCond (void) static void CalcOverallIfCond (void)
/* Return the current condition based on all conditions on the stack */ /* Caclulate the overall condition based on all conditions on the stack */
{ {
unsigned Count; unsigned Count;
IfCond = 1;
for (Count = 0; Count < IfCount; ++Count) { for (Count = 0; Count < IfCount; ++Count) {
if ((IfStack[Count].Flags & ifCond) == 0) { if ((IfStack[Count].Flags & ifCond) == 0) {
return 0; IfCond = 0;
break;
} }
} }
return 1;
} }
@ -165,30 +169,24 @@ static void SetIfCond (IfDesc* ID, int C)
static void InvertIfCond (IfDesc* ID) static void ElseClause (IfDesc* ID, const char* Directive)
/* Invert the current condition */ /* Enter an .ELSE clause */
{ {
ID->Flags ^= ifCond; /* Check if we have an open .IF - otherwise .ELSE is not allowed */
if (ID == 0) {
Error ("Unexpected %s", Directive);
return;
} }
/* Check for a duplicate else, then remember that we had one */
if (ID->Flags & ifElse) {
static int GetElse (const IfDesc* ID) /* We already had a .ELSE ! */
/* Return true if we had a .ELSE */ Error ("Duplicate .ELSE");
{
return (ID->Flags & ifElse) != 0;
} }
static void SetElse (IfDesc* ID, int E)
/* Set the .ELSE flag */
{
if (E) {
ID->Flags |= ifElse; ID->Flags |= ifElse;
} else {
ID->Flags &= ~ifElse; /* Condition is inverted now */
} ID->Flags ^= ifCond;
} }
@ -204,41 +202,32 @@ void DoConditionals (void)
{ {
IfDesc* D; IfDesc* D;
int IfCond = GetCurrentIfCond ();
do { do {
switch (CurTok.Tok) { switch (CurTok.Tok) {
case TOK_ELSE: case TOK_ELSE:
D = GetCurrentIf (); D = GetCurrentIf ();
if (D == 0) {
Error ("Unexpected .ELSE");
} else if (GetElse(D)) {
/* We already had a .ELSE ! */
Error ("Duplicate .ELSE");
} else {
/* Allow an .ELSE */ /* Allow an .ELSE */
InvertIfCond (D); ElseClause (D, ".ELSE");
SetElse (D, 1);
/* Remember the data for the .ELSE */
GetFullLineInfo (&D->LineInfos, 0); GetFullLineInfo (&D->LineInfos, 0);
D->Name = ".ELSE"; D->Name = ".ELSE";
IfCond = GetCurrentIfCond ();
} /* Calculate the new overall condition */
CalcOverallIfCond ();
/* Skip .ELSE */
NextTok (); NextTok ();
ExpectSep (); ExpectSep ();
break; break;
case TOK_ELSEIF: case TOK_ELSEIF:
D = GetCurrentIf (); D = GetCurrentIf ();
if (D == 0) {
Error ("Unexpected .ELSEIF");
} else if (GetElse(D)) {
/* We already had a .ELSE */
Error ("Duplicate .ELSE");
} else {
/* Handle as if there was an .ELSE first */ /* Handle as if there was an .ELSE first */
InvertIfCond (D); ElseClause (D, ".ELSEIF");
SetElse (D, 1);
/* Allocate and prepare a new descriptor */ /* Allocate and prepare a new descriptor */
D = AllocIf (".ELSEIF", 0); D = AllocIf (".ELSEIF", 0);
@ -254,8 +243,7 @@ void DoConditionals (void)
} }
/* Get the new overall condition */ /* Get the new overall condition */
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
}
break; break;
case TOK_ENDIF: case TOK_ENDIF:
@ -269,7 +257,7 @@ void DoConditionals (void)
ExpectSep (); ExpectSep ();
/* Get the new overall condition */ /* Get the new overall condition */
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
case TOK_IF: case TOK_IF:
@ -279,7 +267,7 @@ void DoConditionals (void)
SetIfCond (D, ConstExpression ()); SetIfCond (D, ConstExpression ());
ExpectSep (); ExpectSep ();
} }
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
case TOK_IFBLANK: case TOK_IFBLANK:
@ -293,7 +281,7 @@ void DoConditionals (void)
SkipUntilSep (); SkipUntilSep ();
} }
} }
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
case TOK_IFCONST: case TOK_IFCONST:
@ -305,7 +293,7 @@ void DoConditionals (void)
FreeExpr (Expr); FreeExpr (Expr);
ExpectSep (); ExpectSep ();
} }
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
case TOK_IFDEF: case TOK_IFDEF:
@ -315,7 +303,7 @@ void DoConditionals (void)
SymEntry* Sym = ParseAnySymName (SYM_FIND_EXISTING); SymEntry* Sym = ParseAnySymName (SYM_FIND_EXISTING);
SetIfCond (D, Sym != 0 && SymIsDef (Sym)); SetIfCond (D, Sym != 0 && SymIsDef (Sym));
} }
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
case TOK_IFNBLANK: case TOK_IFNBLANK:
@ -329,7 +317,7 @@ void DoConditionals (void)
SkipUntilSep (); SkipUntilSep ();
} }
} }
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
case TOK_IFNCONST: case TOK_IFNCONST:
@ -341,7 +329,7 @@ void DoConditionals (void)
FreeExpr (Expr); FreeExpr (Expr);
ExpectSep (); ExpectSep ();
} }
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
case TOK_IFNDEF: case TOK_IFNDEF:
@ -352,7 +340,7 @@ void DoConditionals (void)
SetIfCond (D, Sym == 0 || !SymIsDef (Sym)); SetIfCond (D, Sym == 0 || !SymIsDef (Sym));
ExpectSep (); ExpectSep ();
} }
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
case TOK_IFNREF: case TOK_IFNREF:
@ -363,7 +351,7 @@ void DoConditionals (void)
SetIfCond (D, Sym == 0 || !SymIsRef (Sym)); SetIfCond (D, Sym == 0 || !SymIsRef (Sym));
ExpectSep (); ExpectSep ();
} }
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
case TOK_IFP02: case TOK_IFP02:
@ -372,8 +360,8 @@ void DoConditionals (void)
if (IfCond) { if (IfCond) {
SetIfCond (D, GetCPU() == CPU_6502); SetIfCond (D, GetCPU() == CPU_6502);
} }
IfCond = GetCurrentIfCond ();
ExpectSep (); ExpectSep ();
CalcOverallIfCond ();
break; break;
case TOK_IFP816: case TOK_IFP816:
@ -382,8 +370,8 @@ void DoConditionals (void)
if (IfCond) { if (IfCond) {
SetIfCond (D, GetCPU() == CPU_65816); SetIfCond (D, GetCPU() == CPU_65816);
} }
IfCond = GetCurrentIfCond ();
ExpectSep (); ExpectSep ();
CalcOverallIfCond ();
break; break;
case TOK_IFPC02: case TOK_IFPC02:
@ -392,8 +380,8 @@ void DoConditionals (void)
if (IfCond) { if (IfCond) {
SetIfCond (D, GetCPU() == CPU_65C02); SetIfCond (D, GetCPU() == CPU_65C02);
} }
IfCond = GetCurrentIfCond ();
ExpectSep (); ExpectSep ();
CalcOverallIfCond ();
break; break;
case TOK_IFPSC02: case TOK_IFPSC02:
@ -402,8 +390,8 @@ void DoConditionals (void)
if (IfCond) { if (IfCond) {
SetIfCond (D, GetCPU() == CPU_65SC02); SetIfCond (D, GetCPU() == CPU_65SC02);
} }
IfCond = GetCurrentIfCond ();
ExpectSep (); ExpectSep ();
CalcOverallIfCond ();
break; break;
case TOK_IFREF: case TOK_IFREF:
@ -414,7 +402,7 @@ void DoConditionals (void)
SetIfCond (D, Sym != 0 && SymIsRef (Sym)); SetIfCond (D, Sym != 0 && SymIsRef (Sym));
ExpectSep (); ExpectSep ();
} }
IfCond = GetCurrentIfCond (); CalcOverallIfCond ();
break; break;
default: default:
@ -488,6 +476,9 @@ void CheckOpenIfs (void)
LIError (&D->LineInfos, "Conditional assembly branch was never closed"); LIError (&D->LineInfos, "Conditional assembly branch was never closed");
FreeIf (); FreeIf ();
} }
/* Calculate the new overall .IF condition */
CalcOverallIfCond ();
} }
@ -506,6 +497,9 @@ void CleanupIfStack (unsigned SP)
while (IfCount > SP) { while (IfCount > SP) {
FreeIf (); FreeIf ();
} }
/* Calculate the new overall .IF condition */
CalcOverallIfCond ();
} }

15
src/ca65/condasm.h
View File

@ -6,8 +6,8 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000-2003 Ullrich von Bassewitz */ /* (C) 2000-2011, Ullrich von Bassewitz */
/* Römerstraße 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
@ -38,6 +38,17 @@
/*****************************************************************************/
/* Data */
/*****************************************************************************/
/* The overall .IF condition */
extern int IfCond;
/*****************************************************************************/ /*****************************************************************************/
/* Code */ /* Code */
/*****************************************************************************/ /*****************************************************************************/

7
src/ca65/nexttok.c
View File

@ -42,6 +42,7 @@
#include "strbuf.h" #include "strbuf.h"
/* ca65 */ /* ca65 */
#include "condasm.h"
#include "error.h" #include "error.h"
#include "expr.h" #include "expr.h"
#include "global.h" #include "global.h"
@ -661,8 +662,10 @@ void NextTok (void)
/* Get the next raw token */ /* Get the next raw token */
NextRawTok (); NextRawTok ();
/* In raw mode, pass the token unchanged */ /* In raw mode, or when output is suppressed via conditional assembly,
if (RawMode == 0) { * pass the token unchanged.
*/
if (RawMode == 0 && IfCond) {
/* Execute token handling functions */ /* Execute token handling functions */
switch (CurTok.Tok) { switch (CurTok.Tok) {