* cpu/openrisc.opc (openrisc_sign_extend_16bit): Don't rely on

	"short" being 16 bit.
	(parse_hi16): Likewise.  Fix type-punned pointer warnings too, and
	internationalize error message.
	(parse_lo16): Likewise.  Remove useless code.

diff --git a/ChangeLog b/ChangeLog
index c4e5036e65dc58bb7afb2cc331d5b6f658ba6299..74c037199ac675551015f15d8c6cb9eae6c6d805 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-04  Alan Modra  <amodra@bigpond.net.au>
+
+       * cpu/openrisc.opc (openrisc_sign_extend_16bit): Don't rely on
+       "short" being 16 bit.
+       (parse_hi16): Likewise.  Fix type-punned pointer warnings too, and
+       internationalize error message.
+       (parse_lo16): Likewise.  Remove useless code.
+
 2003-12-03  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
 
        * cpu/m32r.cpu : Add new model m32r2.

diff --git a/cpu/openrisc.opc b/cpu/openrisc.opc
index 4b6b0d7e9d54e47355c78037cd0b2df5a1d91eac..7e18bba1a46fbcd3ff82e3b34632ac89394dcf09 100644 (file)
--- a/cpu/openrisc.opc
+++ b/cpu/openrisc.opc
@@ -1,5 +1,5 @@
 /* OpenRISC opcode support.  -*- C -*-
-   Copyright (C) 2000, 2001 Free Software Foundation
+   Copyright (C) 2000, 2001, 2003 Free Software Foundation
    Based upon work by Red Hat, Inc.
    This file is part of CGEN.  */
 
@@ -44,7 +44,7 @@ long
 openrisc_sign_extend_16bit (value)
      long value;
 {
-  return (long) (short) value;
+  return ((value & 0xffff) ^ 0x8000) - 0x8000;
 }
 
 /* Handle hi().  */
@@ -58,15 +58,16 @@ parse_hi16 (cd, strp, opindex, valuep)
 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;
-  bfd_vma value;
+  unsigned long ret;
 
   if (**strp == '#')
     ++*strp;
 
   if (strncasecmp (*strp, "hi(", 3) == 0)
     {
-      *strp += 3;
+      bfd_vma value;
 
+      *strp += 3;
 #if 0
       errmsg = cgen_parse_signed_integer (cd, strp, opindex, valuep);
       if (errmsg != NULL)
@@ -76,23 +77,31 @@ parse_hi16 (cd, strp, opindex, valuep)
         errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_HI16,
                                      &result_type, &value);
       if (**strp != ')')
-        return "missing `)'";
+        return _("missing `)'");
+
       ++*strp;
       if (errmsg == NULL
           && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
         value >>= 16;
-      *valuep = (long) (short) value;
-
-      return errmsg;
+      ret = value;
     }
   else
     {
       if (**strp == '-')
-        errmsg = cgen_parse_signed_integer (cd, strp, opindex, (long *) &value);
+       {
+         long value;
+         errmsg = cgen_parse_signed_integer (cd, strp, opindex, &value);
+         ret = value;
+       }
       else
-        errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, (unsigned long *) &value);
+       {
+         unsigned long value;
+         errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, &value);
+         ret = value;
+       }
     }
-  *valuep = (long) (short) (value & 0xffff);
+
+  *valuep = ((ret & 0xffff) ^ 0x8000) - 0x8000;
   return errmsg;
 }
 
@@ -107,15 +116,16 @@ parse_lo16 (cd, strp, opindex, valuep)
 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;
-  bfd_vma value;
+  unsigned long ret;
 
   if (**strp == '#')
     ++*strp;
 
   if (strncasecmp (*strp, "lo(", 3) == 0)
     {
-      *strp += 3;
+      bfd_vma value;
 
+      *strp += 3;
 #if 0 
       errmsg = cgen_parse_signed_integer (cd, strp, opindex, valuep);
       if (errmsg != NULL)
@@ -126,21 +136,28 @@ parse_lo16 (cd, strp, opindex, valuep)
         errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_LO16,
                                      &result_type, &value);
       if (**strp != ')')
-        return "missing `)'";
-      ++*strp;
-      if (errmsg == NULL
-          && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
-        value &= 0xffff;
-      *valuep = (long) (short) value;
+        return _("missing `)'");
 
-      return errmsg;
+      ++*strp;
+      ret = value;
     }
-
-  if (**strp == '-')
-    errmsg = cgen_parse_signed_integer (cd, strp, opindex, (long *) &value);
   else
-    errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, (unsigned long *) &value);
-  *valuep = (long) (short) (value & 0xffff);
+    {
+      if (**strp == '-')
+       {
+         long value;
+         errmsg = cgen_parse_signed_integer (cd, strp, opindex, &value);
+         ret = value;
+       }
+      else
+       {
+         unsigned long value;
+         errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, &value);
+         ret = value;
+       }
+    }
+
+  *valuep = ((ret & 0xffff) ^ 0x8000) - 0x8000;
   return errmsg;
 }