Update to HEAD.

[pf3gnuchains/pf3gnuchains3x.git] / gas / config / tc-m68hc11.c

diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c
index dde6a37..488a8e5 100644 (file)
--- a/gas/config/tc-m68hc11.c
+++ b/gas/config/tc-m68hc11.c
@@ -1522,9 +1522,9 @@ build_jump_insn (struct m68hc11_opcode *opcode, operand operands[],
 
   /* The relative branch conversion is not supported for
      brclr and brset.  */
-  assert ((opcode->format & M6811_OP_BITMASK) == 0);
-  assert (nb_operands == 1);
-  assert (operands[0].reg1 == REG_NONE && operands[0].reg2 == REG_NONE);
+  gas_assert ((opcode->format & M6811_OP_BITMASK) == 0);
+  gas_assert (nb_operands == 1);
+  gas_assert (operands[0].reg1 == REG_NONE && operands[0].reg2 == REG_NONE);
 
   code = opcode->opcode;
 
@@ -1672,9 +1672,9 @@ build_dbranch_insn (struct m68hc11_opcode *opcode, operand operands[],
 
   /* The relative branch conversion is not supported for
      brclr and brset.  */
-  assert ((opcode->format & M6811_OP_BITMASK) == 0);
-  assert (nb_operands == 2);
-  assert (operands[0].reg1 != REG_NONE);
+  gas_assert ((opcode->format & M6811_OP_BITMASK) == 0);
+  gas_assert (nb_operands == 2);
+  gas_assert (operands[0].reg1 != REG_NONE);
 
   code = opcode->opcode & 0x0FF;
 
@@ -2618,7 +2618,7 @@ s_m68hc11_mark_symbol (int mark)
       bfdsym = symbol_get_bfdsym (symbolP);
       elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym);
 
-      assert (elfsym);
+      gas_assert (elfsym);
 
       /* Mark the symbol far (using rtc for function return).  */
       elfsym->internal_elf_sym.st_other |= mark;
@@ -2823,7 +2823,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, asection *sec ATTRIBUTE_UNUSED,
 
     case ENCODE_RELAX (STATE_PC_RELATIVE, STATE_WORD):
       /* This relax is only for bsr and bra.  */
-      assert (IS_OPCODE (fragP->fr_opcode[0], M6811_BSR)
+      gas_assert (IS_OPCODE (fragP->fr_opcode[0], M6811_BSR)
              || IS_OPCODE (fragP->fr_opcode[0], M6811_BRA)
              || IS_OPCODE (fragP->fr_opcode[0], M6812_BSR));
 
@@ -2964,7 +2964,7 @@ md_estimate_size_before_relax (fragS *fragP, asection *segment)
            case STATE_PC_RELATIVE:
 
              /* This relax is only for bsr and bra.  */
-             assert (IS_OPCODE (fragP->fr_opcode[0], M6811_BSR)
+             gas_assert (IS_OPCODE (fragP->fr_opcode[0], M6811_BSR)
                      || IS_OPCODE (fragP->fr_opcode[0], M6811_BRA)
                      || IS_OPCODE (fragP->fr_opcode[0], M6812_BSR));
 
@@ -2984,7 +2984,7 @@ md_estimate_size_before_relax (fragS *fragP, asection *segment)
              break;
 
            case STATE_CONDITIONAL_BRANCH:
-             assert (current_architecture & cpu6811);
+             gas_assert (current_architecture & cpu6811);
 
              fragP->fr_opcode[0] ^= 1; /* Reverse sense of branch.  */
              fragP->fr_opcode[1] = 3;  /* Skip next jmp insn (3 bytes).  */
@@ -3000,7 +3000,7 @@ md_estimate_size_before_relax (fragS *fragP, asection *segment)
              break;
 
            case STATE_INDEXED_OFFSET:
-             assert (current_architecture & cpu6812);
+             gas_assert (current_architecture & cpu6812);
 
               if (fragP->fr_symbol
                   && S_GET_SEGMENT (fragP->fr_symbol) == absolute_section)
@@ -3022,7 +3022,7 @@ md_estimate_size_before_relax (fragS *fragP, asection *segment)
              break;
 
            case STATE_INDEXED_PCREL:
-             assert (current_architecture & cpu6812);
+             gas_assert (current_architecture & cpu6812);
 
               if (fragP->fr_symbol
                   && S_GET_SEGMENT (fragP->fr_symbol) == absolute_section)
@@ -3045,7 +3045,7 @@ md_estimate_size_before_relax (fragS *fragP, asection *segment)
              break;
 
            case STATE_XBCC_BRANCH:
-             assert (current_architecture & cpu6812);
+             gas_assert (current_architecture & cpu6812);
 
              fragP->fr_opcode[0] ^= 0x20;      /* Reverse sense of branch.  */
              fragP->fr_opcode[1] = 3;  /* Skip next jmp insn (3 bytes).  */
@@ -3061,7 +3061,7 @@ md_estimate_size_before_relax (fragS *fragP, asection *segment)
              break;
 
            case STATE_CONDITIONAL_BRANCH_6812:
-             assert (current_architecture & cpu6812);
+             gas_assert (current_architecture & cpu6812);
 
              /* Translate into a lbcc branch.  */
              fragP->fr_opcode[1] = fragP->fr_opcode[0];
@@ -3086,7 +3086,7 @@ md_estimate_size_before_relax (fragS *fragP, asection *segment)
        {
        case STATE_PC_RELATIVE:
          /* This relax is only for bsr and bra.  */
-         assert (IS_OPCODE (fragP->fr_opcode[0], M6811_BSR)
+         gas_assert (IS_OPCODE (fragP->fr_opcode[0], M6811_BSR)
                  || IS_OPCODE (fragP->fr_opcode[0], M6811_BRA)
                  || IS_OPCODE (fragP->fr_opcode[0], M6812_BSR));
 
@@ -3094,34 +3094,34 @@ md_estimate_size_before_relax (fragS *fragP, asection *segment)
          break;
 
        case STATE_CONDITIONAL_BRANCH:
-         assert (current_architecture & cpu6811);
+         gas_assert (current_architecture & cpu6811);
 
          fragP->fr_subtype = ENCODE_RELAX (STATE_CONDITIONAL_BRANCH,
                                            STATE_BYTE);
          break;
 
        case STATE_INDEXED_OFFSET:
-         assert (current_architecture & cpu6812);
+         gas_assert (current_architecture & cpu6812);
 
          fragP->fr_subtype = ENCODE_RELAX (STATE_INDEXED_OFFSET,
                                            STATE_BITS5);
          break;
 
        case STATE_INDEXED_PCREL:
-         assert (current_architecture & cpu6812);
+         gas_assert (current_architecture & cpu6812);
 
          fragP->fr_subtype = ENCODE_RELAX (STATE_INDEXED_PCREL,
                                            STATE_BITS5);
          break;
 
        case STATE_XBCC_BRANCH:
-         assert (current_architecture & cpu6812);
+         gas_assert (current_architecture & cpu6812);
 
          fragP->fr_subtype = ENCODE_RELAX (STATE_XBCC_BRANCH, STATE_BYTE);
          break;
 
        case STATE_CONDITIONAL_BRANCH_6812:
-         assert (current_architecture & cpu6812);
+         gas_assert (current_architecture & cpu6812);
 
          fragP->fr_subtype = ENCODE_RELAX (STATE_CONDITIONAL_BRANCH_6812,
                                            STATE_BYTE);