Fix compile time warnings generated by gcc 4.0

diff --git a/ChangeLog b/ChangeLog
index d91ffcf268a1b9b51e7b1b9d47554b4d90eca538..9f130bf78c0b73ae095143fed27949f5a66228df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-23  Nick Clifton  <nickc@redhat.com>
+
+       * opcodes.scm (gen-parse-number): Add a cast to the desired
+       pointer signed'ness in order to prevent compile time warnings.
+       * cpu/ip2k.opc: Fixed compile time warnings about differing
+       signed'ness of pointers passed to functions.
+       * cpu/iq2000.opc: Likewise.
+       * cpu/m32r.opc: Likewise.
+       * cpu/openrisc.opc: Likewise.
+       * cpu/xstormy16.opc: Likewise.
+
 2005-02-22  Alan Modra  <amodra@bigpond.net.au>
 
        * desc-cpu.scm (gen-ifld-decls): Move cgen_ifld_table from here..

diff --git a/cpu/ip2k.opc b/cpu/ip2k.opc
index 9e57961ed0bca739ce352d67330b1a0562906fef..10e69be462e5b3450211e38bac71f95ab0d02757 100644 (file)
--- a/cpu/ip2k.opc
+++ b/cpu/ip2k.opc
@@ -1,6 +1,6 @@
 /* IP2K opcode support.  -*- C -*-
    Copyright (C) 2000 Red Hat, Inc.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
    This file is part of CGEN.  */
 
 /*
@@ -73,13 +73,15 @@ ip2k_cgen_insn_supported (cd, insn)
 /* -- asm.c */
 
 #define PARSE_FUNC_DECL(name) \
-static const char *name PARAMS ((CGEN_CPU_DESC, const char **, int, long *))
+  static const char *name (CGEN_CPU_DESC, const char **, int, long *)
+#define PARSE_UFUNC_DECL(name) \
+  static const char *name (CGEN_CPU_DESC, const char **, int, unsigned long *)
 
-PARSE_FUNC_DECL (parse_fr);
-PARSE_FUNC_DECL (parse_addr16);
-PARSE_FUNC_DECL (parse_addr16_cjp);
+PARSE_UFUNC_DECL (parse_fr);
+PARSE_UFUNC_DECL (parse_addr16);
+PARSE_UFUNC_DECL (parse_addr16_cjp);
 PARSE_FUNC_DECL (parse_lit8);
-PARSE_FUNC_DECL (parse_bit3);
+PARSE_UFUNC_DECL (parse_bit3);
 
 
 static const char *
@@ -87,7 +89,7 @@ parse_fr (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd;
      const char **strp;
      int opindex;
-     long *valuep;
+     unsigned long *valuep;
 {
   const char *errmsg;
   const char *old_strp;
@@ -100,47 +102,41 @@ parse_fr (cd, strp, opindex, valuep)
   old_strp = *strp;
   afteroffset = NULL; 
 
-
-  /* Check here to see if you're about to try parsing a w as the first arg */
-  /* and return an error if you are.                                       */
-  if ( (strncmp(*strp,"w",1)==0) || (strncmp(*strp,"W",1)==0) )
+  /* Check here to see if you're about to try parsing a w as the first arg
+     and return an error if you are.  */
+  if ((strncmp (*strp, "w", 1) == 0) || (strncmp (*strp, "W", 1) == 0))
     {
       (*strp)++;
 
-      if ( (strncmp(*strp,",",1)==0) || ISSPACE(**strp) )
+      if ((strncmp (*strp, ",", 1) == 0) || ISSPACE (**strp))
        {
-         /* We've been passed a w.  Return with an error message so that  */
-         /* cgen will try the next parsing option.                        */
+         /* We've been passed a w.  Return with an error message so that
+            cgen will try the next parsing option.  */
          errmsg = _("W keyword invalid in FR operand slot.");
          return errmsg;
        }
       *strp = old_strp;
     }
 
-
   /* Attempt parse as register keyword. */
-  /* old_strp = *strp; */
-
   errmsg = cgen_parse_keyword (cd, strp, & ip2k_cgen_opval_register_names,
-                              valuep);
-  if ( *strp != NULL )
-    if (errmsg == NULL)
-      return errmsg;
+                              (long *) valuep);
+  if (*strp != NULL
+      && errmsg == NULL)
+    return errmsg;
 
-  /* Attempt to parse for "(IP)" */
-  afteroffset = strstr(*strp,"(IP)");
+  /* Attempt to parse for "(IP)".  */
+  afteroffset = strstr (*strp, "(IP)");
 
-  if ( afteroffset == NULL)
-    {
-      /* Make sure it's not in lower case */
-      afteroffset = strstr(*strp,"(ip)");
-    }
+  if (afteroffset == NULL)
+    /* Make sure it's not in lower case.  */
+    afteroffset = strstr (*strp, "(ip)");
 
-  if ( afteroffset != NULL )
+  if (afteroffset != NULL)
     {
-      if ( afteroffset != *strp )
+      if (afteroffset != *strp)
        {
-         /* Invalid offset present.*/
+         /* Invalid offset present.  */
          errmsg = _("offset(IP) is not a valid form");
          return errmsg;
        }
@@ -153,47 +149,42 @@ parse_fr (cd, strp, opindex, valuep)
        }
     }
 
