X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=riscasm.c;h=533eca7e41f52f75b70b39c834968bb0a97069ad;hp=79f9ae26425b2b12e1c2b333165bda61ebe5c688;hb=eace4e1b294ccec54a5c476619f616f5da0bf8a9;hpb=cfd001aea60f54e49d9beae0f941c513f45c202b

diff --git a/riscasm.c b/riscasm.c
index 79f9ae2..533eca7 100644
--- a/riscasm.c
+++ b/riscasm.c
@@ -174,7 +174,7 @@ void BuildRISCIntructionWord(unsigned short opcode, int reg1, int reg2)
 //
 int GetRegister(WORD rattr)
 {
-	uint32_t eval;					// Expression value
+	uint64_t eval;				// Expression value
 	WORD eattr;					// Expression attributes
 	SYM * esym;					// External symbol involved in expr.
 	TOKEN r_expr[EXPRSIZE];		// Expression token list
@@ -194,7 +194,7 @@ int GetRegister(WORD rattr)
 
 	// If we got a register in range (0-31), return it
 	if ((eval >= 0) && (eval <= 31))
-		return eval;
+		return (int)eval;
 
 	// Otherwise, it's out of range & we flag an error
 	return error(reg_err);
@@ -217,7 +217,7 @@ int GenerateRISCCode(int state)
 	WORD attrflg;
 	int indexed;				// Indexed register flag
 
-	uint32_t eval;					// Expression value
+	uint64_t eval;				// Expression value
 	WORD eattr;					// Expression attributes
 	SYM * esym;					// External symbol involved in expr.
 	TOKEN r_expr[EXPRSIZE];		// Expression token list
@@ -321,11 +321,11 @@ int GenerateRISCCode(int state)
 				return error("constant out of range");
 
 			if (parm & SUB32)
-				reg1 = 32 - eval;
+				reg1 = 32 - (int)eval;
 			else if (type == RI_NUM_32)
-				reg1 = (reg1 == 32 ? 0 : eval);
+				reg1 = (reg1 == 32 ? 0 : (int)eval);
 			else
-				reg1 = eval;
+				reg1 = (int)eval;
 		}
 
 		CHECK_COMMA;
@@ -503,7 +503,7 @@ int GenerateRISCCode(int state)
 					if (!(eattr & DEFINED))
 						return error("constant expected after '+'");
 
-					reg1 = eval;
+					reg1 = (int)eval;
 
 					if (reg1 == 0)
 					{
@@ -626,7 +626,7 @@ int GenerateRISCCode(int state)
 					}
 					else
 					{
-						reg2 = eval;
+						reg2 = (int)eval;
 
 						if (reg2 == 0)
 						{
@@ -722,8 +722,9 @@ int GenerateRISCCode(int state)
 			{
 				// CC using a constant number
 				tok++;
-				val = *tok;
-				tok++;
+				uint64_t *tok64 = (uint64_t *)tok;
+				val = (int)*tok64++;
+				tok = (uint32_t *)tok64;
 				CHECK_COMMA;
 			}
 			else if (*tok == SYMBOL)