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

diff --git a/parmode.h b/parmode.h
index 54b584e..e5e0b91 100644
--- a/parmode.h
+++ b/parmode.h
@@ -78,6 +78,7 @@
 		{
 			//Since index register isn't used here, store register number in this field
 			AnIXREG = *tok++ & 7;                                // (Dn)
+
 			if (*tok == ')')
 			{
 				tok++;
@@ -85,21 +86,21 @@
 				AnEXTEN |= EXT_BS;          // Base register suppressed
 				AnEXTEN |= EXT_BDSIZE0;     // Base displacement null
 				AnEXTEN |= EXT_IISPOSN;     // Indirect Postindexed with Null Outer Displacement
-				AMn= MEMPOST;
+				AMn = MEMPOST;
 				AnREG = 6 << 3;		// stuff 110 to mode field
 				goto AnOK;
 			}
 			else if (*tok == 'L')
 			{
 				// TODO: does DINDL gets used at all?
-				AMn=DINDL;                                     // (Dn.l)
+				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;
+				AMn = DINDW;
 				AnEXTEN = 1 << 1;   // Word index size
 				tok++;
 			}
@@ -185,6 +186,7 @@
 				// It might be (Dn[.wl][*scale],od)
 				// Maybe this is wrong and we have to write some code here
 				// instead of reusing that path...
+				AnEXTEN |= EXT_BDSIZE0;     // Base displacement null - suppressed
 				goto CHECKODn;
 			}
 			else
