1. Check unsigned immediate operands validity. 2. Update coprocessor id to be unsigne...

diff --git a/gas/config/tc-crx.c b/gas/config/tc-crx.c
index b1063a05eb484dd5392cd05d02eb2504c093c3f7..e3145f5b5fd8f704737e59544f2dc0a8a8b4da0f 100644 (file)
--- a/gas/config/tc-crx.c
+++ b/gas/config/tc-crx.c
@@ -2071,6 +2071,21 @@ assemble_insn (char *mnemonic, ins *insn)
             done_flag = (post_inc_mode == IS_INSN_TYPE (LD_STOR_INS_INC));
         }
 
+      if (done_flag)
+       {
+         for (i = 0; i < insn->nargs; i++)
+           {
+             if (((instruction->operands[i].op_type == us3)
+                   || (instruction->operands[i].op_type == us4)
+                   || (instruction->operands[i].op_type == us5))
+                 && (insn->arg[i].signflag == 1))
+                 {
+                   done_flag = 0;
+                   break;
+                 }
+           }
+       }
+
       if (done_flag == 0)
         {
          /* Try again with next instruction.  */
@@ -2118,7 +2133,7 @@ assemble_insn (char *mnemonic, ins *insn)
          || IS_INSN_TYPE (COP_BRANCH_INS))
        {
          /* The coprocessor id is always the first argument.  */
-         if ((instruction->operands[0].op_type == i4)
+         if ((instruction->operands[0].op_type == us4)
              && (insn->arg[0].constant == 0)
              && (! IS_INSN_MNEMONIC ("mtcr")
                  && ! IS_INSN_MNEMONIC ("mfcr")))