Added PUTBASIC command and ported Thomas Harte's BASIC tokenisation c…

…ode.

Corrected a few small errors.

demo.asm

@@ -33,6 +33,7 @@ radius			= 100
 timerlength		= 64*8*26
 debugrasters	= FALSE
 
+
 \\ Define some zp locations
 
 ORG 0

src/VS2010/BeebAsm.vcxproj

@@ -76,6 +76,7 @@
   <ItemGroup>
     <ClCompile Include="..\asmexception.cpp" />
     <ClCompile Include="..\assemble.cpp" />
+    <ClCompile Include="..\BASIC.cpp" />
     <ClCompile Include="..\commands.cpp" />
     <ClCompile Include="..\discimage.cpp" />
     <ClCompile Include="..\expression.cpp" />
@@ -89,6 +90,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\asmexception.h" />
+    <ClInclude Include="..\BASIC.h" />
     <ClInclude Include="..\discimage.h" />
     <ClInclude Include="..\globaldata.h" />
     <ClInclude Include="..\lineparser.h" />

src/VS2010/BeebAsm.vcxproj.filters

@@ -51,6 +51,9 @@
     <ClCompile Include="..\symboltable.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\BASIC.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\asmexception.h">
@@ -83,5 +86,8 @@
     <ClInclude Include="..\tokens.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\BASIC.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

src/commands.cpp

@@ -34,6 +34,7 @@
 #include "sourcefile.h"
 #include "asmexception.h"
 #include "discimage.h"
+#include "BASIC.h"
 
 
 using namespace std;
@@ -1390,6 +1391,9 @@ void LineParser::HandlePrint()
 /*************************************************************************************************/
 void LineParser::HandlePutFile()
 {
+	// Syntax:
+	// PUTFILE <host filename>, [<beeb filename>,] <start addr> [,<exec addr>]
+
 	if ( !AdvanceAndCheckEndOfStatement() )
 	{
 		throw AsmException_SyntaxError_EmptyExpression( m_line, m_column );
@@ -1516,7 +1520,7 @@ void LineParser::HandlePutFile()
 	if ( GlobalData::Instance().IsSecondPass() )
 	{
 		ifstream inputFile;
-		inputFile.open( hostFilename, ios_base::in | ios_base::binary );
+		inputFile.open( hostFilename.c_str(), ios_base::in | ios_base::binary );
 
 		if ( !inputFile )
 		{
@@ -1620,5 +1624,35 @@ void LineParser::HandlePutBasic()
 	{
 		throw AsmException_SyntaxError_InvalidCharacter( m_line, m_column );
 	}
+
+	if ( GlobalData::Instance().IsSecondPass() &&
+		 GlobalData::Instance().UsesDiscImage() )
+	{
+		Uint8* buffer = new Uint8[ 0x10000 ];
+		int fileSize;
+		bool bSuccess = ImportBASIC( hostFilename.c_str(), buffer, &fileSize );
+
+		if (!bSuccess)
+		{
+			if (GetBASICErrorNum() == 2)
+			{
+				throw AsmException_AssembleError_FileOpen();
+			}
+			else
+			{
+				throw AsmException_FileError( hostFilename.c_str() );
+			}
+		}
+
+		// disc image version of the save
+		GlobalData::Instance().GetDiscImage()->AddFile( beebFilename.c_str(),
+														reinterpret_cast< unsigned char* >( buffer ),
+														0xFFFF1900,
+														0xFFFF8023,
+														fileSize );
+
+		delete [] buffer;
+	}
+
 }
 

src/globaldata.h

@@ -44,6 +44,7 @@ class GlobalData
 	inline void SetDiscImage( DiscImage* d )	{ m_pDiscImage = d; }
 	inline void ResetForId()					{ m_forId = 0; }
 	inline void SetSaved()						{ m_bSaved = true; }
+	inline void SetOutputFile( const char* p )	{ m_pOutputFile = p; }
 
 	inline int GetPass() const					{ return m_pass; }
 	inline bool IsFirstPass() const				{ return ( m_pass == 0 ); }
@@ -54,6 +55,7 @@ class GlobalData
 	inline DiscImage* GetDiscImage() const		{ return m_pDiscImage; }
 	inline int GetNextForId()					{ return m_forId++; }
 	inline bool IsSaved() const					{ return m_bSaved; }
+	inline const char* GetOutputFile() const	{ return m_pOutputFile; }
 
 
 private:
@@ -71,6 +73,7 @@ class GlobalData
 	int							m_forId;
 	int							m_randomSeed;
 	bool						m_bSaved;
+	const char*					m_pOutputFile;
 };
 
 

src/main.cpp

@@ -34,12 +34,13 @@
 #include "objectcode.h"
 #include "symboltable.h"
 #include "discimage.h"
+#include "BASIC.h"
 
 
 using namespace std;
 
 
-#define VERSION "1.04"
+#define VERSION "1.05"
 
 
 /*************************************************************************************************/
@@ -56,13 +57,15 @@ using namespace std;
 int main( int argc, char* argv[] )
 {
 	const char* pInputFile = NULL;
+	const char* pOutputFile = NULL;
 	const char* pDiscInputFile = NULL;
 	const char* pDiscOutputFile = NULL;
 
 	enum STATES
 	{
 		READY,
 		WAITING_FOR_INPUT_FILENAME,
+		WAITING_FOR_OUTPUT_FILENAME,
 		WAITING_FOR_DISC_INPUT_FILENAME,
 		WAITING_FOR_DISC_OUTPUT_FILENAME,
 		WAITING_FOR_BOOT_FILENAME
@@ -85,6 +88,10 @@ int main( int argc, char* argv[] )
 				{
 					state = WAITING_FOR_INPUT_FILENAME;
 				}
+				else if ( strcmp( argv[i], "-o" ) == 0 )
+				{
+					state = WAITING_FOR_OUTPUT_FILENAME;
+				}
 				else if ( strcmp( argv[i], "-do" ) == 0 )
 				{
 					state = WAITING_FOR_DISC_OUTPUT_FILENAME;
@@ -110,6 +117,7 @@ int main( int argc, char* argv[] )
 					cout << "beebasm " VERSION << endl << endl;
 					cout << "Possible options:" << endl;
 					cout << " -i <file>      Specify source filename" << endl;
+					cout << " -o <file>      Specify output filename (when not specified by SAVE command)" << endl;
 					cout << " -di <file>     Specify a disc image file to be added to" << endl;
 					cout << " -do <file>     Specify a disc image file to output" << endl;
 					cout << " -boot <file>   Specify a filename to be run by !BOOT on a new disc image" << endl;
@@ -134,6 +142,13 @@ int main( int argc, char* argv[] )
 				break;
 
 
+			case WAITING_FOR_OUTPUT_FILENAME:
+
+				pOutputFile = argv[i];
+				state = READY;
+				break;
+
+
 			case WAITING_FOR_DISC_OUTPUT_FILENAME:
 
 				pDiscOutputFile = argv[i];
@@ -160,7 +175,7 @@ int main( int argc, char* argv[] )
 	if ( state != READY )
 	{
 		cerr << "Parameter error -" << endl;
-		cerr << "Type beebasm -help for syntax" << endl;
+		cerr << "Type beebasm --help for syntax" << endl;
 		return EXIT_FAILURE;
 	}
 
@@ -186,6 +201,7 @@ int main( int argc, char* argv[] )
 
 	SymbolTable::Create();
 	ObjectCode::Create();
+	SetupBASICTables();
 
 	time_t randomSeed = time( NULL );