X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=riscasm.c;h=a76cb2e19a1438310e38939571546a29cc1569cb;hp=533eca7e41f52f75b70b39c834968bb0a97069ad;hb=f3c7d186a15b89c39e360b9cc89545a0d24bd6a4;hpb=582df8950c285e1746d0c4a9e3ead6545c962dc8

diff --git a/riscasm.c b/riscasm.c
index 533eca7..a76cb2e 100644
--- a/riscasm.c
+++ b/riscasm.c
@@ -180,7 +180,7 @@ int GetRegister(WORD rattr)
 	TOKEN r_expr[EXPRSIZE];		// Expression token list
 
 	// Evaluate what's in the global "tok" buffer
-	if (expr(r_expr, &eval, &eattr, &esym) != OK)
+	if (expr((TOKENPTR)r_expr, &eval, &eattr, &esym) != OK)
 		return ERROR;
 
 	if ((challoc - ch_size) < 4)
@@ -188,7 +188,7 @@ int GetRegister(WORD rattr)
 
 	if (!(eattr & DEFINED))
 	{
-		AddFixup((WORD)(FU_WORD | rattr), sloc, r_expr);
+		AddFixup((WORD)(FU_WORD | rattr), sloc, (TOKENPTR)r_expr);
 		return 0;
 	}
 
@@ -298,13 +298,13 @@ int GenerateRISCCode(int state)
 		if (parm & SUB32)
 			attrflg |= FU_SUB32;
 
-		if (*tok != '#')
+		if (*tok.u32 != '#')
 			return MalformedOpcode(0x01);
 
-		tok++;
+		tok.u32++;
 		riscImmTokenSeen = 1;
 
-		if (expr(r_expr, &eval, &eattr, &esym) != OK)
+		if (expr((TOKENPTR)r_expr, &eval, &eattr, &esym) != OK)
 			return MalformedOpcode(0x02);
 
 		if ((challoc - ch_size) < 4)
@@ -312,7 +312,7 @@ int GenerateRISCCode(int state)
 
 		if (!(eattr & DEFINED))
 		{
-			AddFixup((WORD)(FU_WORD | attrflg), sloc, r_expr);
+			AddFixup((WORD)(FU_WORD | attrflg), sloc, (TOKENPTR)r_expr);
 			reg1 = 0;
 		}
 		else
@@ -336,22 +336,22 @@ int GenerateRISCCode(int state)
 
 	// Move Immediate--n,Rn--n in Second Word
 	case RI_MOVEI:
-		if (*tok != '#')
+		if (*tok.u32 != '#')
 			return MalformedOpcode(0x03);
 
-		tok++;
+		tok.u32++;
 		riscImmTokenSeen = 1;
 
 		// Check for equated register after # and return error if so
-		if (*tok == SYMBOL)
+		if (*tok.u32 == SYMBOL)
 		{
-			sy = lookup(string[tok[1]], LABEL, 0);
+			sy = lookup(string[tok.u32[1]], LABEL, 0);
 
 			if (sy && (sy->sattre & EQUATEDREG))
 				return error("equated register in 1st operand of MOVEI instruction");
 		}
 
-		if (expr(r_expr, &eval, &eattr, &esym) != OK)
+		if (expr((TOKENPTR)r_expr, &eval, &eattr, &esym) != OK)
 			return MalformedOpcode(0x04);
 
 		if (lastOpcode == RI_JUMP || lastOpcode == RI_JR)
@@ -371,7 +371,7 @@ int GenerateRISCCode(int state)
 
 		if (!(eattr & DEFINED))
 		{
-			AddFixup(FU_LONG | FU_MOVEI, sloc + 2, r_expr);
+			AddFixup(FU_LONG | FU_MOVEI, sloc + 2, (TOKENPTR)r_expr);
 			eval = 0;
 		}
 		else
@@ -394,11 +394,11 @@ int GenerateRISCCode(int state)
 
 	// PC,Rd or Rs,Rd
 	case RI_MOVE:
