Fix for D_foo() macros.

[rmac] / riscasm.c

diff --git a/riscasm.c b/riscasm.c
index 533eca7e41f52f75b70b39c834968bb0a97069ad..26dd8cb98f7012a9be833638f20e370277e52b2f 100644 (file)
--- 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,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");
                                }