test

asm.cpp

@@ -464,12 +464,12 @@ void CLASS::complete(void)
 {
 
 	uint64_t n = GetTickCount();
-	if (isDebug())
+	//if (isDebug())
 	{
 		//cout << "Processing Time: " << n - starttime << "ms" << endl;
 		uint64_t x = n - starttime;
 		uint32_t x1 = x & 0xFFFFFFFF;
-		printf("Processing Time: %u ms\n", x1);
+		printf("Elapsed time: %u ms\n", x1);
 
 	}
 }
@@ -614,7 +614,7 @@ int CLASS::processfile(std::string p, std::string &newfilename)
 		{
 			// is this the first file in the compilation, or a PUT/USE?
 			// if first, change CWD to location of file
-			LOG_DEBUG << "Changing directory to: " << dir << endl;
+			//LOG_DEBUG << "Changing directory to: " << dir << endl;
 			if (chdir(dir.c_str())) {} // change directory to where the file is
 		}
 
@@ -1284,8 +1284,6 @@ void CLASS::initpass(void)
 
 void CLASS::complete(void)
 {
-	printf("\n\n=== Assembly Complete: %d bytes %u errors.\n", PC.totalbytes, errorct);
-
 	if (savepath != "")
 	{
 		if (errorct == 0)
@@ -1317,13 +1315,16 @@ void CLASS::complete(void)
 		}
 	}
 
+	printf("\n\nEnd qASM assembly, %d bytes, %u errors, %lu lines, %lu symbols.\n", PC.totalbytes, errorct,lines.size(),symbols.size());
+
+	TFileProcessor::complete();
+
 	if (listing)
 	{
 		showSymbolTable(true);
 		showSymbolTable(false);
 		showVariables();
 	}
-	TFileProcessor::complete();
 }
 
 int CLASS::evaluate(MerlinLine &line, std::string expr, int64_t &value)

asm.h

@@ -64,6 +64,7 @@ enum asmErrors
 	errBadCharacter,
 	errUnexpectedOp,
 	errUnexpectedEOF,
+	errBadLUPOperand,
 	errMAX
 };
 
@@ -96,6 +97,7 @@ const std::string errStrings[errMAX + 1] =
 	"Unexpected character in input",
 	"Unexpected opcode",
 	"Unexpected End of File",
+	"LUP value must be 0 < VAL <= $8000"
 
 	""
 };

psuedo.cpp

@@ -16,8 +16,11 @@ CLASS::~CLASS()
 int CLASS::doLUP(T65816Asm &a, MerlinLine &line, TSymbol &opinfo)
 {
 	UNUSED(opinfo);
-	UNUSED(line);
-	UNUSED(a);
+
+	TEvaluator eval(a);
+
+	int64_t eval_result = 0;
+	uint8_t shift;
 	int lidx, len;
 	int res = 0;
 	int err = 0;
@@ -29,15 +32,26 @@ int CLASS::doLUP(T65816Asm &a, MerlinLine &line, TSymbol &opinfo)
 		len = line.lineno - 1; // MerlinLine line numbers are +1 from actual array idx
 		if (len >= 0)
 		{
+
+			shift = 0;
+			eval_result = 0;
+			int x = eval.evaluate(line.operand, eval_result, shift);
+			if ((x < 0) || (eval_result<=0) || (eval_result>0x8000))
+			{
+				// merlin just ignores LUP if the value is out of range
+				a.curLUP.lupct=0;
+				goto out;
+			}
+
+
 			a.LUPstack.push(a.curLUP);
 
 			a.curLUP.lupoffset = len;
-			a.curLUP.lupct = 3; // evaluate here
+			a.curLUP.lupct = eval_result&0xFF; // evaluate here
 			a.curLUP.luprunning++;
 		}
 		else
 		{
-			printf("err 3\n");
 			err = errUnexpectedOp;
 		}
 	}
@@ -58,6 +72,9 @@ int CLASS::doLUP(T65816Asm &a, MerlinLine &line, TSymbol &opinfo)
 					goto out;
 				}
 			}
+			// kind of a silent error here, just make sure we reinitialize
+			a.curLUP.luprunning=0;
+			a.curLUP.lupct=0;
 
 			//printf("start=%d end=%d len=%d\n", a.curLUP.lupoffset, lidx, len);
 			if (a.LUPstack.size() > 0)
@@ -67,14 +84,13 @@ int CLASS::doLUP(T65816Asm &a, MerlinLine &line, TSymbol &opinfo)
 			}
 			else
 			{
-				printf("err 2\n");
 				err = errUnexpectedOp;
 			}
 		}
 		else
 		{
-			printf("err 1\n");
-			err = errUnexpectedOp;
+			// SGQ - found a '--^' without a LUP, should we just ignore?
+			//err = errUnexpectedOp;
 		}
 	}
 
@@ -367,7 +383,7 @@ int CLASS::ProcessOpcode(T65816Asm &a, MerlinLine &line, TSymbol &opinfo)
 		case P_DUM:
 		case P_DEND:
 			res = doDUM(a, line, opinfo);
-			line.flags|=FLAG_FORCEADDRPRINT;
+			line.flags |= FLAG_FORCEADDRPRINT;
 
 			break;
 		case P_ORG:
@@ -382,7 +398,7 @@ int CLASS::ProcessOpcode(T65816Asm &a, MerlinLine &line, TSymbol &opinfo)
 				a.PC.currentpc = a.PC.orgsave;
 				line.startpc = a.PC.orgsave;
 			}
-			line.flags|=FLAG_FORCEADDRPRINT;
+			line.flags |= FLAG_FORCEADDRPRINT;
 			break;
 		case P_SAV:
 			a.savepath = a.processFilename(line.operand, Poco::Path::current(), 0);

src/main.s

@@ -395,11 +395,8 @@ L00BC       bit     L00BC
 
             lst
 lup_start:
-            lup     3       
+            lup     0     
             db      0   ; outside 
-            ;lup     3
-            ;db      1   ; inside
-            ;--^      
             --^