X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=riscasm.c;h=50fecf4e8e412b5a44f3f2b0684e2b9355f7b35a;hp=0b09bf18ba3c641fa15189cf70cdd32d2c6d439b;hb=c59f7a33730dacf753e066a4002e2f749051a137;hpb=261f8d9198c4235bcdced4403ba391553e6bd0d1

diff --git a/riscasm.c b/riscasm.c
index 0b09bf1..50fecf4 100644
--- a/riscasm.c
+++ b/riscasm.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // RISCA.C - GPU/DSP Assembler
-// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -258,7 +258,7 @@ int GenerateRISCCode(int state)
 	// UNPACK
 	case RI_ONE:
 		reg2 = EvaluateRegisterFromTokenStream(FU_REGTWO);
-		at_eol();
+		ErrorIfNotAtEOL();
 		DepositRISCInstructionWord(parm, parm >> 6, reg2);
 		break;
 
@@ -276,7 +276,7 @@ int GenerateRISCCode(int state)
 			altbankok = 1;                      // MOVETA
 
 		reg2 = EvaluateRegisterFromTokenStream(FU_REGTWO);
-		at_eol();
+		ErrorIfNotAtEOL();
 		DepositRISCInstructionWord(parm, reg1, reg2);
 		break;
 
@@ -338,7 +338,7 @@ int GenerateRISCCode(int state)
 
 		CHECK_COMMA;
 		reg2 = EvaluateRegisterFromTokenStream(FU_REGTWO);
-		at_eol();
+		ErrorIfNotAtEOL();
 		DepositRISCInstructionWord(parm, reg1, reg2);
 		break;
 
@@ -387,7 +387,7 @@ int GenerateRISCCode(int state)
 
 		CHECK_COMMA;
 		reg2 = EvaluateRegisterFromTokenStream(FU_REGTWO);
-		at_eol();
+		ErrorIfNotAtEOL();
 
 		DepositRISCInstructionWord(parm, 0, reg2);
 		val = WORDSWAP32(eval);
@@ -410,7 +410,7 @@ int GenerateRISCCode(int state)
 
 		CHECK_COMMA;
 		reg2 = EvaluateRegisterFromTokenStream(FU_REGTWO);
-		at_eol();
+		ErrorIfNotAtEOL();
 		DepositRISCInstructionWord(parm, reg1, reg2);
 		break;
 
@@ -533,7 +533,7 @@ int GenerateRISCCode(int state)
 		tok++;
 		CHECK_COMMA;
 		reg2 = EvaluateRegisterFromTokenStream(FU_REGTWO);
-		at_eol();
+		ErrorIfNotAtEOL();
 		DepositRISCInstructionWord(parm, reg1, reg2);
 		break;
 
@@ -652,7 +652,7 @@ int GenerateRISCCode(int state)
 			return MalformedOpcode(MALF_RPAREN);
 
 		tok++;
-		at_eol();
+		ErrorIfNotAtEOL();
 		DepositRISCInstructionWord(parm, reg2, reg1);
 		break;
 
@@ -670,7 +670,7 @@ int GenerateRISCCode(int state)
 		tok++;
 		CHECK_COMMA;
 		reg2 = EvaluateRegisterFromTokenStream(FU_REGTWO);
-		at_eol();
+		ErrorIfNotAtEOL();
 		DepositRISCInstructionWord(parm, reg1, reg2);
 		break;
 
@@ -689,7 +689,7 @@ int GenerateRISCCode(int state)
 			return MalformedOpcode(MALF_RPAREN);
 
 		tok++;
-		at_eol();
+		ErrorIfNotAtEOL();
 		DepositRISCInstructionWord(parm, reg2, reg1);
 		break;
 
@@ -802,7 +802,7 @@ int GenerateRISCCode(int state)
 				return MalformedOpcode(MALF_RPAREN);
 
 			tok++;
-			at_eol();
+			ErrorIfNotAtEOL();
 		}
 
 		DepositRISCInstructionWord(parm, reg2, reg1);