X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=riscasm.c;h=b82c19d458d354c845e5364d41941033a0712ecb;hp=e55a9861cbb8e53b31dbf546328439fd6b5af148;hb=090bda1c00a18b3f616e734090ba456a461879a1;hpb=062214e62031c26d372edc2e68473ebb64f6a506

diff --git a/riscasm.c b/riscasm.c
index e55a986..b82c19d 100644
--- a/riscasm.c
+++ b/riscasm.c
@@ -27,6 +27,7 @@ unsigned orgactive = 0;		// RISC org directive active
 unsigned orgaddr = 0;		// Org'd address
 unsigned orgwarning = 0;	// Has an ORG warning been issued
 int lastOpcode = -1;		// Last RISC opcode assembled
+uint8_t riscImmTokenSeen;	// The '#' (immediate) token was seen
 
 const char reg_err[] = "missing register R0...R31";
 
@@ -161,8 +162,6 @@ int GetRegister(WORD rattr)
 
 	// Evaluate what's in the global "tok" buffer
 	if (expr(r_expr, &eval, &eattr, &esym) != OK)
-		// Hmm, the evaluator should report the error to us...
-//		return MalformedOpcode(0x00);
 		return ERROR;
 
 	if ((challoc - ch_size) < 4)
@@ -207,6 +206,7 @@ int GenerateRISCCode(int state)
 	// Get opcode parameter and type
 	unsigned short parm = (WORD)(roptbl[state - 3000].parm);
 	unsigned type = roptbl[state - 3000].typ;
+	riscImmTokenSeen = 0;		// Set to "token not seen yet"
 
 	// Detect whether the opcode parmeter passed determines that the opcode is
 	// specific to only one of the RISC processors and ensure it is legal in
@@ -281,6 +281,7 @@ int GenerateRISCCode(int state)
 			return MalformedOpcode(0x01);
 
 		tok++;
+		riscImmTokenSeen = 1;
 
 		if (expr(r_expr, &eval, &eattr, &esym) != OK)
 			return MalformedOpcode(0x02);
@@ -318,6 +319,7 @@ int GenerateRISCCode(int state)
 			return MalformedOpcode(0x03);
 
 		tok++;
+		riscImmTokenSeen = 1;
 
 		if (expr(r_expr, &eval, &eattr, &esym) != OK)
 			return MalformedOpcode(0x04);