empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add .assert actions that aren't evaluated at assembly time.

Browse source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@4321 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2009-10-04 12:40:19 +00:00
parent a3529cd048
commit 1efebb9024
10 changed files with 170 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/ca65/asserts.c
View file

@ -34,7 +34,6 @@
/* common */ /* common */
#include "assertdefs.h"
#include "coll.h" #include "coll.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -57,10 +56,10 @@
/* An assertion entry */ /* An assertion entry */
typedef struct Assertion Assertion; typedef struct Assertion Assertion;
struct Assertion { struct Assertion {
ExprNode* Expr; /* Expression to evaluate */ ExprNode* Expr; /* Expression to evaluate */
unsigned Action; /* Action to take */ AssertAction Action; /* Action to take */
unsigned Msg; /* Message to print (if any) */ unsigned Msg; /* Message to print (if any) */
FilePos Pos; /* File position of assertion */ FilePos Pos; /* File position of assertion */
}; };
/* Collection with all assertions for a module */ /* Collection with all assertions for a module */
@ -74,7 +73,7 @@ static Collection Assertions = STATIC_COLLECTION_INITIALIZER;
static Assertion* NewAssertion (ExprNode* Expr, unsigned Action, unsigned Msg) static Assertion* NewAssertion (ExprNode* Expr, AssertAction Action, unsigned Msg)
/* Create a new Assertion struct and return it */ /* Create a new Assertion struct and return it */
{ {
/* Allocate memory */ /* Allocate memory */
@ -92,7 +91,7 @@ static Assertion* NewAssertion (ExprNode* Expr, unsigned Action, unsigned Msg)
void AddAssertion (ExprNode* Expr, unsigned Action, unsigned Msg) void AddAssertion (ExprNode* Expr, AssertAction Action, unsigned Msg)
/* Add an assertion to the assertion table */ /* Add an assertion to the assertion table */
{ {
/* Add an assertion object to the table */ /* Add an assertion object to the table */
@ -112,11 +111,17 @@ void CheckAssertions (void)
/* Check the assertions */ /* Check the assertions */
for (I = 0; I < Count; ++I) { for (I = 0; I < Count; ++I) {
long Val;
/* Get the next assertion */ /* Get the next assertion */
Assertion* A = CollAtUnchecked (&Assertions, I); Assertion* A = CollAtUnchecked (&Assertions, I);
/* Ignore it, if it should only be evaluated by the linker */
if (!AssertAtAsmTime (A->Action)) {
continue;
}
/* Can we evaluate the expression? */ /* Can we evaluate the expression? */
long Val;
if (IsConstExpr (A->Expr, &Val) && Val == 0) { if (IsConstExpr (A->Expr, &Val) && Val == 0) {
/* Apply the action */ /* Apply the action */
const char* Msg = GetString (A->Msg); const char* Msg = GetString (A->Msg);
@ -162,7 +167,7 @@ void WriteAssertions (void)
/* Write it to the file */ /* Write it to the file */
WriteExpr (A->Expr); WriteExpr (A->Expr);
ObjWriteVar (A->Action); ObjWriteVar ((unsigned) A->Action);
ObjWriteVar (A->Msg); ObjWriteVar (A->Msg);
ObjWritePos (&A->Pos); ObjWritePos (&A->Pos);
} }

11
src/ca65/asserts.h
View file

@ -6,8 +6,8 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2003-2005, Ullrich von Bassewitz */ /* (C) 2003-2009, Ullrich von Bassewitz */
/* Römerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
@ -38,6 +38,11 @@
/* common */
#include "assertion.h"
/*****************************************************************************/ /*****************************************************************************/
/* Data */ /* Data */
/*****************************************************************************/ /*****************************************************************************/
@ -55,7 +60,7 @@ struct ExprNode;
void AddAssertion (struct ExprNode* Expr, unsigned Action, unsigned Msg); void AddAssertion (struct ExprNode* Expr, AssertAction Action, unsigned Msg);
/* Add an assertion to the assertion table */ /* Add an assertion to the assertion table */
void CheckAssertions (void); void CheckAssertions (void);

5
src/ca65/instr.c
View file

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2008, Ullrich von Bassewitz */ /* (C) 1998-2009, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@ -39,7 +39,6 @@
/* common */ /* common */
#include "addrsize.h" #include "addrsize.h"
#include "assertdefs.h"
#include "attrib.h" #include "attrib.h"
#include "bitops.h" #include "bitops.h"
#include "check.h" #include "check.h"
@ -60,7 +59,7 @@
#include "studyexpr.h" #include "studyexpr.h"
#include "symtab.h" #include "symtab.h"
/*****************************************************************************/ /*****************************************************************************/
/* Forwards */ /* Forwards */

30
src/ca65/pseudo.c
View file

@ -40,7 +40,7 @@
#include <errno.h> #include <errno.h>
/* common */ /* common */
#include "assertdefs.h" #include "assertion.h"
#include "bitops.h" #include "bitops.h"
#include "cddefs.h" #include "cddefs.h"
#include "coll.h" #include "coll.h"
@ -408,11 +408,13 @@ static void DoAssert (void)
{ {
static const char* ActionTab [] = { static const char* ActionTab [] = {
"WARN", "WARNING", "WARN", "WARNING",
"ERROR" "ERROR",
"LDWARN", "LDWARNING",
"LDERROR",
}; };
int Action; AssertAction Action;
unsigned Msg; unsigned Msg;
/* First we have the expression that has to evaluated */ /* First we have the expression that has to evaluated */
ExprNode* Expr = Expression (); ExprNode* Expr = Expression ();
@ -423,8 +425,7 @@ static void DoAssert (void)
ErrorSkip ("Identifier expected"); ErrorSkip ("Identifier expected");
return; return;
} }
Action = GetSubKey (ActionTab, sizeof (ActionTab) / sizeof (ActionTab[0])); switch (GetSubKey (ActionTab, sizeof (ActionTab) / sizeof (ActionTab[0]))) {
switch (Action) {
case 0: case 0:
case 1: case 1:
@ -437,8 +438,23 @@ static void DoAssert (void)
Action = ASSERT_ACT_ERROR; Action = ASSERT_ACT_ERROR;
break; break;
case 3:
case 4:
/* Linker warning */
Action = ASSERT_ACT_LDWARN;
break;
case 5:
/* Linker error */
Action = ASSERT_ACT_LDERROR;
break;
default: default:
Error ("Illegal assert action specifier"); Error ("Illegal assert action specifier");
/* Use lderror - there won't be an .o file anyway */
Action = ASSERT_ACT_LDERROR;
break;
} }
NextTok (); NextTok ();
@ -470,7 +486,7 @@ static void DoAssert (void)
} }
/* Remember the assertion */ /* Remember the assertion */
AddAssertion (Expr, Action, Msg); AddAssertion (Expr, (AssertAction) Action, Msg);
} }

32
src/common/assertdefs.h → src/common/assertion.c
View file

@ -1,15 +1,15 @@
/*****************************************************************************/ /*****************************************************************************/
/* */ /* */
/* assertdefs.h */ /* assertion.c */
/* */ /* */
/* Definitions for linker assertions */ /* Definitions for linker assertions */
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2003 Ullrich von Bassewitz */ /* (C) 2003-2009, Ullrich von Bassewitz */
/* Römerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@ -33,26 +33,30 @@
#ifndef ASSERTDEFS_H #include "assertion.h"
#define ASSERTDEFS_H
/*****************************************************************************/ /*****************************************************************************/
/* Data */ /* Code */
/*****************************************************************************/ /*****************************************************************************/
/* Assertion actions */ int AssertAtLinkTime (AssertAction A)
#define ASSERT_ACT_WARN 0x00 /* Print a warning */ /* Return true if this assertion should be evaluated at link time */
#define ASSERT_ACT_ERROR 0x01 /* Print an error (no output) */ {
/* Currently all assertions are evaluated at link time */
return 1;
}
/* End of assertdefs.h */ int AssertAtAsmTime (AssertAction A)
/* Return true if this assertion should be evaluated at assembly time */
#endif {
return (A & 0x02U) == 0;
}