-  /* Attempt to parse for DP. ex: mov w, offset(DP)  */
-  /*                              mov offset(DP),w   */
-
-  /* Try parsing it as an address and see what comes back */
+  /* Attempt to parse for DP. ex: mov w, offset(DP)
+                                  mov offset(DP),w   */
 
-  afteroffset = strstr(*strp,"(DP)");
+  /* Try parsing it as an address and see what comes back.  */
+  afteroffset = strstr (*strp, "(DP)");
 
-  if ( afteroffset == NULL)
-    {
-      /* Maybe it's in lower case */
-      afteroffset = strstr(*strp,"(dp)");
-    }
+  if (afteroffset == NULL)
+    /* Maybe it's in lower case.  */
+    afteroffset = strstr (*strp, "(dp)");
 
-  if ( afteroffset != NULL )
+  if (afteroffset != NULL)
     {
-      if ( afteroffset == *strp )
+      if (afteroffset == *strp)
        {
-         /* No offset present. Use 0 by default. */
+         /* No offset present. Use 0 by default.  */
          tempvalue = 0;
          errmsg = NULL;
        }
       else
-       {
-         errmsg = cgen_parse_address (cd, strp, opindex,
-                                      BFD_RELOC_IP2K_FR_OFFSET,
-                                      & result_type, & tempvalue);
-       }
+       errmsg = cgen_parse_address (cd, strp, opindex,
+                                    BFD_RELOC_IP2K_FR_OFFSET,
+                                    & result_type, & tempvalue);
 
       if (errmsg == NULL)
        {
          if (tempvalue <= 127)
            {
-             /* Value is ok.  Fix up the first 2 bits and return */       
+             /* Value is ok.  Fix up the first 2 bits and return.  */
              *valuep = 0x0100 | tempvalue;
-             *strp += 4; /* skip over the (DP) in *strp */
+             *strp += 4; /* skip over the (DP) in *strp.  */
              return errmsg;
            }
          else
            {
              /* Found something there in front of (DP) but it's out
-                of range. */
+                of range.  */
              errmsg = _("(DP) offset out of range.");
              return errmsg;
            }
@@ -201,54 +192,47 @@ parse_fr (cd, strp, opindex, valuep)
     }
 
 
-  /* Attempt to parse for SP. ex: mov w, offset(SP)  */
-  /*                              mov offset(SP), w  */
-
-
-  afteroffset = strstr(*strp,"(SP)");
+  /* Attempt to parse for SP. ex: mov w, offset(SP)
+                                  mov offset(SP), w.  */
+  afteroffset = strstr (*strp, "(SP)");
 
   if (afteroffset == NULL)
-    {
-      /* Maybe it's in lower case. */
-      afteroffset = strstr(*strp, "(sp)");
-    }
+    /* Maybe it's in lower case.  */
+    afteroffset = strstr (*strp, "(sp)");
 
-  if ( afteroffset != NULL )
+  if (afteroffset != NULL)
     {
-      if ( afteroffset ==  *strp )
+      if (afteroffset == *strp)
        {
-         /* No offset present. Use 0 by default. */
+         /* No offset present. Use 0 by default.  */
          tempvalue = 0;
          errmsg = NULL;
        }
       else
-       {
-         errmsg = cgen_parse_address (cd, strp, opindex,
-                                      BFD_RELOC_IP2K_FR_OFFSET,
-                                      & result_type, & tempvalue);
-       }
+       errmsg = cgen_parse_address (cd, strp, opindex,
+                                    BFD_RELOC_IP2K_FR_OFFSET,
+                                    & result_type, & tempvalue);
+
       if (errmsg == NULL)
        {
          if (tempvalue <= 127)
            {
-             /* Value is ok.  Fix up the first 2 bits and return */
+             /* Value is ok.  Fix up the first 2 bits and return.  */
              *valuep = 0x0180 | tempvalue;
-             *strp += 4; /* skip over the (SP) in *strp */
+             *strp += 4; /* skip over the (SP) in *strp.  */
              return errmsg;
            }
          else
            {
              /* Found something there in front of (SP) but it's out
-                of range. */
+                of range.  */
              errmsg = _("(SP) offset out of range.");
              return errmsg;
            }
-        
        }
     }
 
-
-  /* Attempt to parse as an address. */
+  /* Attempt to parse as an address.  */
   *strp = old_strp;
   errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_IP2K_FR9,
                               & result_type, & value);
