Fix compile time warning messages about signed/unsigned conflicts reported

by GCC 4.0

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b883fbcf9347aea36453b9be0449aa9b9441bd65..52b007eaa85038b8d84ee0989f140fcdd6e4f256 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,16 @@
+2005-07-04  Khem Raj  <kraj@mvista.com>
+           Nick Clifton  <nickc@redhat.com>
+
+       * tc-arm.c (struct arm_it): Make operands.imm signed to match its
+       use an immediate value.
+       (parse_vfp_reg_list): Make the 2nd parameter an unsigned pointer
+       since the register field of the operands structure is unsigned.
+       (s_arm_unwind_save_vfp): Make "reg" unsigned.
+       (parse_operands): Make the 2ns parameter an unsigned pointer to
+       match its use.
+       (do_ldrd): When using the imm field of the operands structure as a
+       second register field, treat it as unsigned.
+
 2005-07-04  Alan Modra  <amodra@bigpond.net.au>
 
        PR 1004

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index c7cc1ff69bcdbc75750af107d050ca3fc3734b22..dfdf7b554ff608127eee94f58a5d41973cbab0c5 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -226,17 +226,17 @@ struct arm_it
   struct
   {
     unsigned reg;
-    unsigned imm;
-    unsigned present   : 1;  /* operand present */
-    unsigned isreg     : 1;  /* operand was a register */
-    unsigned immisreg  : 1;  /* .imm field is a second register */
-    unsigned hasreloc  : 1;  /* operand has relocation suffix */
-    unsigned writeback : 1;  /* operand has trailing ! */
-    unsigned preind    : 1;  /* preindexed address */
-    unsigned postind   : 1;  /* postindexed address */
-    unsigned negative  : 1;  /* index register was negated */
-    unsigned shifted   : 1;  /* shift applied to operation */
-    unsigned shift_kind : 3;  /* shift operation (enum shift_kind) */
+    signed int imm;
+    unsigned present   : 1;  /* Operand present.  */
+    unsigned isreg     : 1;  /* Operand was a register.  */
+    unsigned immisreg  : 1;  /* .imm field is a second register.  */
+    unsigned hasreloc  : 1;  /* Operand has relocation suffix.  */
+    unsigned writeback : 1;  /* Operand has trailing !  */
+    unsigned preind    : 1;  /* Preindexed address.  */
+    unsigned postind   : 1;  /* Postindexed address.  */
+    unsigned negative  : 1;  /* Index register was negated.  */
+    unsigned shifted   : 1;  /* Shift applied to operation.  */
+    unsigned shift_kind : 3;  /* Shift operation (enum shift_kind).  */
   } operands[6];
 };
 
@@ -1035,7 +1035,7 @@ parse_reg_list (char ** strp)
    register.  Double precision registers are matched if DP is nonzero. */
 
 static int
-parse_vfp_reg_list (char **str, int *pbase, int dp)
+parse_vfp_reg_list (char **str, unsigned int *pbase, int dp)
 {
   int base_reg;
   int new_base;
@@ -2335,7 +2335,7 @@ static void
 s_arm_unwind_save_vfp (void)
 {
   int count;
-  int reg;
+  unsigned int reg;
   valueT op;
 
   count = parse_vfp_reg_list (&input_line_pointer, &reg, 1);
@@ -3246,7 +3246,7 @@ parse_address (char **str, int i)
        {
          /* [Rn], {expr} - unindexed, with option */
          if (parse_immediate (&p, &inst.operands[i].imm,
-                                      0, 255, TRUE) == FAIL)
+                              0, 255, TRUE) == FAIL)
            return FAIL;
 
          if (skip_past_char (&p, '}') == FAIL)
@@ -3574,7 +3574,7 @@ enum operand_parse_code
    structure.  Returns SUCCESS or FAIL depending on whether the
    specified grammar matched.  */
 static int
-parse_operands (char *str, const char *pattern)
+parse_operands (char *str, const unsigned char *pattern)
 {
   unsigned const char *upat = pattern;
   char *backtrack_pos = 0;
@@ -4645,8 +4645,8 @@ do_ldrd (void)
       /* For an index-register load, the index register must not overlap the
         destination (even if not write-back).  */
       else if (inst.operands[2].immisreg
-              && (inst.operands[2].imm == inst.operands[0].reg
-                  || inst.operands[2].imm == inst.operands[1].reg))
+              && ((unsigned) inst.operands[2].imm == inst.operands[0].reg
+                  || (unsigned) inst.operands[2].imm == inst.operands[1].reg))
        as_warn (_("index register overlaps destination register"));
     }