Fix bug parsing shigh(0xffff8000)

diff --git a/ChangeLog b/ChangeLog
index 6bbb34d2311da2d639ed06eb45272ea0f5610f40..4406214d9fc422c01a11a8b73bdb38901da95456 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-30  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+       * cpu/m32r.opc (parse_hi16): Fixed shigh(0xffff8000) bug.
+
 2004-03-22  Dave Brolley  <brolley@redhat.com>
 
        * utils.scm (copyright-fsf): Update copyright years.

diff --git a/cpu/m32r.opc b/cpu/m32r.opc
index 2a3ac4477945fc9f458e359a4a89bb37d2e3f650..b3e780917cb5b8ec12d1d2ae677c3290016e3940 100644 (file)
--- a/cpu/m32r.opc
+++ b/cpu/m32r.opc
@@ -1,5 +1,5 @@
 /* M32R opcode support.  -*- C -*-
-   Copyright (C) 2000, 2001 Red Hat, Inc.
+   Copyright (C) 2000, 2001, 2004 Red Hat, Inc.
    This file is part of CGEN.  */
 
 /* This file is an addendum to m32r.cpu.  Heavy use of C code isn't
@@ -15,8 +15,7 @@
    <arch>-opc.c additions use: "-- opc.c"
    <arch>-asm.c additions use: "-- asm.c"
    <arch>-dis.c additions use: "-- dis.c"
-   <arch>-ibd.h additions use: "-- ibd.h"
-*/
+   <arch>-ibd.h additions use: "-- ibd.h"  */
 \f
 /* -- opc.h */
 
@@ -128,7 +127,10 @@ parse_hi16 (cd, strp, opindex, valuep)
       ++*strp;
       if (errmsg == NULL
          && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
-       value = (value >> 16) + (value & 0x8000 ? 1 : 0);
+        {
+          value = value + (value & 0x8000 ? 0x10000 : 0);
+          value >>= 16;
+        }
       *valuep = value;
       return errmsg;
     }