@@ -256,14 +240,12 @@ parse_fr (cd, strp, opindex, valuep)
     {
       *valuep = value;
 
-      /* if a parenthesis is found, warn about invalid form */
-
+      /* if a parenthesis is found, warn about invalid form.  */
       if (**strp == '(')
-       {
-         errmsg = _("illegal use of parentheses");
-        }
+       errmsg = _("illegal use of parentheses");
+
       /* if a numeric value is specified, ensure that it is between
-        1 and 255 */
+        1 and 255.  */
       else if (result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
        {
          if (value < 0x1 || value > 0xff)
@@ -278,16 +260,16 @@ parse_addr16 (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd;
      const char **strp;
      int opindex;
-     long *valuep;
+     unsigned long *valuep;
 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;
   bfd_reloc_code_real_type code = BFD_RELOC_NONE;
   bfd_vma value;
 
-  if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16H )
+  if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16H)
     code = BFD_RELOC_IP2K_HI8DATA;
-  else if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16L )
+  else if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16L)
     code = BFD_RELOC_IP2K_LO8DATA;
   else
     {
@@ -301,10 +283,10 @@ parse_addr16 (cd, strp, opindex, valuep)
   if (errmsg == NULL)
     {
       /* We either have a relocation or a number now. */
-      if ( result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER )
+      if (result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
        {
          /* We got a number back. */
-         if ( code == BFD_RELOC_IP2K_HI8DATA )
+         if (code == BFD_RELOC_IP2K_HI8DATA)
             value >>= 8;
          else    /* code = BFD_RELOC_IP2K_LOW8DATA */
            value &= 0x00FF;
@@ -321,35 +303,35 @@ parse_addr16_cjp (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd;
      const char **strp;
      int opindex;
-     long *valuep;
+     unsigned long *valuep;
 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;
   bfd_reloc_code_real_type code = BFD_RELOC_NONE;
   bfd_vma value;
  
-  if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16CJP )
+  if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16CJP)
     code = BFD_RELOC_IP2K_ADDR16CJP;
-  else if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16P )
+  else if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16P)
     code = BFD_RELOC_IP2K_PAGE3;
 
   errmsg = cgen_parse_address (cd, strp, opindex, code,
                               & result_type, & value);
   if (errmsg == NULL)
     {
-      if ( result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER )
+      if (result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
        {
-         if ( (value & 0x1) == 0)  /* If the address is even .... */
+         if ((value & 0x1) == 0)  /* If the address is even .... */
            {
-             if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16CJP )
+             if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16CJP)
                 *valuep = (value >> 1) & 0x1FFF;  /* Should mask be 1FFF? */
-             else if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16P )
+             else if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16P)
                 *valuep = (value >> 14) & 0x7;
            }
           else
            errmsg = _("Byte address required. - must be even.");
        }