@@ -236,7 +238,6 @@
 				{
 					if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 						return error("scale factor expression must evaluate");
-
 					switch (AnEXVAL)
 					{
 					case 1:
@@ -279,7 +280,11 @@
 
 			if (*tok == ',')
 			{
+				// If we got here we didn't get any [] stuff
+				// so let's suppress base displacement before
+				// branching off
 				tok++;
+				AnEXTEN |= EXT_BDSIZE0;     // Base displacement null - suppressed
 				goto CHECKODn;
 			}
 			if (*tok++ != ')')         // final ")"
@@ -290,27 +295,24 @@
 		else if (*tok == '[')
 		{                              // ([...
 			tok++;
-			AnEXTEN|=EXT_FULLWORD;     //Definitely using full extension format, so set bit 8
+			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)
+			if (*tok != CONST && *tok != SYMBOL)
 			{
-				AnEXTEN|=EXT_BDSIZE0;
-				//tok++;
-				//tok--;                 //Rewind tok since expr advances it forward
+				AnEXTEN |= EXT_BDSIZE0;
 			}
 			else
 			{
 				expr(AnBEXPR, &AnBEXVAL, &AnBEXATTR, &AnESYM);
-				if (CHECK_OPTS(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,...
-						AnEXTEN|=EXT_BDSIZEL;
+						AnEXTEN |= EXT_BDSIZEL;
 						tok++;
 				}
 				else
@@ -318,7 +320,7 @@
 					// Is .W forced here?
 					if (*tok == DOTW)
 					{
-    					AnEXTEN|=EXT_BDSIZEW;
+						AnEXTEN |= EXT_BDSIZEW;
 						tok++;
 					}
 					else
@@ -327,7 +329,7 @@
 						// to absolute short
 						if (CHECK_OPTS(OPT_ABS_SHORT)
 							&& ((AnBEXATTR & (TDB | DEFINED)) == DEFINED)
-							&& ((AnBEXVAL + 0x8000) < 0x10000))
+							&& (((uint32_t)AnBEXVAL + 0x8000) < 0x10000))
 						{
 							AnEXTEN |= EXT_BDSIZEW;
 							warn("absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
@@ -355,7 +357,7 @@
 			}
 			else if ((*tok >= KW_A0) && (*tok <= KW_A7))
 			{					// ([bd,An,...
-				AnREG = (6<<3)|*tok & 7;
+				AnREG = (6 << 3) | *tok & 7;
 				tok++;
 			}
 			else if ((*tok >= KW_D0) && (*tok <= KW_D7))
@@ -369,23 +371,23 @@
 
 				// Check for size
 				{
-					// ([bd,An/PC],Xn.W/L...)
-					switch ((int)*tok)
-					{
-					// Index reg size: <empty> | .W | .L
-					case DOTW:
-						tok++;
-						break;
-					default:
-						break;
-					case DOTL:
-						AnEXTEN |= EXT_L;
-						tok++;
-						break;
-					case DOTB:
-						// .B not allowed here...
-						goto badmode;
-					}
+				// ([bd,An/PC],Xn.W/L...)
+				switch ((int)*tok)
+				{
+				// Index reg size: <empty> | .W | .L
+				case DOTW:
+					tok++;
+					break;
+				default:
+					break;
+				case DOTL:
+					AnEXTEN |= EXT_L;
+					tok++;
+					break;
+				case DOTB:
+					// .B not allowed here...
+					goto badmode;
+				}
 				}
 
 				// Check for scale
@@ -397,6 +399,7 @@
 					{
 						if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
 							return error("scale factor expression must evaluate");
+
 						switch (AnEXVAL)
 						{
 						case 1:
@@ -574,7 +577,7 @@
 					tok++;
 					goto AnOK;
 				}
-				else if (*tok!=',')
+				else if (*tok != ',')
 					return error("comma expected");
 				else
 					tok++;	// eat the comma
@@ -591,6 +594,7 @@
 					tok++;
 					goto AnOK;
 				}
+
 				// ([bd,An/PC],Xn,od)
 				if (*tok == DOTL)
 				{
@@ -603,7 +607,7 @@
 					// optimized to absolute short
 					if (CHECK_OPTS(OPT_ABS_SHORT)
 						&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
-						&& ((AnEXVAL + 0x8000) < 0x10000))
+						&& (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
 					{
 						AnEXTEN |= EXT_IISPOSW; // Word outer displacement
 						AMn = MEMPOST;
@@ -633,7 +637,7 @@
 				else
 					return error("Closing parenthesis missing on addressing mode");
 
-				IS_SUPPRESSEDn:
+IS_SUPPRESSEDn:
 
 				// Check for od
 				if (*tok == ')')	// ([bd,An/PC],Xn)
@@ -676,18 +680,18 @@
 					// expr[.W][]
 					AnEXTEN |= EXT_IISNOIW; // Word outer displacement with IS suppressed
 					AMn = MEMPRE;
+
 					if (*tok == DOTW)
 					{
 						//AnEXTEN|=EXT_IISNOIW; // Word outer displacement
 						AMn = MEMPOST;
 						tok++;
 					}
-
 					// 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))
+						&& (((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");
@@ -723,23 +727,23 @@
 
 				// Check for size
 				{
-					// ([bd,An/PC],Xn.W/L...)
-					switch ((int)*tok)
-					{
-					// Index reg size: <empty> | .W | .L
-					case DOTW:
-						tok++;
-						break;
-					default:
-						break;
-					case DOTL:
-						tok++;
-						AnEXTEN |= EXT_L;
-						break;
-					case DOTB:
-						// .B not allowed here...
-						goto badmode;
-					}
+				// ([bd,An/PC],Xn.W/L...)
+				switch ((int)*tok)
+				{
+				// Index reg size: <empty> | .W | .L
+				case DOTW:
+					tok++;
+					break;
+				default:
+					break;
+				case DOTL:
+					tok++;
+					AnEXTEN |= EXT_L;
+					break;
+				case DOTB:
+					// .B not allowed here...
+					goto badmode;
+				}
 				}
 
 				// Check for scale
@@ -806,21 +810,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 +839,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)
+							&& (((uint32_t)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");
 					}
 				}
 
@@ -1009,7 +1023,7 @@ CHK_FOR_DISPn:
 			// to absolute short
 			if (CHECK_OPTS(OPT_ABS_SHORT)
 				&& ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
-				&& ((AnEXVAL + 0x8000) < 0x10000))
+				&& (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
 			{
 				AMn = ABSW;