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

diff --git a/op.c b/op.c
index c73c72f..836f4de 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"
@@ -177,7 +177,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 +302,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 +345,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 +410,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 +468,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);