76
src/common/assertion.h Normal file
View file

@ -0,0 +1,76 @@
/*****************************************************************************/
/* */
/* assertion.h */
/* */
/* Definitions for linker assertions */
/* */
/* */
/* */
/* (C) 2003-2009, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* warranty. In no event will the authors be held liable for any damages */
/* arising from the use of this software. */
/* */
/* Permission is granted to anyone to use this software for any purpose, */
/* including commercial applications, and to alter it and redistribute it */
/* freely, subject to the following restrictions: */
/* */
/* 1. The origin of this software must not be misrepresented; you must not */
/* claim that you wrote the original software. If you use this software */
/* in a product, an acknowledgment in the product documentation would be */
/* appreciated but is not required. */
/* 2. Altered source versions must be plainly marked as such, and must not */
/* be misrepresented as being the original software. */
/* 3. This notice may not be removed or altered from any source */
/* distribution. */
/* */
/*****************************************************************************/
#ifndef ASSERTION_H
#define ASSERTION_H
/*****************************************************************************/
/* Data */
/*****************************************************************************/
/* Assertion actions. The second two are linker only (not evaluated by ca65) */
typedef enum {
ASSERT_ACT_WARN = 0x00U, /* Print a warning */
ASSERT_ACT_ERROR = 0x01U, /* Print an error */
ASSERT_ACT_LDWARN = 0x02U, /* Print a warning (linker only) */
ASSERT_ACT_LDERROR = 0x03U, /* Print an error (linker only) */
} AssertAction;
/*****************************************************************************/
/* Code */
/*****************************************************************************/
int AssertAtLinkTime (AssertAction A);
/* Return true if this assertion should be evaluated at link time */
int AssertAtAsmTime (AssertAction A);
/* Return true if this assertion should be evaluated at assembly time */
/* End of assertion.h */
#endif

