X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=parmode.h;h=549f131ea42630df7869042f42bcb3fbd72f8df8;hp=955fade88621de27095dad9fba6f613c8498f76f;hb=d812346ecf7309ee3fb88a8dd1f4bca033121ad5;hpb=fbbe9b115f949735421485513154ce8abb8453eb

diff --git a/parmode.h b/parmode.h
index 955fade..549f131 100644
--- a/parmode.h
+++ b/parmode.h
@@ -322,10 +322,10 @@ AMn_IXN:                 // Handle any indexed (tok -> a comma)
 			{
 				expr(AnBEXPR, &AnBEXVAL, &AnBEXATTR, &AnESYM);
 
-				if (CHECK_OPTS(OPT_BASE_DISP) && AnBEXVAL == 0 && AnEXATTR != 0)
+				if (CHECK_OPTS(OPT_020_DISP) && (AnBEXVAL == 0) && (AnEXATTR != 0))
 				{
-					// bd=0 so let's optimise it out
-					AnEXTEN|=EXT_BDSIZE0;
+					// bd = 0 so let's optimise it out
+					AnEXTEN |= EXT_BDSIZE0;
 				}
 				else if (*tok == DOTL)
 				{
@@ -346,12 +346,14 @@ AMn_IXN:                 // Handle any indexed (tok -> a comma)
 					{
 						// Defined, absolute values from $FFFF8000..$00007FFF
 						// get optimized to absolute short
-						if (CHECK_OPTS(OPT_ABS_SHORT)
+						if (CHECK_OPTS(OPT_020_DISP)
 							&& ((AnBEXATTR & (TDB | DEFINED)) == DEFINED)
 							&& (((uint32_t)AnBEXVAL + 0x8000) < 0x10000))
 						{
 							AnEXTEN |= EXT_BDSIZEW;
-							warn("absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
+
+							if (optim_warn_flag)
+								warn("absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
 						}
 						else
 						{
@@ -467,8 +469,7 @@ AMn_IXN:                 // Handle any indexed (tok -> a comma)
 			else if (*tok == ']')
 			{
 				// PC and Xn is suppressed
-				AnREG = 6 << 3;		// stuff 110 to mode field
-				//AnEXTEN|=EXT_BS|EXT_IS;
+				AnREG = 6 << 3;		// stuff 110b to mode field
 				AnEXTEN |= EXT_BS;
 			}
 			else
@@ -479,16 +480,16 @@ AMn_IXN:                 // Handle any indexed (tok -> a comma)
 			// At a crossroads here. We can accept either ([bd,An/PC],... or ([bd,An/PC,Xn*scale],...
 			if (*tok == ']')
 			{
-				//([bd,An/PC],Xn,od)
+				// ([bd,An/PC],Xn,od)
 				// Check for Xn
 				tok++;
 
 				if (*tok == ')')
 				{
-					//Xn and od are non existent, get out of jail free card
+					// Xn and od are non existent, get out of jail free card
 					tok++;
 					AMn = MEMPRE;			// ([bc,An,Xn],od) with no Xn and od
-					AnEXTEN |= EXT_IS | EXT_IISPREN;	//Suppress Xn and od
+					AnEXTEN |= EXT_IS | EXT_IISPREN;	// Suppress Xn and od
 					goto AnOK;
 				}
 				else if (*tok != ',')
@@ -510,7 +511,7 @@ AMn_IXN:                 // Handle any indexed (tok -> a comma)
 				}
 				else
 				{
-					//No index found, suppress it
+					// 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?
@@ -605,9 +606,9 @@ CHECKODn:
 				if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 					goto badmode;
 
-				if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXATTR & DEFINED) && (AnEXVAL == 0))
+				if (CHECK_OPTS(OPT_020_DISP) && (AnEXATTR & DEFINED) && (AnEXVAL == 0))
 				{
-					// od=0 so optimise it out
+					// od = 0 so optimise it out
 					AMn = MEMPOST;		 // let's say it's ([bd,An],Xn,od) with od=0 then
 					AnEXTEN |= EXT_IISPOSN; // No outer displacement
 					tok++;
@@ -615,9 +616,21 @@ CHECKODn:
 				}
 
 				// ([bd,An/PC],Xn,od)
-				if (*tok == DOTL)
+					// Is .W forced here?
+				if (*tok == DOTW)
 				{
-					// expr.L
+					tok++;
+					// od[.W]
+					AnEXTEN |= EXT_IISPOSW; // Word outer displacement
+					AMn = MEMPOST;
+				}
+				else
+				{
+					// Is .L forced here?
+					if (*tok == DOTL)
+						tok++;				// Doesn't matter, we're going for .L anyway
+
+					// od.L
 					if (!(AnEXTEN & EXT_BS))
 						AnEXTEN |= EXT_IISPOSL; // Long outer displacement
 					else
@@ -632,36 +645,24 @@ CHECKODn:
 						{
 							AnBEXPR[i] = AnEXPR[i];
 							i++;
-						}
-						while (AnEXPR[i] != 'E');
+						} while (AnEXPR[i] != 'E');
 
 						AnBEXPR[i] = 'E';
 					}
 
 					AMn = MEMPOST;
-					tok++;
 
 					// Defined, absolute values from $FFFF8000..$00007FFF get
 					// optimized to absolute short
-					if (CHECK_OPTS(OPT_ABS_SHORT)
+					if (CHECK_OPTS(OPT_020_DISP)
 						&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
 						&& (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
 					{
 						AnEXTEN |= EXT_IISPOSW; // Word outer displacement
 						AMn = MEMPOST;
-						warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+						if (optim_warn_flag)
+							warn("absolute value in outer displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
 					}
-
-				}
-				else
-				{
-					// expr[.W]
-					AnEXTEN |= EXT_IISPOSW; // Word outer displacement
-					AMn = MEMPOST;
-
-					// Is .W forced here?
-					if (*tok == DOTW)
-						tok++;
 				}
 
 				// Check for final closing parenthesis
@@ -694,7 +695,7 @@ IS_SUPPRESSEDn:
 
 				expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM);
 
-				if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0))
+				if (CHECK_OPTS(OPT_020_DISP) && (AnEXVAL == 0))
 				{
 					// od=0 so optimise it out
 					AMn = MEMPOST;		 // let's say it's ([bd,An],Xn,od) with od=0 then
@@ -725,12 +726,13 @@ IS_SUPPRESSEDn:
 					}
 					// Defined, absolute values from $FFFF8000..$00007FFF get
 					// optimized to absolute short
-					else if (CHECK_OPTS(OPT_BASE_DISP)
+					else if (CHECK_OPTS(OPT_020_DISP)
 						&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
 						&& (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
 					{
 						//AnEXTEN|=EXT_IISNOIW; // Word outer displacement with IS suppressed
-						warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+						if (optim_warn_flag)
+							warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
 					}
 				}
 
@@ -858,7 +860,7 @@ IS_SUPPRESSEDn:
 					if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 						goto badmode;
 
-					if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0) && (AnEXATTR & DEFINED))
+					if (CHECK_OPTS(OPT_020_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
@@ -889,12 +891,14 @@ IS_SUPPRESSEDn:
 
 						// Defined, absolute values from $FFFF8000..$00007FFF
 						// get optimized to absolute short
-						if (CHECK_OPTS(OPT_BASE_DISP)
+						if (CHECK_OPTS(OPT_020_DISP)
 							&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
 							&& (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
 						{
 							expr_size = EXT_IISPREW;
-							warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+
+							if (optim_warn_flag)
+								warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
 						}
 					}
 
@@ -1169,13 +1173,10 @@ CHK_FOR_DISPn:
 			// expr[.L]
 			AMn = ABSL;
 
-			// When PC relative is enforced, check for any symbols that aren't 
+			// When PC relative is enforced, check for any symbols that aren't
 			// EQU'd, in this case it's an illegal mode
-			if (optim_pc)
-				if (AnEXATTR & REFERENCED)
-					if (AnEXATTR & DEFINED)
-						if (!(AnEXATTR & EQUATED))
-							return error("relocation not allowed");
+			if ((CHECK_OPTS(OPT_PC_RELATIVE)) && (AnEXATTR & REFERENCED) && (AnEXATTR & DEFINED) && (!(AnEXATTR & EQUATED)))
+				return error("relocation not allowed");
 
 			// .L is forced here
 			if (*tok == DOTL)
@@ -1193,7 +1194,7 @@ CHK_FOR_DISPn:
 				{
 					AMn = ABSW;
 
-					if (sbra_flag)
+					if (optim_warn_flag)
 						warn("absolute value from $FFFF8000..$00007FFF optimised to absolute short");
 				}
 			}