From 0589a9f783b1eece660b534ed61858c2605e6aad Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Wed, 7 Oct 2015 10:44:48 -0500 Subject: [PATCH 1/1] Fix for bug #34 (equated reg in 1st operand of MOVEI). Thanks to Linkovitch for reporting! --- riscasm.c | 9 +++++++++ version.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/riscasm.c b/riscasm.c index 37e2922..23faaee 100644 --- a/riscasm.c +++ b/riscasm.c @@ -323,6 +323,15 @@ int GenerateRISCCode(int state) tok++; riscImmTokenSeen = 1; + // Check for equated register after # and return error if so + if (*tok == SYMBOL) + { + sy = lookup(string[tok[1]], LABEL, 0); + + if (sy->sattre & EQUATEDREG) + return error("equated register in 1st operand of MOVEI instruction"); + } + if (expr(r_expr, &eval, &eattr, &esym) != OK) return MalformedOpcode(0x04); diff --git a/version.h b/version.h index a46c7b1..238c0ef 100644 --- a/version.h +++ b/version.h @@ -13,6 +13,6 @@ #define MAJOR 1 // Major version number #define MINOR 3 // Minor version number -#define PATCH 9 // Patch release number +#define PATCH 10 // Patch release number #endif // __VERSION_H__ -- 2.37.2