-		if (*tok == KW_PC)
+		if (*tok.u32 == KW_PC)
 		{
 			parm = 51;
 			reg1 = 0;
-			tok++;
+			tok.u32++;
 		}
 		else
 		{
@@ -417,24 +417,24 @@ int GenerateRISCCode(int state)
 		indexed = 0;
 		parm = 41;
 
-		if (*tok != '(')
+		if (*tok.u32 != '(')
 			return MalformedOpcode(0x05);
 
-		tok++;
+		tok.u32++;
 
-        if ((*(tok + 1) == '+') || (*(tok + 1) == '-')) {
+        if ((*(tok.u32 + 1) == '+') || (*(tok.u32 + 1) == '-')) {
             // Trying to make indexed call
-            if ((*tok == KW_R14 || *tok == KW_R15)) {
-                indexed = (*tok - KW_R0);
+            if ((*tok.u32 == KW_R14 || *tok.u32 == KW_R15)) {
+                indexed = (*tok.u32 - KW_R0);
             } else {
-                return IllegalIndexedRegister(*tok);
+                return IllegalIndexedRegister(*tok.u32);
             }
         }
 
-		if (*tok == SYMBOL)
+		if (*tok.u32 == SYMBOL)
 		{
-//			sy = lookup((char *)tok[1], LABEL, 0);
-			sy = lookup(string[tok[1]], LABEL, 0);
+//			sy = lookup((char *)tok.u32[1], LABEL, 0);
+			sy = lookup(string[tok.u32[1]], LABEL, 0);
 
 			if (!sy)
 			{
@@ -444,10 +444,10 @@ int GenerateRISCCode(int state)
 
 			if (sy->sattre & EQUATEDREG)
 			{
-				if ((*(tok + 2) == '+') || (*(tok + 2) == '-')) {
+				if ((*(tok.u32 + 2) == '+') || (*(tok.u32 + 2) == '-')) {
 				    if ((sy->svalue & 0x1F) == 14 || (sy->svalue & 0x1F) == 15) {
 				        indexed = (sy->svalue & 0x1F);
-                        tok++;
+                        tok.u32++;
 				    } else {
 				        return IllegalIndexedRegisterEqur(sy);
 				    }
@@ -463,20 +463,20 @@ int GenerateRISCCode(int state)
 		{
 			reg1 = indexed;
 			indexed = 0;
-			tok++;
+			tok.u32++;
 
-			if (*tok == '+')
+			if (*tok.u32 == '+')
 			{
 				parm = (WORD)(reg1 - 14 + 58);
-				tok++;
+				tok.u32++;
 
-				if (*tok >= KW_R0 && *tok <= KW_R31)
+				if (*tok.u32 >= KW_R0 && *tok.u32 <= KW_R31)
 					indexed = 1;
 
-				if (*tok == SYMBOL)
+				if (*tok.u32 == SYMBOL)
 				{
-//					sy = lookup((char *)tok[1], LABEL, 0);
-					sy = lookup(string[tok[1]], LABEL, 0);
+//					sy = lookup((char *)tok.u32[1], LABEL, 0);
+					sy = lookup(string[tok.u32[1]], LABEL, 0);
 
 					if (!sy)
 					{
@@ -494,7 +494,7 @@ int GenerateRISCCode(int state)
 				}
 				else
 				{
-					if (expr(r_expr, &eval, &eattr, &esym) != OK)
+					if (expr((TOKENPTR)r_expr, &eval, &eattr, &esym) != OK)
 						return MalformedOpcode(0x06);
 
 					if ((challoc - ch_size) < 4)
@@ -529,10 +529,10 @@ int GenerateRISCCode(int state)
 			}
 		}
 
-		if (*tok != ')')
+		if (*tok.u32 != ')')
 			return MalformedOpcode(0x07);
 
-		tok++;
+		tok.u32++;
 		CHECK_COMMA;
 		reg2 = GetRegister(FU_REGTWO);
 		at_eol();
@@ -545,18 +545,18 @@ int GenerateRISCCode(int state)
 		reg1 = GetRegister(FU_REGONE);
 		CHECK_COMMA;
 
-		if (*tok != '(')
+		if (*tok.u32 != '(')
 			return MalformedOpcode(0x08);
 
-		tok++;
+		tok.u32++;
 		indexed = 0;
 
-		if ((*tok == KW_R14 || *tok == KW_R15) && (*(tok + 1) != ')'))
-			indexed = (*tok - KW_R0);
+		if ((*tok.u32 == KW_R14 || *tok.u32 == KW_R15) && (*(tok.u32 + 1) != ')'))
+			indexed = (*tok.u32 - KW_R0);
 
-		if (*tok == SYMBOL)
+		if (*tok.u32 == SYMBOL)
 		{
-			sy = lookup(string[tok[1]], LABEL, 0);
+			sy = lookup(string[tok.u32[1]], LABEL, 0);
 
 			if (!sy)
 			{
@@ -567,10 +567,10 @@ int GenerateRISCCode(int state)
 			if (sy->sattre & EQUATEDREG)
 			{
 				if (((sy->svalue & 0x1F) == 14 || (sy->svalue & 0x1F) == 15)
-					&& (*(tok + 2) != ')'))
+					&& (*(tok.u32 + 2) != ')'))
 				{
 					indexed = (sy->svalue & 0x1F);
-					tok++;
+					tok.u32++;
 				}
 			}
 		}
@@ -583,19 +583,19 @@ int GenerateRISCCode(int state)
 		{
 			reg2 = indexed;
 			indexed = 0;
-			tok++;
+			tok.u32++;
 
-			if (*tok == '+')
+			if (*tok.u32 == '+')
 			{
 				parm = (WORD)(reg2 - 14 + 60);
-				tok++;
+				tok.u32++;
 
-				if (*tok >= KW_R0 && *tok <= KW_R31)
+				if (*tok.u32 >= KW_R0 && *tok.u32 <= KW_R31)
 					indexed = 1;
 
-				if (*tok == SYMBOL)
+				if (*tok.u32 == SYMBOL)
 				{
-					sy = lookup(string[tok[1]], LABEL, 0);
+					sy = lookup(string[tok.u32[1]], LABEL, 0);
 
 					if (!sy)
 					{
@@ -613,7 +613,7 @@ int GenerateRISCCode(int state)
 				}
 				else
 				{
-					if (expr(r_expr, &eval, &eattr, &esym) != OK)
+					if (expr((TOKENPTR)r_expr, &eval, &eattr, &esym) != OK)
 						return MalformedOpcode(0x09);
 
 					if ((challoc - ch_size) < 4)
@@ -621,7 +621,7 @@ int GenerateRISCCode(int state)
 
 					if (!(eattr & DEFINED))
 					{
-						AddFixup(FU_WORD | FU_REGTWO, sloc, r_expr);
+						AddFixup(FU_WORD | FU_REGTWO, sloc, (TOKENPTR)r_expr);
 						reg2 = 0;
 					}
 					else
@@ -653,26 +653,26 @@ int GenerateRISCCode(int state)
 			}
 		}
 
-		if (*tok != ')')
+		if (*tok.u32 != ')')
 			return MalformedOpcode(0x0A);
 
-		tok++;
+		tok.u32++;
 		at_eol();
 		BuildRISCIntructionWord(parm, reg2, reg1);
 		break;
 
 	// LOADB/LOADP/LOADW (Rn),Rn
 	case RI_LOADN:
-		if (*tok != '(')
+		if (*tok.u32 != '(')
 			return MalformedOpcode(0x0B);
 
-		tok++;
+		tok.u32++;
 		reg1 = GetRegister(FU_REGONE);
 
-		if (*tok != ')')
+		if (*tok.u32 != ')')
 			return MalformedOpcode(0x0C);
 
-		tok++;
+		tok.u32++;
 		CHECK_COMMA;
 		reg2 = GetRegister(FU_REGTWO);
 		at_eol();
@@ -684,16 +684,16 @@ int GenerateRISCCode(int state)
 		reg1 = GetRegister(FU_REGONE);
 		CHECK_COMMA;
 
-		if (*tok != '(')
+		if (*tok.u32 != '(')
 			return MalformedOpcode(0x0D);
 
-		tok++;
+		tok.u32++;
 		reg2 = GetRegister(FU_REGTWO);
 
-		if (*tok != ')')
+		if (*tok.u32 != ')')
 			return MalformedOpcode(0x0E);
 
-		tok++;
+		tok.u32++;
 		at_eol();
 		BuildRISCIntructionWord(parm, reg2, reg1);
 		break;
@@ -707,7 +707,7 @@ int GenerateRISCCode(int state)
 		// the JR or JUMP should default to 0, Jump Always
 		commaFound = 0;
 
-		for(t=tok; *t!=EOL; t++)
+		for(t=tok.u32; *t!=EOL; t++)
 		{
 			if (*t == ',')
 			{
@@ -718,20 +718,20 @@ int GenerateRISCCode(int state)
 
 		if (commaFound)
 		{
-			if (*tok == CONST)
+			if (*tok.u32 == CONST)
 			{
 				// CC using a constant number
-				tok++;
-				uint64_t *tok64 = (uint64_t *)tok;
+				tok.u32++;
+				uint64_t *tok64 = (uint64_t *)tok.u32;
 				val = (int)*tok64++;
-				tok = (uint32_t *)tok64;
+				tok.u32 = (uint32_t *)tok64;
 				CHECK_COMMA;
 			}
-			else if (*tok == SYMBOL)
+			else if (*tok.u32 == SYMBOL)
 			{
 				val = 99;
-//				strcpy(scratch, (char *)tok[1]);
-				strcpy(scratch, string[tok[1]]);
+//				strcpy(scratch, (char *)tok.u32[1]);
+				strcpy(scratch, string[tok.u32[1]]);
 				strtoupper(scratch);
 
 				for(i=0; i<MAXINTERNCC; i++)
@@ -747,8 +747,8 @@ int GenerateRISCCode(int state)
 				// Standard CC was not found, look for an equated one
 				if (val == 99)
 				{
-//					ccsym = lookup((char *)tok[1], LABEL, 0);
-					ccsym = lookup(string[tok[1]], LABEL, 0);
+//					ccsym = lookup((char *)tok.u32[1], LABEL, 0);
+					ccsym = lookup(string[tok.u32[1]], LABEL, 0);
 
 					if (ccsym && (ccsym->sattre & EQUATEDCC) && !(ccsym->sattre & UNDEF_CC))
 						val = ccsym->svalue;
@@ -756,10 +756,10 @@ int GenerateRISCCode(int state)
 						return error("unknown condition code");
 				}
 
-				tok += 2;
+				tok.u32 += 2;
 				CHECK_COMMA;
 			}
-			else if (*tok == '(')
+			else if (*tok.u32 == '(')
 			{
 				// Set CC to "Jump Always"
 				val = 0;
@@ -780,7 +780,7 @@ int GenerateRISCCode(int state)
 		if (type == RI_JR)
 		{
 			// JR cc,n
-			if (expr(r_expr, &eval, &eattr, &esym) != OK)
+			if (expr((TOKENPTR)r_expr, &eval, &eattr, &esym) != OK)
 				return MalformedOpcode(0x0F);
 
 			if ((challoc - ch_size) < 4)
@@ -788,7 +788,7 @@ int GenerateRISCCode(int state)
 
 			if (!(eattr & DEFINED))
 			{
-				AddFixup(FU_WORD | FU_JR, sloc, r_expr);
+				AddFixup(FU_WORD | FU_JR, sloc, (TOKENPTR)r_expr);
 				reg2 = 0;
 			}
 			else
@@ -804,16 +804,16 @@ int GenerateRISCCode(int state)
 		else
 		{
 			// JUMP cc, (Rn)
-			if (*tok != '(')
+			if (*tok.u32 != '(')
 				return MalformedOpcode(0x10);
 
-			tok++;
+			tok.u32++;
 			reg2 = GetRegister(FU_REGTWO);
 
-			if (*tok != ')')
+			if (*tok.u32 != ')')
 				return MalformedOpcode(0x11);
 
-			tok++;
+			tok.u32++;
 			at_eol();
 			BuildRISCIntructionWord(parm, reg2, reg1);
 		}