1
src/common/make/gcc.mak
View file

@ -11,6 +11,7 @@ LIB = common.a
OBJS = abend.o \ OBJS = abend.o \
addrsize.o \ addrsize.o \
assertion.o \
bitops.o \ bitops.o \
chartype.o \ chartype.o \
check.o \ check.o \

1
src/common/make/watcom.mak
View file

@ -57,6 +57,7 @@ endif
OBJS = abend.obj \ OBJS = abend.obj \
addrsize.obj \ addrsize.obj \
assertion.obj \
bitops.obj \ bitops.obj \
chartype.obj \ chartype.obj \
check.obj \ check.obj \

22
src/ld65/asserts.c
View file

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2003-2008, Ullrich von Bassewitz */ /* (C) 2003-2009, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@ -34,7 +34,7 @@
/* common */ /* common */
#include "assertdefs.h" #include "assertion.h"
#include "coll.h" #include "coll.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -54,6 +54,15 @@
/* Assertion struct decl */
struct Assertion {
FilePos Pos; /* File position of assertion */
ExprNode* Expr; /* Expression to evaluate */
AssertAction Action; /* What to do */
unsigned Msg; /* Message to print */
ObjData* Obj; /* Object file containing the assertion */
};
/* List with all assertions */ /* List with all assertions */
static Collection Assertions = STATIC_COLLECTION_INITIALIZER; static Collection Assertions = STATIC_COLLECTION_INITIALIZER;
@ -73,7 +82,7 @@ Assertion* ReadAssertion (FILE* F, struct ObjData* O)
/* Read the fields from the file */ /* Read the fields from the file */
A->Expr = ReadExpr (F, O); A->Expr = ReadExpr (F, O);
A->Action = ReadVar (F); A->Action = (AssertAction) ReadVar (F);
A->Msg = MakeGlobalStringId (O, ReadVar (F)); A->Msg = MakeGlobalStringId (O, ReadVar (F));
ReadFilePos (F, &A->Pos); ReadFilePos (F, &A->Pos);
@ -100,6 +109,11 @@ void CheckAssertions (void)
/* Get the assertion */ /* Get the assertion */
Assertion* A = CollAtUnchecked (&Assertions, I); Assertion* A = CollAtUnchecked (&Assertions, I);
/* Ignore assertions that shouldn't be handled at link time */
if (!AssertAtLinkTime (A->Action)) {
continue;
}
/* If the expression is not constant, we're not able to handle it */ /* If the expression is not constant, we're not able to handle it */
if (!IsConstExpr (A->Expr)) { if (!IsConstExpr (A->Expr)) {
Warning ("Cannot evaluate assertion in module `%s', line %lu", Warning ("Cannot evaluate assertion in module `%s', line %lu",
@ -113,10 +127,12 @@ void CheckAssertions (void)
switch (A->Action) { switch (A->Action) {
case ASSERT_ACT_WARN: case ASSERT_ACT_WARN:
case ASSERT_ACT_LDWARN:
Warning ("%s(%lu): %s", Module, A->Pos.Line, Message); Warning ("%s(%lu): %s", Module, A->Pos.Line, Message);
break; break;
case ASSERT_ACT_ERROR: case ASSERT_ACT_ERROR:
case ASSERT_ACT_LDERROR:
Error ("%s(%lu): %s", Module, A->Pos.Line, Message); Error ("%s(%lu): %s", Module, A->Pos.Line, Message);
break; break;

20
src/ld65/asserts.h
View file

@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2003 Ullrich von Bassewitz */ /* (C) 2003-2009, Ullrich von Bassewitz */
/* Römerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@ -51,15 +51,11 @@
/* Assertion object */ /* Assertion object forward decl */
typedef struct Assertion Assertion; typedef struct Assertion Assertion;
struct Assertion {
FilePos Pos; /* File position of assertion */ /* ObjData forward decl */
struct ExprNode* Expr; /* Expression to evaluate */ struct ObjData;
unsigned Action; /* What to do */
unsigned Msg; /* Message to print */
struct ObjData* Obj; /* Object file containing the assertion */
};