the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented new .PUSHCPU and .POPCPU commands.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@4644 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2010-04-18 18:47:16 +00:00
parent 922cbf08eb
commit bfd8f4e108
6 changed files with 94 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ca65/main.c
View File

@@ -956,9 +956,9 @@ int main (int argc, char* argv [])
/* Assemble the input */
Assemble ();
/* If we didn't have any errors, check the segment stack */
/* If we didn't have any errors, check the pseudo insn stacks */
if (ErrorCount == 0) {
SegStackCheck ();
CheckPseudo ();
}
/* If we didn't have any errors, check the unnamed labels */

47
src/ca65/pseudo.c
View File

@@ -44,6 +44,7 @@
#include "bitops.h"
#include "cddefs.h"
#include "coll.h"
#include "intstack.h"
#include "symdefs.h"
#include "tgttrans.h"
#include "xmalloc.h"
@@ -86,6 +87,9 @@
/* Keyword we're about to handle */
static StrBuf Keyword = STATIC_STRBUF_INITIALIZER;
/* CPU stack */
static IntStack CPUStack = STATIC_INTSTACK_INITIALIZER;
/* Segment stack */
#define MAX_PUSHED_SEGMENTS 16
static Collection SegStack = STATIC_COLLECTION_INITIALIZER;
@@ -1412,6 +1416,21 @@ static void DoPageLength (void)
static void DoPopCPU (void)
/* Pop an old CPU setting from the CPU stack */
{
/* Must have a CPU on the stack */
if (IS_IsEmpty (&CPUStack)) {
ErrorSkip ("CPU stack is empty");
return;
}
/* Set the CPU to the value popped from stack */
SetCPU (IS_Pop (&CPUStack));
}
static void DoPopSeg (void)
/* Pop an old segment from the segment stack */
{
@@ -1486,6 +1505,21 @@ static void DoPSC02 (void)
static void DoPushCPU (void)
/* Push the current CPU setting onto the CPU stack */
{
/* Can only push a limited size of segments */
if (IS_IsFull (&CPUStack)) {
ErrorSkip ("CPU stack overflow");
return;
}
/* Get the current segment and push it */
IS_Push (&CPUStack, GetCPU ());
}
static void DoPushSeg (void)
/* Push the current segment onto the segment stack */
{
@@ -1865,7 +1899,7 @@ static CtrlDesc CtrlCmdTab [] = {
{ ccNone, DoUnexpected }, /* .MAX */
{ ccNone, DoInvalid }, /* .MID */
{ ccNone, DoUnexpected }, /* .MIN */
{ ccNone, DoNull },
{ ccNone, DoNull },
{ ccNone, DoOrg },
{ ccNone, DoOut },
{ ccNone, DoP02 },
@@ -1873,9 +1907,11 @@ static CtrlDesc CtrlCmdTab [] = {
{ ccNone, DoPageLength },
{ ccNone, DoUnexpected }, /* .PARAMCOUNT */
{ ccNone, DoPC02 },
{ ccNone, DoPopCPU },
{ ccNone, DoPopSeg },
{ ccNone, DoProc },
{ ccNone, DoPSC02 },
{ ccNone, DoPushCPU },
{ ccNone, DoPushSeg },
{ ccNone, DoUnexpected }, /* .REFERENCED */
{ ccNone, DoReloc },
@@ -1944,11 +1980,14 @@ void HandlePseudo (void)
void SegStackCheck (void)
/* Check if the segment stack is empty at end of assembly */
void CheckPseudo (void)
/* Check if the stacks are empty at end of assembly */
{
if (CollCount (&SegStack) != 0) {
Error ("Segment stack is not empty");
Warning (1, "Segment stack is not empty");
}
if (!IS_IsEmpty (&CPUStack)) {
Warning (1, "CPU stack is not empty");
}
}

16
src/ca65/pseudo.h
View File

@@ -1,15 +1,15 @@
/*****************************************************************************/
/* */
/* pseudo.h */
/* pseudo.h */
/* */
/* Pseudo instructions for the ca65 macroassembler */
/* Pseudo instructions for the ca65 macroassembler */
/* */
/* */
/* */
/* (C) 1998-2008 Ullrich von Bassewitz */
/* Roemerstrasse 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 */
@@ -61,8 +61,8 @@ extern unsigned OpenIfs;
void HandlePseudo (void);
/* Handle a pseudo instruction */
void SegStackCheck (void);
/* Check if the segment stack is empty at end of assembly */
void CheckPseudo (void);
/* Check if the stacks are empty at end of assembly */

4
src/ca65/scanner.c
View File

@@ -251,9 +251,11 @@ struct DotKeyword {
{ ".PAGELENGTH", TOK_PAGELENGTH },
{ ".PARAMCOUNT", TOK_PARAMCOUNT },
{ ".PC02", TOK_PC02 },
{ ".POPCPU", TOK_POPCPU },
{ ".POPSEG", TOK_POPSEG },
{ ".PROC", TOK_PROC },
{ ".PSC02", TOK_PSC02 },
{ ".PUSHCPU", TOK_PUSHCPU },
{ ".PUSHSEG", TOK_PUSHSEG },
{ ".REF", TOK_REFERENCED },
{ ".REFERENCED", TOK_REFERENCED },
@@ -345,7 +347,7 @@ static void DoneCharSource (void)
/*****************************************************************************/
/* InputFile functions */
/*****************************************************************************/
static void IFMarkStart (CharSource* S)

12
src/ca65/token.h
View File

@@ -6,10 +6,10 @@
/* */
/* */
/* */
/* (C) 2007 Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* (C) 2007-2010, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
@@ -217,9 +217,11 @@ typedef enum Token {
TOK_PAGELENGTH,
TOK_PARAMCOUNT,
TOK_PC02,
TOK_POPCPU,
TOK_POPSEG,
TOK_PROC,
TOK_PSC02,
TOK_PSC02,
TOK_PUSHCPU,
TOK_PUSHSEG,
TOK_REFERENCED,
TOK_RELOC,