X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=parmode.h;h=54b584e0fc4f4c58bbbb510f4f1000acef2833d1;hp=e623084b252fb9928d33d7dd9170fc8a3c4b22ea;hb=1b98a8c971056b75728445e4ef7f2308e68d7495;hpb=da0013df9438aa14e478544307e925462d398cb3

diff --git a/parmode.h b/parmode.h
index e623084..54b584e 100644
--- a/parmode.h
+++ b/parmode.h
@@ -127,6 +127,7 @@
 				{
 					if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 						return error("scale factor expression must evaluate");
+
 					switch (AnEXVAL)
 					{
 					case 1:
@@ -142,7 +143,7 @@
 						break;
 					default:
 						goto badmode;
-			}
+					}
 				}
 				else if (*tok++ != CONST || *tok > 8)
 					goto badmode;
@@ -228,13 +229,14 @@
 			}
 
 			if (*tok == '*')
-			{                                  // scale: *1, *2, *4, *8
+			{                        // scale: *1, *2, *4, *8
 				tok++;
 
 				if (*tok == SYMBOL)
 				{
 					if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 						return error("scale factor expression must evaluate");
+
 					switch (AnEXVAL)
 					{
 					case 1:
@@ -301,18 +303,18 @@
 			else
 			{
 				expr(AnBEXPR, &AnBEXVAL, &AnBEXATTR, &AnESYM);
-				if (optim_flags[OPT_BASE_DISP] && AnBEXVAL==0 && AnEXATTR!=0)
+				if (CHECK_OPTS(OPT_BASE_DISP) && AnBEXVAL==0 && AnEXATTR!=0)
 				{
 					// bd=0 so let's optimise it out
 					AnEXTEN|=EXT_BDSIZE0;
 				}
 				else if (*tok==DOTL)
-				{						   // ([bd.l,...
+				{						// ([bd.l,...
 						AnEXTEN|=EXT_BDSIZEL;
 						tok++;
 				}
 				else
-				{						   // ([bd[.w],... or ([bd,...
+				{						// ([bd[.w],... or ([bd,...
 					// Is .W forced here?
 					if (*tok == DOTW)
 					{
@@ -323,7 +325,7 @@
 					{
 						// Defined, absolute values from $FFFF8000..$00007FFF get optimized
 						// to absolute short
-						if (optim_flags[OPT_ABS_SHORT]
+						if (CHECK_OPTS(OPT_ABS_SHORT)
 							&& ((AnBEXATTR & (TDB | DEFINED)) == DEFINED)
 							&& ((AnBEXVAL + 0x8000) < 0x10000))
 						{
@@ -488,8 +490,8 @@
 				{
 					//No index found, suppress it
 					AnEXTEN |= EXT_IS;
-					tok--;							// Rewind tok to point to the comma
-					goto IS_SUPPRESSEDn;			// https://xkcd.com/292/ - what does he know anyway?
+					tok--;					// Rewind tok to point to the comma
+					goto IS_SUPPRESSEDn;	// https://xkcd.com/292/ - what does he know anyway?
 				}
 
 				// Check for size
@@ -522,21 +524,22 @@
 					{
 						if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 							return error("scale factor expression must evaluate");
+
 						switch (AnEXVAL)
-					{
-					case 1:
-						break;
-					case 2:
+						{
+						case 1:
+							break;
+						case 2:
 							AnIXSIZ |= TIMES2;
-						break;
-					case 4:
+							break;
+						case 4:
 							AnIXSIZ |= TIMES4;
-						break;
-					case 8:
+							break;
+						case 8:
 							AnIXSIZ |= TIMES8;
-						break;
-					default:
-						goto badmode;
+							break;
+						default:
+							goto badmode;
 						}
 					}
 					else if (*tok++ != CONST || *tok > 8)
@@ -580,7 +583,7 @@
 				if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 					goto badmode;
 
-				if (optim_flags[OPT_BASE_DISP] && (AnEXVAL == 0))
+				if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0))
 				{
 					// od=0 so optimise it out
 					AMn = MEMPOST;		 // let's say it's ([bd,An],Xn,od) with od=0 then
@@ -598,7 +601,7 @@
 
 					// Defined, absolute values from $FFFF8000..$00007FFF get
 					// optimized to absolute short
-					if (optim_flags[OPT_ABS_SHORT]
+					if (CHECK_OPTS(OPT_ABS_SHORT)
 						&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
 						&& ((AnEXVAL + 0x8000) < 0x10000))
 					{
@@ -651,7 +654,7 @@
 
 				expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM);
 
-				if (optim_flags[OPT_BASE_DISP] && (AnEXVAL == 0))
+				if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0))
 				{
 					// od=0 so optimise it out
 					AMn = MEMPOST;		 // let's say it's ([bd,An],Xn,od) with od=0 then
@@ -682,7 +685,7 @@
 
 					// Defined, absolute values from $FFFF8000..$00007FFF get
 					// optimized to absolute short
-					else if (optim_flags[OPT_BASE_DISP]
+					else if (CHECK_OPTS(OPT_BASE_DISP)
 						&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
 						&& ((AnEXVAL + 0x8000) < 0x10000))
 					{
@@ -811,7 +814,7 @@
 				if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 					goto badmode;
 
-				if (optim_flags[OPT_BASE_DISP] && (AnEXVAL == 0))
+				if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0))
 				{
 					// od=0 so optimise it out
 					AMn = MEMPRE;		 // let's say it's ([bd,An],Xn,od) with od=0 then
@@ -844,7 +847,7 @@
 
 					// Defined, absolute values from $FFFF8000..$00007FFF get optimized
 					// to absolute short
-					else if (optim_flags[OPT_BASE_DISP]
+					else if (CHECK_OPTS(OPT_BASE_DISP)
 						&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
 						&& ((AnEXVAL + 0x8000) < 0x10000))
 					{
@@ -911,7 +914,7 @@
 				}
 				else if (*tok == ')')
 				{
-					AMn = PCDISP;                                // expr(PC)
+					AMn = PCDISP;             // expr(PC)
 					tok++;
 					goto AnOK;
 				}
@@ -1004,7 +1007,7 @@ CHK_FOR_DISPn:
 
 			// Defined, absolute values from $FFFF8000..$00007FFF get optimized
 			// to absolute short
-			if (optim_flags[OPT_ABS_SHORT]
+			if (CHECK_OPTS(OPT_ABS_SHORT)
 				&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
 				&& ((AnEXVAL + 0x8000) < 0x10000))
 			{
@@ -1052,6 +1055,7 @@ CHK_FOR_DISPn:
 			AMn = PCINDEXED;
 			goto AMn_IXN;
 		}
+
 		goto badmode;
 	}