-      else if ( result_type == CGEN_PARSE_OPERAND_RESULT_QUEUED )
+      else if (result_type == CGEN_PARSE_OPERAND_RESULT_QUEUED)
        {
          /* This will happen for things like (s2-s1) where s2 and s1
             are labels.  */
@@ -436,7 +418,7 @@ parse_bit3 (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd;
      const char **strp;
      int opindex;
-     long *valuep;
+     unsigned long *valuep;
 {
   const char *errmsg;
   char mode = 0;
@@ -459,13 +441,13 @@ parse_bit3 (cd, strp, opindex, valuep)
       mode = 2;
     }
 
-  errmsg = cgen_parse_signed_integer (cd, strp, opindex, valuep);
+  errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, valuep);
   if (errmsg)
     return errmsg;
 
   if (mode)
     {
-      value = (unsigned long) *valuep;
+      value = * valuep;
       if (value == 0)
        {
          errmsg = _("Attempt to find bit index of 0");

diff --git a/cpu/iq2000.opc b/cpu/iq2000.opc
index b4fc88cf1b9266993fb25fddbae551f1c1e1ab11..727ad408b2cee1036ecdf20667b62d9e113af24a 100644 (file)
--- a/cpu/iq2000.opc
+++ b/cpu/iq2000.opc
@@ -1,5 +1,5 @@
 /* IQ2000 opcode support.  -*- C -*-
-   Copyright (C) 1996, 1997, 1998, 2001, 2002 Red Hat Inc.
+   Copyright (C) 1996, 1997, 1998, 2001, 2002, 2005 Red Hat Inc.
    This file is part of CGEN.  */
 
 /* This file is an addendum to iq2000.cpu.  Heavy use of C code isn't
@@ -40,11 +40,11 @@ extern int iq2000_cgen_insn_supported (CGEN_CPU_DESC cd, const CGEN_INSN *insn);
 
 static int iq2000_cgen_isa_register PARAMS ((const char **));
 static const char * parse_jtargq10 PARAMS ((CGEN_CPU_DESC, const char **, int, int, enum cgen_parse_operand_result *, bfd_vma *));
-static const char * parse_mimm PARAMS ((CGEN_CPU_DESC, const char **, int, long *));
+static const char * parse_mimm PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
 static const char * parse_imm  PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
 static const char * parse_hi16 PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
-static const char * parse_lo16 PARAMS ((CGEN_CPU_DESC, const char **, int, long *));
-static const char * parse_mlo16 PARAMS ((CGEN_CPU_DESC, const char **, int, long *));
+static const char * parse_lo16 PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
+static const char * parse_mlo16 PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
 
 /* Special check to ensure that instruction exists for given machine */
 int
@@ -93,11 +93,11 @@ parse_mimm (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd;
      const char **strp;
      int opindex;
-     long *valuep;
+     unsigned long *valuep;
 {
   const char *errmsg;
 
-  /* Verify this isn't a register */
+  /* Verify this isn't a register.  */
   if (iq2000_cgen_isa_register (strp))
     errmsg = _("immediate value cannot be register");
   else
@@ -108,6 +108,7 @@ parse_mimm (cd, strp, opindex, valuep)
       if (errmsg == NULL)
        {
          long x = (-value) & 0xFFFF0000;
+
          if (x != 0 && x != (long) 0xFFFF0000)
            errmsg = _("immediate value out of range");
          else
@@ -248,7 +249,7 @@ parse_lo16 (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd;
      const char **strp;
      int opindex;
-     long *valuep;
+     unsigned long *valuep;
 {
   if (strncasecmp (*strp, "%lo(", 4) == 0)
     {
@@ -281,7 +282,7 @@ parse_mlo16 (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd;
      const char **strp;
      int opindex;
-     long *valuep;
+     unsigned long *valuep;
 {
   if (strncasecmp (*strp, "%lo(", 4) == 0)
     {

diff --git a/cpu/m32r.opc b/cpu/m32r.opc
index b3e780917cb5b8ec12d1d2ae677c3290016e3940..25f8d24398ce0dd049f03e3c47ab10ff2561f526 100644 (file)
--- a/cpu/m32r.opc
+++ b/cpu/m32r.opc
@@ -1,5 +1,5 @@
 /* M32R opcode support.  -*- C -*-
-   Copyright (C) 2000, 2001, 2004 Red Hat, Inc.
+   Copyright (C) 2000, 2001, 2004, 2005 Red Hat, Inc.
    This file is part of CGEN.  */
 
 /* This file is an addendum to m32r.cpu.  Heavy use of C code isn't
@@ -65,7 +65,7 @@ m32r_cgen_dis_hash (buf, value)
 \f
 /* -- asm.c */
 static const char * parse_hash
-  PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
+  PARAMS ((CGEN_CPU_DESC, const char **, int, long *));
 static const char * parse_hi16
   PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
 static const char * parse_slo16
@@ -80,7 +80,7 @@ parse_hash (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd ATTRIBUTE_UNUSED;
      const char **strp;
      int opindex ATTRIBUTE_UNUSED;
-     unsigned long *valuep ATTRIBUTE_UNUSED;
+     long *valuep ATTRIBUTE_UNUSED;
 {
   if (**strp == '#')
     ++*strp;
@@ -266,12 +266,12 @@ my_print_insn (cd, pc, info)
      bfd_vma pc;
      disassemble_info *info;
 {
-  char buffer[CGEN_MAX_INSN_SIZE];
-  char *buf = buffer;
+  bfd_byte buffer[CGEN_MAX_INSN_SIZE];
+  bfd_byte *buf = buffer;
   int status;
   int buflen = (pc & 3) == 0 ? 4 : 2;
   int big_p = CGEN_CPU_INSN_ENDIAN (cd) == CGEN_ENDIAN_BIG;
-  char *x;
+  bfd_byte *x;
 
   /* Read the base part of the insn.  */
 

diff --git a/cpu/openrisc.opc b/cpu/openrisc.opc
index 7e18bba1a46fbcd3ff82e3b34632ac89394dcf09..c65b1d0cee8ef0680b1d7d49fa84955611cdde3f 100644 (file)
--- a/cpu/openrisc.opc
+++ b/cpu/openrisc.opc
@@ -1,5 +1,5 @@
 /* OpenRISC opcode support.  -*- C -*-
-   Copyright (C) 2000, 2001, 2003 Free Software Foundation
+   Copyright (C) 2000, 2001, 2003, 2005 Free Software Foundation
    Based upon work by Red Hat, Inc.
    This file is part of CGEN.  */
 
@@ -36,9 +36,9 @@ extern long openrisc_sign_extend_16bit PARAMS ((long));
 #define CGEN_VERBOSE_ASSEMBLER_ERRORS
 
 static const char * parse_hi16
-  PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
+  PARAMS ((CGEN_CPU_DESC, const char **, int, long *));
 static const char * parse_lo16
-  PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
+  PARAMS ((CGEN_CPU_DESC, const char **, int, long *));
 
 long
 openrisc_sign_extend_16bit (value)
@@ -54,7 +54,7 @@ parse_hi16 (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd;
      const char **strp;
      int opindex;
-     unsigned long *valuep;
+     long *valuep;
 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;
@@ -68,13 +68,7 @@ parse_hi16 (cd, strp, opindex, valuep)
       bfd_vma value;
 
       *strp += 3;
-#if 0
-      errmsg = cgen_parse_signed_integer (cd, strp, opindex, valuep);
-      if (errmsg != NULL)
-        fprintf (stderr, "parse_hi: %s\n", errmsg);
-      if (errmsg != NULL)
-#endif
-        errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_HI16,
+      errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_HI16,
                                      &result_type, &value);
       if (**strp != ')')
         return _("missing `)'");
@@ -90,12 +84,14 @@ parse_hi16 (cd, strp, opindex, valuep)
       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;
        }
@@ -112,7 +108,7 @@ parse_lo16 (cd, strp, opindex, valuep)
      CGEN_CPU_DESC cd;
      const char **strp;
      int opindex;
-     unsigned long *valuep;
+     long *valuep;
 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;
@@ -126,15 +122,8 @@ parse_lo16 (cd, strp, opindex, valuep)
       bfd_vma value;
 
       *strp += 3;
-#if 0 
-      errmsg = cgen_parse_signed_integer (cd, strp, opindex, valuep);
-      if (errmsg != NULL)
-        fprintf (stderr, "parse_lo: %s\n", errmsg);
-
-      if (errmsg != NULL)
-#endif
-        errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_LO16,
-                                     &result_type, &value);
+      errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_LO16,
+                                  &result_type, &value);
       if (**strp != ')')
         return _("missing `)'");
 
@@ -146,12 +135,14 @@ parse_lo16 (cd, strp, opindex, valuep)
       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;
        }

diff --git a/cpu/xstormy16.opc b/cpu/xstormy16.opc
index f9c1c9c0153ab7c51a600dbf412cb87733494bdd..ac0676db845cab52ddcdbaac82498959738ab637 100644 (file)
--- a/cpu/xstormy16.opc
+++ b/cpu/xstormy16.opc
@@ -1,5 +1,5 @@
 /* XSTORMY16 opcode support.  -*- C -*-
-   Copyright (C) 2001, 2002 Red Hat, Inc.
+   Copyright (C) 2001, 2002, 2005 Red Hat, Inc.
    This file is part of CGEN.  */
 
 /* This file is an addendum to xstormy16.cpu.  Heavy use of C code isn't
@@ -65,7 +65,7 @@ parse_mem8 (cd, strp, opindex, valuep)
        return _("Bad register name");
     }
   else if (cgen_parse_keyword (cd, strp, & xstormy16_cgen_opval_gr_names, 
-                              valuep) == NULL)
+                              (long *) valuep) == NULL)
     return _("Label conflicts with register name");
   else if (strncasecmp (*strp, "rx,", 3) == 0
           || strncasecmp (*strp, "rxl,", 3) == 0

diff --git a/opcodes.scm b/opcodes.scm
index c9ee71d10e9a88ccba26f188e0bdbbb9f6e83ba5..24c5e74f5b04e7d63ac1083e1c679f1da551f000 100644 (file)
--- a/opcodes.scm
+++ b/opcodes.scm
@@ -1,5 +1,5 @@
 ; General cpu info generator support.
-; Copyright (C) 2000, 2002 Red Hat, Inc.
+; Copyright (C) 2000, 2002, 2005 Red Hat, Inc.
 ; This file is part of CGEN.
 
 ; Global state variables.
@@ -334,8 +334,15 @@
                      (obj:name mode)))))
    " (cd, strp, "
    op-enum
-   ", &" result-var-name
-   ");\n"
+   ", "
+   ; This is to pacify gcc 4.x which will complain about
+   ; incorrect signed-ness of pointers passed to functions.
+   (case (obj:name mode)
+        ((QI HI SI INT) "(long *)")
+        ((BI UQI UHI USI UINT) "(unsigned long *)")
+   )
+   " (& " result-var-name
+   "));\n"
    )
 )