X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=parmode.h;h=60eca336079551b416c3c43e8fab9c5429277b14;hp=54b584e0fc4f4c58bbbb510f4f1000acef2833d1;hb=a7d3861005ef22f14caec4e1c899e079334716af;hpb=49eac9eff9d177e717de7bc8799a632c46b79237

diff --git a/parmode.h b/parmode.h
index 54b584e..60eca33 100644
--- a/parmode.h
+++ b/parmode.h
@@ -236,7 +236,6 @@
 				{
 					if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 						return error("scale factor expression must evaluate");
-
 					switch (AnEXVAL)
 					{
 					case 1:
@@ -292,13 +291,9 @@
 			tok++;
 			AnEXTEN|=EXT_FULLWORD;     //Definitely using full extension format, so set bit 8
 			// Check to see if base displacement is present
-			//WARNING("expr will return a bad expression error here but this is expected, it needs to be silenced!");
 			if (*tok!=CONST && *tok !=SYMBOL)
-			//if (expr(AnBEXPR, &AnBEXVAL, &AnBEXATTR, &AnESYM) != OK)
 			{
 				AnEXTEN|=EXT_BDSIZE0;
-				//tok++;
-				//tok--;                 //Rewind tok since expr advances it forward
 			}
 			else
 			{
@@ -806,21 +801,22 @@
 					tok++;
 					goto AnOK;
 				}
-				else if (*tok++!=',')
+                else if (*tok++ != ',')
 					return error("comma expected after ]");
 
-				WARNING(Put symbol and constant checks here!)
-
-				if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
-					goto badmode;
-
-				if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0))
+				if (*tok == SYMBOL || *tok == CONST)
 				{
-					// od=0 so optimise it out
-					AMn = MEMPRE;		 // let's say it's ([bd,An],Xn,od) with od=0 then
-					AnEXTEN |= EXT_IISPRE0; // No outer displacement
-					tok++;
-					goto AnOK;
+					if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+						goto badmode;
+
+					if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0) && (AnEXATTR & DEFINED))
+					{
+						// od=0 so optimise it out
+						AMn = MEMPRE;		 // let's say it's ([bd,An],Xn,od) with od=0 then
+						AnEXTEN |= EXT_IISPRE0; // No outer displacement
+						tok++;
+						goto AnOK;
+					}
 				}
 
 				// ([bd,An/PC,Xn],od)
@@ -834,25 +830,34 @@
 				else
 				{
 					// expr.[W]
-					//tok++;
-
-					AnEXTEN |= EXT_IISPREW;
 					AMn = MEMPRE;
+					int expr_size = EXT_IISPREW; // Assume we have a .w value
 
-                    // Is .W forced here?
-					if (*tok == DOTW)
+					if ((AnEXVAL + 0x8000) > 0x10000)
 					{
-						tok++;
+						// Long value, so mark it as such for now
+						expr_size = EXT_IISPREL;
+
+						// Defined, absolute values from $FFFF8000..$00007FFF
+						// get optimized to absolute short
+                        if (CHECK_OPTS(OPT_BASE_DISP)
+							&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
+							&& ((AnEXVAL + 0x8000) < 0x10000))
+						{
+							expr_size = EXT_IISPREW;
+							warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+						}
 					}
 
-					// Defined, absolute values from $FFFF8000..$00007FFF get optimized
-					// to absolute short
-					else if (CHECK_OPTS(OPT_BASE_DISP)
-						&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
-						&& ((AnEXVAL + 0x8000) < 0x10000))
+					AnEXTEN |= expr_size; // Assume we have a .w value
+
+					// Is .W forced here?
+					if (*tok == DOTW)
 					{
-						AnEXTEN |= EXT_IISPREW;
-						warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+						tok++;
+
+						if (expr_size == EXT_IISPREL)
+							return error("outer displacement value does not fit in .w size");
 					}
 				}