Various small fixes including:

[rmac] / riscasm.c

diff --git a/riscasm.c b/riscasm.c
index 533eca7e41f52f75b70b39c834968bb0a97069ad..f9aa055327eeef89d4e7ce5990214e699a2cddb3 100644 (file)
--- a/riscasm.c
+++ b/riscasm.c
@@ -193,7 +193,7 @@ int GetRegister(WORD rattr)
        }
 
        // If we got a register in range (0-31), return it
-       if ((eval >= 0) && (eval <= 31))
+       if (eval <= 31)
                return (int)eval;
 
        // Otherwise, it's out of range & we flag an error
@@ -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");
                                }