X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=riscasm.c;h=26dd8cb98f7012a9be833638f20e370277e52b2f;hp=63466716173eef8ae94f8a348d3dd8981e6d479b;hb=9153334781cd2e23750f4dc002e847606c07a1f0;hpb=ff8188b7e279f99cf11ac8a283c4146af324d26f

diff --git a/riscasm.c b/riscasm.c
index 6346671..26dd8cb 100644
--- a/riscasm.c
+++ b/riscasm.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // RISCA.C - GPU/DSP Assembler
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -193,8 +193,8 @@ int GetRegister(WORD rattr)
 	}
 
 	// If we got a register in range (0-31), return it
-	if ((eval >= 0) && (eval <= 31))
-		return eval;
+	if (eval <= 31)
+		return (int)eval;
 
 	// Otherwise, it's out of range & we flag an error
 	return error(reg_err);
@@ -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,9 +722,9 @@ int GenerateRISCCode(int state)
 			{
 				// CC using a constant number
 				tok++;
-				tok++;		// Toss hi LONG, as most likely not 64-bit number
-				val = *tok;	// Use lo LONG
-				tok++;
+				uint64_t *tok64 = (uint64_t *)tok;
+				val = (int)*tok64++;
+				tok = (uint32_t *)tok64;
 				CHECK_COMMA;
 			}
 			else if (*tok == SYMBOL)
@@ -751,7 +751,7 @@ int GenerateRISCCode(int state)
 					ccsym = lookup(string[tok[1]], LABEL, 0);
 
 					if (ccsym && (ccsym->sattre & EQUATEDCC) && !(ccsym->sattre & UNDEF_CC))
-						val = ccsym->svalue;
+						val = (int)ccsym->svalue;
 					else
 						return error("unknown condition code");
 				}