Partial fix for bug #108 (Fixup cleanups).

[rmac] / riscasm.c

diff --git a/riscasm.c b/riscasm.c
index 79f9ae26425b2b12e1c2b333165bda61ebe5c688..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
 //
@@ -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
@@ -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);
@@ -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)
@@ -750,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");
                                }