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

diff --git a/parmode.h b/parmode.h
index b116427..60eca33 100644
--- a/parmode.h
+++ b/parmode.h
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // PARMODE.C - Addressing Modes Parser Include
-// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -92,16 +92,16 @@
 			else if (*tok == 'L')
 			{
 				// TODO: does DINDL gets used at all?
-				//AMn=DINDL;                                     // (Dn.l)
-				//AnEXTEN = 1 << 1;   // Long index size
-				//tok++;
+				AMn=DINDL;                                     // (Dn.l)
+				AnEXTEN = 1 << 1;   // Long index size
+				tok++;
 			}
 			else if (*tok == 'W')                                // (Dn.w)
 			{
 				// TODO: does DINDW gets used at all?
-				//AMn=DINDW;
-				//AnEXTEN = 1 << 1;   // Word index size
-				//tok++;
+				AMn=DINDW;
+				AnEXTEN = 1 << 1;   // Word index size
+				tok++;
 			}
 			else if (*tok == ',')
 			{
@@ -115,7 +115,58 @@
 				goto CHECKODn;
 			}
 			else
+			{
 				return error("(Dn) error");
+			}
+
+			if (*tok == '*')
+			{                        // 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:
+						break;
+					case 2:
+						AnIXSIZ |= TIMES2;
+						break;
+					case 4:
+						AnIXSIZ |= TIMES4;
+						break;
+					case 8:
+						AnIXSIZ |= TIMES8;
+						break;
+					default:
+						goto badmode;
+					}
+				}
+				else if (*tok++ != CONST || *tok > 8)
+					goto badmode;
+				else
+				{
+					switch ((int)*tok++)
+					{
+					case 1:
+						break;
+					case 2:
+						AnIXSIZ |= TIMES2;
+						break;
+					case 4:
+						AnIXSIZ |= TIMES4;
+						break;
+					case 8:
+						AnIXSIZ |= TIMES8;
+						break;
+					default:
+						goto badmode;
+					}
+				}
+			}
 
 			if (*tok == ')')
 			{
@@ -128,6 +179,14 @@
 				AMn = MEMPOST;
 				goto AnOK;
 			}
+			else if (*tok==',')
+			{
+				tok++;  // eat the comma
+				// It might be (Dn[.wl][*scale],od)
+				// Maybe this is wrong and we have to write some code here
+				// instead of reusing that path...
+				goto CHECKODn;
+			}
 			else
 				return error("unhandled so far");
 		}
