summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpu/ChangeLog4
-rw-r--r--cpu/m32r.opc6
-rw-r--r--opcodes/ChangeLog4
-rw-r--r--opcodes/m32r-asm.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index 5478b4d375..0d8f21d913 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-19 Nick Clifton <nickc@redhat.com>
+
+ * m32r.opc (parse_slo16): Fix bad application of previous patch.
+
2005-10-18 Andreas Schwab <schwab@suse.de>
* m32r.opc (parse_slo16): Better version of previous patch.
diff --git a/cpu/m32r.opc b/cpu/m32r.opc
index 2459fecbf5..f2351b106a 100644
--- a/cpu/m32r.opc
+++ b/cpu/m32r.opc
@@ -179,11 +179,7 @@ parse_slo16 (CGEN_CPU_DESC cd,
++*strp;
if (errmsg == NULL
&& result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- {
- value &= 0xffff;
- if (value & 0x8000)
- value = ((value & 0xffff) ^ 0x8000) - 0x8000;
- }
+ value = ((value & 0xffff) ^ 0x8000) - 0x8000;
*valuep = value;
return errmsg;
}
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7f878692ff..6cc3b9902f 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-18 Nick Clifton <nickc@redhat.com>
+
+ * m32r-asm.c: Regenerate after updating m32r.opc.
+
2005-10-18 Jie Zhang <jie.zhang@analog.com>
* bfin-dis.c (print_insn_bfin): Do proper endian transform when
diff --git a/opcodes/m32r-asm.c b/opcodes/m32r-asm.c
index 39546082d4..50f1363e77 100644
--- a/opcodes/m32r-asm.c
+++ b/opcodes/m32r-asm.c
@@ -141,11 +141,7 @@ parse_slo16 (CGEN_CPU_DESC cd,
++*strp;
if (errmsg == NULL
&& result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- {
- value &= 0xffff;
- if (value & 0x8000)
- value = ((value & 0xffff) ^ 0x8000) - 0x8000;
- }
+ value = ((value & 0xffff) ^ 0x8000) - 0x8000;
*valuep = value;
return errmsg;
}