[PATCH, ARM] Consistent naming for CBZ instructions

Mark Shinwell shinwell@codesourcery.com
Sun Nov 12 14:02:00 GMT 2006


This patch makes consistent the various places in gas where the
CBZ and CBNZ instructions are referred to.  (I understand that these
used to be called czbeq and czbne but were subsequently renamed.)

Tested for arm-none-eabi with no regressions.  OK to apply?

Mark

--


2006-11-12  Mark Shinwell  <shinwell@codesourcery.com>

         * config/tc-arm.c (do_t_czb): Rename to do_t_cbz.
         (insns): Adjust accordingly.
         (md_apply_fix): Alter comments to use CBZ instead of CZB.


Index: gas/config/tc-arm.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-arm.c,v
retrieving revision 1.299
diff -U3 -p -r1.299 tc-arm.c
--- gas/config/tc-arm.c 10 Nov 2006 09:32:42 -0000      1.299
+++ gas/config/tc-arm.c 12 Nov 2006 13:44:23 -0000
@@ -8970,7 +8970,7 @@ do_t_cpy (void)
  }

  static void
-do_t_czb (void)
+do_t_cbz (void)
  {
    constraint (current_it_mask, BAD_NOT_IT);
    constraint (inst.operands[0].reg > 7, BAD_HIREG);
@@ -14980,8 +14980,8 @@ static const struct asm_opcode insns[] =
   TC3(ldrsbt,   03000d0, f9100e00, 2, (RR, ADDR), ldsttv4, t_ldstt),
   TC3(strht,    02000b0, f8200e00, 2, (RR, ADDR), ldsttv4, t_ldstt),

-  UT(cbnz,      b900,    2, (RR, EXP), t_czb),
-  UT(cbz,       b100,    2, (RR, EXP), t_czb),
+  UT(cbnz,      b900,    2, (RR, EXP), t_cbz),
+  UT(cbz,       b100,    2, (RR, EXP), t_cbz),
   /* ARM does not really have an IT instruction, so always allow it.  */
  #undef ARM_VARIANT
  #define ARM_VARIANT &arm_ext_v1
@@ -18027,8 +18027,8 @@ md_apply_fix (fixS *    fixP,
         }
        break;

-    case BFD_RELOC_THUMB_PCREL_BRANCH7: /* CZB */
-      /* CZB can only branch forward.  */
+    case BFD_RELOC_THUMB_PCREL_BRANCH7: /* CBZ */
+      /* CBZ can only branch forward.  */
        if (value & ~0x7e)
         as_bad_where (fixP->fx_file, fixP->fx_line,
                       _("branch out of range"));



More information about the Binutils mailing list