X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=op.c;h=3833bfbee292e17117b3058cc7a9333e29103fc3;hp=c73c72f8ec0ff489baa824fa79e6432de518d8c8;hb=ba8121d8647b88276977b37a425a9b5dc631731e;hpb=790cd95291aa2dcfd3128652ef9c34bab1398a8d

diff --git a/op.c b/op.c
index c73c72f..3833bfb 100644
--- a/op.c
+++ b/op.c
@@ -2,7 +2,7 @@
 // Jaguar Object Processor assembler
 //
 // by James Hammons
-// (C) 2018 Underground Software
+// (C) 2019 Underground Software
 //
 
 #include "op.h"
@@ -89,6 +89,7 @@ static inline uint64_t CheckFlags(char * s)
 		return 0x04;
 	else if (strcmp(scratchbuf, "RELEASE") == 0)
 		return 0x08;
+
 	return 0;
 }
 
@@ -177,7 +178,7 @@ static int HandleBitmap(void)
 		}
 	}
 
-	at_eol();
+	ErrorIfNotAtEOL();
 
 	uint64_t p1 = 0x00 | ((ypos * 2) << 3) | (iheight << 14) | (linkAddr << 21) | (dataAddr << 40);
 	uint64_t p2 = xpos | (bpp << 12) | (pitch << 15) | (dwidth << 18) | (iwidth << 28) | (index << 38) | (flags << 45) | (firstpix << 49);
@@ -302,7 +303,7 @@ static int HandleScaledBitmap(void)
 		}
 	}
 
-	at_eol();
+	ErrorIfNotAtEOL();
 
 	uint64_t p1 = 0x01 | ((ypos * 2) << 3) | (iheight << 14) | (linkAddr << 21) | (dataAddr << 40);
 	uint64_t p2 = xpos | (bpp << 12) | (pitch << 15) | (dwidth << 18) | (iwidth << 28) | (index << 38) | (flags << 45) | (firstpix << 49);
@@ -345,7 +346,7 @@ static int HandleGPUObject(void)
 	if (!(eattr & DEFINED))
 		return error("bad expression in data");
 
-	at_eol();
+	ErrorIfNotAtEOL();
 
 	uint64_t p1 = 0x02 | ((ypos * 2) << 3) | (eval << 14);
 
@@ -410,7 +411,7 @@ static int HandleBranch(void)
 	if (!(eattr & DEFINED))
 		AddFixup(FU_QUAD | FU_OBJLINK, sloc, exprbuf);
 
-	at_eol();
+	ErrorIfNotAtEOL();
 
 	uint64_t p1 = 0x03 | (cc << 14) | ((ypos * 2) << 3) | ((eval & 0x3FFFF8) << 21);
 
@@ -468,7 +469,7 @@ static int HandleJump(void)
 	if (!(eattr & DEFINED))
 		AddFixup(FU_QUAD | FU_OBJLINK, sloc, exprbuf);
 
-	at_eol();
+	ErrorIfNotAtEOL();
 
 	// This is "branch if VC < 2047", which pretty much guarantees the branch.
 	uint64_t p1 = 0x03 | (1 << 14) | (0x7FF << 3) | ((eval & 0x3FFFF8) << 21);