* m32r.opc (parse_slo16): Fix bad application of previous patch.

diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index 5478b4d375bc82bb3bf67ce255fd5de63f909f7c..0d8f21d9136109a240f755e8237b96d12b67d08a 100644 (file)
--- 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 2459fecbf50d9e0a6350cd2f2a266ce5add27257..f2351b106a68571f1287748eeff98a7f078fe570 100644 (file)
--- 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 7f878692ff712ffc1e2cc90d05983877bb0d14c4..6cc3b9902fe66f3d282a37982c821b36b0643eb6 100644 (file)
--- 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 39546082d414ee6eccd72599dfc6a77e80143d9b..50f1363e77797939fdce552ac7cf630adfcf0a0c 100644 (file)
--- 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;
     }