@@ -173,27 +232,55 @@
 			{                        // scale: *1, *2, *4, *8
 				tok++;
 
-				if (*tok++ != CONST || *tok > 8)
-					goto badmode;
-
-				switch ((int)*tok++)
-				{
-				case 1:
-					break;
-				case 2:
-					AnIXSIZ |= TIMES2;
-					break;
-				case 4:
-					AnIXSIZ |= TIMES4;
-					break;
-				case 8:
-					AnIXSIZ |= TIMES8;
-					break;
-				default:
+				if (*tok == SYMBOL)
+				{
+					if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+						return error("scale factor expression must evaluate");
+					switch (AnEXVAL)
+					{
+					case 1:
+						break;
+					case 2:
+						AnIXSIZ |= TIMES2;
+						break;
+					case 4:
+						AnIXSIZ |= TIMES4;
+						break;
+					case 8:
+						AnIXSIZ |= TIMES8;
+						break;
+					default:
+						goto badmode;
+					}
+				}
+				else if (*tok++ != CONST || *tok > 8)
 					goto badmode;
+				else
+				{
+					switch ((int)*tok++)
+					{
+					case 1:
+						break;
+					case 2:
+						AnIXSIZ |= TIMES2;
+						break;
+					case 4:
+						AnIXSIZ |= TIMES4;
+						break;
+					case 8:
+						AnIXSIZ |= TIMES8;
+						break;
+					default:
+						goto badmode;
+					}
 				}
 			}
 
+			if (*tok == ',')
+			{
+				tok++;
+				goto CHECKODn;
+			}
 			if (*tok++ != ')')         // final ")"
 				goto badmode;
 
@@ -204,29 +291,25 @@
 			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
 			{
 				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)
 					{
@@ -237,7 +320,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))
 						{
@@ -302,30 +385,52 @@
 
 				// Check for scale
 				if (*tok == '*')			// ([bd,An/PC],Xn*...)
-				{
+				{                           // scale: *1, *2, *4, *8
 					tok++;
 
-					if (*tok == CONST)	// TODO: I suppose the scale is stored as a CONST and nothing else? So prolly the if is not needed?
-						tok++;
-
-					switch ((int)*tok++)
+					if (*tok == SYMBOL)
 					{
-					case 1:
-						break;
-					case 2:
-						AnEXTEN |= EXT_TIMES2;
-						break;
-					case 4:
-						AnEXTEN |= EXT_TIMES4;
-						break;
-					case 8:
-						AnEXTEN |= EXT_TIMES8;
-						break;
-					default:
+						if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+							return error("scale factor expression must evaluate");
+						switch (AnEXVAL)
+						{
+						case 1:
+							break;
+						case 2:
+							AnIXSIZ |= TIMES2;
+							break;
+						case 4:
+							AnIXSIZ |= TIMES4;
+							break;
+						case 8:
+							AnIXSIZ |= TIMES8;
+							break;
+						default:
+							goto badmode;
+				}
+					}
+					else if (*tok++ != CONST || *tok > 8)
 						goto badmode;
+					else
+					{
+						switch ((int)*tok++)
+						{
+						case 1:
+							break;
+						case 2:
+							AnIXSIZ |= TIMES2;
+							break;
+						case 4:
+							AnIXSIZ |= TIMES4;
+							break;
+						case 8:
+							AnIXSIZ |= TIMES8;
+							break;
+						default:
+							goto badmode;
+						}
 					}
 				}
-
 				if (*tok == ']')  // ([bd,Dn]...
 				{
 					tok++;
@@ -354,9 +459,9 @@
 				if (*tok == ')')
 				{
 					//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
-					tok++;
 					goto AnOK;
 				}
 				else if (*tok != ',')
@@ -380,8 +485,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
@@ -406,29 +511,52 @@
 				}
 
 				// Check for scale
-				if (*tok == '*')
-				{
-					// ([bd,An/PC],Xn*...)
+				if (*tok == '*')                   // ([bd,An/PC],Xn*...)
+				{                                  // scale: *1, *2, *4, *8
 					tok++;
 
-					if (*tok == CONST)	// TODO: I suppose the scale is stored as a CONST and nothing else? So prolly the if is not needed?
-						tok++;
-
-					switch ((int)*tok++)
+					if (*tok == SYMBOL)
 					{
-					case 1:
-						break;
-					case 2:
-						AnEXTEN |= EXT_TIMES2;
-						break;
-					case 4:
-						AnEXTEN |= EXT_TIMES4;
-						break;
-					case 8:
-						AnEXTEN |= EXT_TIMES8;
-						break;
-					default:
+						if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+							return error("scale factor expression must evaluate");
+
+						switch (AnEXVAL)
+						{
+						case 1:
+							break;
+						case 2:
+							AnIXSIZ |= TIMES2;
+							break;
+						case 4:
+							AnIXSIZ |= TIMES4;
+							break;
+						case 8:
+							AnIXSIZ |= TIMES8;
+							break;
+						default:
+							goto badmode;
+						}
+					}
+					else if (*tok++ != CONST || *tok > 8)
 						goto badmode;
+					else
+					{
+						switch ((int)*tok++)
+						{
+						case 1:
+							break;
+						case 2:
+							AnIXSIZ |= TIMES2;
+							break;
+						case 4:
+							AnIXSIZ |= TIMES4;
+							break;
+						case 8:
+							AnIXSIZ |= TIMES8;
+							break;
+						default:
+							goto badmode;
+						}
 					}
 				}
 
@@ -447,11 +575,10 @@
 					tok++;	// eat the comma
 
 				CHECKODn:
-
 				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
@@ -459,17 +586,17 @@
 					tok++;
 					goto AnOK;
 				}
-
 				// ([bd,An/PC],Xn,od)
 				if (*tok == DOTL)
 				{
 					// expr.L
 					AnEXTEN |= EXT_IISPOSL; // Long outer displacement
 					AMn = MEMPOST;
+					tok++;
 
 					// 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))
 					{
@@ -522,7 +649,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
@@ -544,7 +671,6 @@
 					// expr[.W][]
 					AnEXTEN |= EXT_IISNOIW; // Word outer displacement with IS suppressed
 					AMn = MEMPRE;
-
 					if (*tok == DOTW)
 					{
 						//AnEXTEN|=EXT_IISNOIW; // Word outer displacement
@@ -554,7 +680,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))
 					{
@@ -613,34 +739,56 @@
 
 				// Check for scale
 				if (*tok == '*')			// ([bd,An/PC],Xn*...)
-				{
+				{                           // scale: *1, *2, *4, *8
 					tok++;
 
-					if (*tok == CONST)	// TODO: I suppose the scale is stored as a CONST and nothing else? So prolly the if is not needed?
-						tok++;
-
-					switch ((int)*tok++)
+					if (*tok == SYMBOL)
 					{
-					case 1:
-						break;
-					case 2:
-						AnEXTEN |= EXT_TIMES2;
-						break;
-					case 4:
-						AnEXTEN |= EXT_TIMES4;
-						break;
-					case 8:
-						AnEXTEN |= EXT_TIMES8;
-						break;
-					default:
+						if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+							return error("scale factor expression must evaluate");
+						switch (AnEXVAL)
+						{
+						case 1:
+							break;
+						case 2:
+							AnIXSIZ |= TIMES2;
+							break;
+						case 4:
+							AnIXSIZ |= TIMES4;
+							break;
+						case 8:
+							AnIXSIZ |= TIMES8;
+							break;
+						default:
+							goto badmode;
+						}
+					}
+					else if (*tok++ != CONST || *tok > 8)
 						goto badmode;
+					else
+					{
+						switch ((int)*tok++)
+						{
+						case 1:
+							break;
+						case 2:
+							AnIXSIZ |= TIMES2;
+							break;
+						case 4:
+							AnIXSIZ |= TIMES4;
+							break;
+						case 8:
+							AnIXSIZ |= TIMES8;
+							break;
+						default:
+							goto badmode;
+						}
 					}
 				}
 
 				//Check for ]
 				if (*tok != ']')
 					return error("Expected closing bracket ]");
-
 				tok++;			// Eat the bracket
 
 				//Check for od
@@ -653,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 (optim_flags[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)
@@ -681,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 (optim_flags[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");
 					}
 				}
 
@@ -761,7 +919,7 @@
 				}
 				else if (*tok == ')')
 				{
-					AMn = PCDISP;                                // expr(PC)
+					AMn = PCDISP;             // expr(PC)
 					tok++;
 					goto AnOK;
 				}
@@ -805,7 +963,6 @@
 		// After a cache keyword only a comma or EOL is allowed
 		if ((*tok != ',') && (*tok != EOL))
 			return ERROR;
-
 		goto AnOK;
 	}
 	else if ((*tok >= KW_SFC) && (*tok <= KW_CRP))
@@ -855,7 +1012,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))
 			{
@@ -903,6 +1060,7 @@ CHK_FOR_DISPn:
 			AMn = PCINDEXED;
 			goto AMn_IXN;
 		}
+
 		goto badmode;
 	}