Minor arm cleanup

Jeffrey A Law law@cygnus.com
Wed Oct 27 15:54:00 GMT 1999


We generally frown upon lower-case macros.

This change changes the bad_pc and bad_args macros to be upper case.  That's
it.

	* tc-arm.c (bad_args, bad_pc): Renamed to BAD_ARGS and BAD_PC
	respectively.

Index: tc-arm.c
===================================================================
RCS file: /cvs/binutils/binutils/gas/config/tc-arm.c,v
retrieving revision 1.22
diff -c -3 -p -r1.22 tc-arm.c
*** tc-arm.c	1999/10/27 18:12:32	1.22
--- tc-arm.c	1999/10/27 22:50:54
*************** static CONST struct reg_entry reg_table[
*** 875,882 ****
    {NULL, 0}
  };
  
! #define bad_args 	_("Bad arguments to instruction");
! #define bad_pc 		_("r15 not allowed here");
  
  static struct hash_control * arm_ops_hsh = NULL;
  static struct hash_control * arm_tops_hsh = NULL;
--- 875,882 ----
    {NULL, 0}
  };
  
! #define BAD_ARGS 	_("Bad arguments to instruction");
! #define BAD_PC 		_("r15 not allowed here");
  
  static struct hash_control * arm_ops_hsh = NULL;
  static struct hash_control * arm_tops_hsh = NULL;
*************** do_mrs (str, flags)
*** 1840,1846 ****
  
    if (reg_required_here (&str, 12) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
--- 1840,1846 ----
  
    if (reg_required_here (&str, 12) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
*************** do_msr (str, flags)
*** 1874,1880 ****
        if (skip_past_comma (&str) == FAIL
  	  || (reg = reg_required_here (&str, 0)) == FAIL)
  	{
! 	  inst.error = bad_args;
  	  return;
  	}
      }
--- 1874,1880 ----
        if (skip_past_comma (&str) == FAIL
  	  || (reg = reg_required_here (&str, 0)) == FAIL)
  	{
! 	  inst.error = BAD_ARGS;
  	  return;
  	}
      }
*************** do_msr (str, flags)
*** 1886,1898 ****
  	inst.instruction |= PSR_CONTROL;
        else
  	{
! 	  inst.error = bad_args;
  	  return;
  	}
        
        if (skip_past_comma (&str) == FAIL)
  	{
! 	  inst.error = bad_args;
  	  return;
  	}
        
--- 1886,1898 ----
  	inst.instruction |= PSR_CONTROL;
        else
  	{
! 	  inst.error = BAD_ARGS;
  	  return;
  	}
        
        if (skip_past_comma (&str) == FAIL)
  	{
! 	  inst.error = BAD_ARGS;
  	  return;
  	}
        
*************** do_mull (str, flags)
*** 1962,1982 ****
  
    if ((rdlo = reg_required_here (&str, 12)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
    if (skip_past_comma (&str) == FAIL
        || (rdhi = reg_required_here (&str, 16)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
    if (skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 0)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
--- 1962,1982 ----
  
    if ((rdlo = reg_required_here (&str, 12)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
    if (skip_past_comma (&str) == FAIL
        || (rdhi = reg_required_here (&str, 16)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
    if (skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 0)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
*************** do_mull (str, flags)
*** 1987,1999 ****
    if (skip_past_comma (&str) == FAIL
        || (rs = reg_required_here (&str, 8)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
    if (rdhi == REG_PC || rdhi == REG_PC || rdhi == REG_PC || rdhi == REG_PC)
      {
!       inst.error = bad_pc;
        return;
      }
     
--- 1987,1999 ----
    if (skip_past_comma (&str) == FAIL
        || (rs = reg_required_here (&str, 8)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
    if (rdhi == REG_PC || rdhi == REG_PC || rdhi == REG_PC || rdhi == REG_PC)
      {
!       inst.error = BAD_PC;
        return;
      }
     
*************** do_mul (str, flags)
*** 2014,2039 ****
  
    if ((rd = reg_required_here (&str, 16)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
    if (rd == REG_PC)
      {
!       inst.error = bad_pc;
        return;
      }
  
    if (skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 0)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
    if (rm == REG_PC)
      {
!       inst.error = bad_pc;
        return;
      }
  
--- 2014,2039 ----
  
    if ((rd = reg_required_here (&str, 16)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
    if (rd == REG_PC)
      {
!       inst.error = BAD_PC;
        return;
      }
  
    if (skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 0)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
    if (rm == REG_PC)
      {
!       inst.error = BAD_PC;
        return;
      }
  
*************** do_mul (str, flags)
*** 2043,2055 ****
    if (skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 8)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
    if (rm == REG_PC)
      {
!       inst.error = bad_pc;
        return;
      }
  
--- 2043,2055 ----
    if (skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 8)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
    if (rm == REG_PC)
      {
!       inst.error = BAD_PC;
        return;
      }
  
*************** do_mla (str, flags)
*** 2070,2095 ****
  
    if ((rd = reg_required_here (&str, 16)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
    if (rd == REG_PC)
      {
!       inst.error = bad_pc;
        return;
      }
  
    if (skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 0)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
    if (rm == REG_PC)
      {
!       inst.error = bad_pc;
        return;
      }
  
--- 2070,2095 ----
  
    if ((rd = reg_required_here (&str, 16)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
    if (rd == REG_PC)
      {
!       inst.error = BAD_PC;
        return;
      }
  
    if (skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 0)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
    if (rm == REG_PC)
      {
!       inst.error = BAD_PC;
        return;
      }
  
*************** do_mla (str, flags)
*** 2101,2113 ****
        || skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 12)) == FAIL)
      {
!       inst.error = bad_args;
        return;
      }
  
    if (rd == REG_PC || rm == REG_PC)
      {
!       inst.error = bad_pc;
        return;
      }
  
--- 2101,2113 ----
        || skip_past_comma (&str) == FAIL
        || (rm = reg_required_here (&str, 12)) == FAIL)
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
    if (rd == REG_PC || rm == REG_PC)
      {
!       inst.error = BAD_PC;
        return;
      }
  
*************** do_arit (str, flags)
*** 2597,2603 ****
        || data_op2 (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 2597,2603 ----
        || data_op2 (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_adr (str, flags)
*** 2621,2627 ****
        || my_get_expression (&inst.reloc.exp, &str))
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
    /* Frag hacking will turn this into a sub instruction if the offset turns
--- 2621,2627 ----
        || my_get_expression (&inst.reloc.exp, &str))
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
    /* Frag hacking will turn this into a sub instruction if the offset turns
*************** do_adrl (str, flags)
*** 2651,2657 ****
        || my_get_expression (& inst.reloc.exp, & str))
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
    
--- 2651,2657 ----
        || my_get_expression (& inst.reloc.exp, & str))
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
    
*************** do_cmp (str, flags)
*** 2678,2684 ****
    if (reg_required_here (&str, 16) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 2678,2684 ----
    if (reg_required_here (&str, 16) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_cmp (str, flags)
*** 2686,2692 ****
        || data_op2 (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 2686,2692 ----
        || data_op2 (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_mov (str, flags)
*** 2708,2714 ****
    if (reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 2708,2714 ----
    if (reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_mov (str, flags)
*** 2716,2722 ****
        || data_op2 (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 2716,2722 ----
        || data_op2 (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_ldst (str, flags)
*** 2834,2840 ****
    if ((conflict_reg = reg_required_here (& str, 12)) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 2834,2840 ----
    if ((conflict_reg = reg_required_here (& str, 12)) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_ldmstm (str, flags)
*** 3160,3166 ****
        || (range = reg_list (&str)) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3160,3166 ----
        || (range = reg_list (&str)) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_swap (str, flags)
*** 3220,3226 ****
        || (reg = reg_required_here (&str, 0)) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3220,3226 ----
        || (reg = reg_required_here (&str, 0)) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_swap (str, flags)
*** 3233,3239 ****
    if (skip_past_comma (&str) == FAIL
        || *str++ != '[')
      {
!       inst.error = bad_args;
        return;
      }
  
--- 3233,3239 ----
    if (skip_past_comma (&str) == FAIL
        || *str++ != '[')
      {
!       inst.error = BAD_ARGS;
        return;
      }
  
*************** do_swap (str, flags)
*** 3244,3250 ****
  
    if (reg == REG_PC)
      {
!       inst.error = bad_pc;
        return;
      }
  
--- 3244,3250 ----
  
    if (reg == REG_PC)
      {
!       inst.error = BAD_PC;
        return;
      }
  
*************** do_cdp (str, flags)
*** 3338,3344 ****
    if (co_proc_number (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3338,3344 ----
    if (co_proc_number (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_cdp (str, flags)
*** 3346,3352 ****
        || cp_opc_expr (&str, 20,4) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3346,3352 ----
        || cp_opc_expr (&str, 20,4) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_cdp (str, flags)
*** 3354,3360 ****
        || cp_reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3354,3360 ----
        || cp_reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_cdp (str, flags)
*** 3362,3368 ****
        || cp_reg_required_here (&str, 16) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3362,3368 ----
        || cp_reg_required_here (&str, 16) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_cdp (str, flags)
*** 3370,3376 ****
        || cp_reg_required_here (&str, 0) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3370,3376 ----
        || cp_reg_required_here (&str, 0) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_cdp (str, flags)
*** 3379,3385 ****
        if (cp_opc_expr (&str, 5, 3) == FAIL)
  	{
  	  if (!inst.error)
! 	    inst.error = bad_args;
  	  return;
  	}
      }
--- 3379,3385 ----
        if (cp_opc_expr (&str, 5, 3) == FAIL)
  	{
  	  if (!inst.error)
! 	    inst.error = BAD_ARGS;
  	  return;
  	}
      }
*************** do_lstc (str, flags)
*** 3401,3407 ****
    if (co_proc_number (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3401,3407 ----
    if (co_proc_number (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_lstc (str, flags)
*** 3409,3415 ****
        || cp_reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3409,3415 ----
        || cp_reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_lstc (str, flags)
*** 3417,3423 ****
        || cp_address_required_here (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3417,3423 ----
        || cp_address_required_here (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_co_reg (str, flags)
*** 3439,3445 ****
    if (co_proc_number (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3439,3445 ----
    if (co_proc_number (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_co_reg (str, flags)
*** 3447,3453 ****
        || cp_opc_expr (&str, 21, 3) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3447,3453 ----
        || cp_opc_expr (&str, 21, 3) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_co_reg (str, flags)
*** 3455,3461 ****
        || reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3455,3461 ----
        || reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_co_reg (str, flags)
*** 3463,3469 ****
        || cp_reg_required_here (&str, 16) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3463,3469 ----
        || cp_reg_required_here (&str, 16) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_co_reg (str, flags)
*** 3471,3477 ****
        || cp_reg_required_here (&str, 0) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3471,3477 ----
        || cp_reg_required_here (&str, 0) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_co_reg (str, flags)
*** 3480,3486 ****
        if (cp_opc_expr (&str, 5, 3) == FAIL)
  	{
  	  if (!inst.error)
! 	    inst.error = bad_args;
  	  return;
  	}
      }
--- 3480,3486 ----
        if (cp_opc_expr (&str, 5, 3) == FAIL)
  	{
  	  if (!inst.error)
! 	    inst.error = BAD_ARGS;
  	  return;
  	}
      }
*************** do_fp_ctrl (str, flags)
*** 3502,3508 ****
    if (reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3502,3508 ----
    if (reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_ldst (str, flags)
*** 3537,3543 ****
    if (fp_reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3537,3543 ----
    if (fp_reg_required_here (&str, 12) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_ldst (str, flags)
*** 3545,3551 ****
        || cp_address_required_here (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3545,3551 ----
        || cp_address_required_here (&str) == FAIL)
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_ldmstm (str, flags)
*** 3564,3570 ****
    if (fp_reg_required_here (&str, 12) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3564,3570 ----
    if (fp_reg_required_here (&str, 12) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_ldmstm (str, flags)
*** 3622,3628 ****
  	  || *str != '[')
  	{
  	  if (! inst.error)
! 	    inst.error = bad_args;
  	  return;
  	}
  
--- 3622,3628 ----
  	  || *str != '[')
  	{
  	  if (! inst.error)
! 	    inst.error = BAD_ARGS;
  	  return;
  	}
  
*************** do_fp_ldmstm (str, flags)
*** 3636,3642 ****
  
        if (*str != ']')
  	{
! 	  inst.error = bad_args;
  	  return;
  	}
  
--- 3636,3642 ----
  
        if (*str != ']')
  	{
! 	  inst.error = BAD_ARGS;
  	  return;
  	}
  
*************** do_fp_ldmstm (str, flags)
*** 3684,3690 ****
  	   || cp_address_required_here (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3684,3690 ----
  	   || cp_address_required_here (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_dyadic (str, flags)
*** 3715,3721 ****
    if (fp_reg_required_here (&str, 12) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3715,3721 ----
    if (fp_reg_required_here (&str, 12) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_dyadic (str, flags)
*** 3723,3729 ****
        || fp_reg_required_here (&str, 16) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3723,3729 ----
        || fp_reg_required_here (&str, 16) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_dyadic (str, flags)
*** 3731,3737 ****
        || fp_op2 (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3731,3737 ----
        || fp_op2 (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_monadic (str, flags)
*** 3764,3770 ****
    if (fp_reg_required_here (&str, 12) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3764,3770 ----
    if (fp_reg_required_here (&str, 12) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_monadic (str, flags)
*** 3772,3778 ****
        || fp_op2 (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3772,3778 ----
        || fp_op2 (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_cmp (str, flags)
*** 3791,3797 ****
    if (fp_reg_required_here (&str, 16) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3791,3797 ----
    if (fp_reg_required_here (&str, 16) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_cmp (str, flags)
*** 3799,3805 ****
        || fp_op2 (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3799,3805 ----
        || fp_op2 (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_from_reg (str, flags)
*** 3832,3838 ****
    if (fp_reg_required_here (&str, 16) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3832,3838 ----
    if (fp_reg_required_here (&str, 16) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_from_reg (str, flags)
*** 3840,3846 ****
        || reg_required_here (&str, 12) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3840,3846 ----
        || reg_required_here (&str, 12) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_fp_to_reg (str, flags)
*** 3863,3869 ****
        || fp_reg_required_here (&str, 0) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3863,3869 ----
        || fp_reg_required_here (&str, 0) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** thumb_add_sub (str, subtract)
*** 3929,3935 ****
        || skip_past_comma (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 3929,3935 ----
        || skip_past_comma (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** thumb_shift (str, shift)
*** 4096,4102 ****
        || skip_past_comma (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 4096,4102 ----
        || skip_past_comma (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** thumb_mov_compare (str, move)
*** 4205,4211 ****
        || skip_past_comma (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 4205,4211 ----
        || skip_past_comma (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** thumb_load_store (str, load_store, size)
*** 4294,4300 ****
        || skip_past_comma (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 4294,4300 ----
        || skip_past_comma (&str) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_t_arit (str)
*** 4506,4512 ****
        || (Rs = thumb_reg (&str, THUMB_REG_LO)) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 4506,4512 ----
        || (Rs = thumb_reg (&str, THUMB_REG_LO)) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_t_arit (str)
*** 4520,4526 ****
  	  || inst.instruction == T_OPCODE_NEG
   	  || inst.instruction == T_OPCODE_MVN)
  	{
! 	  inst.error = bad_args;
  	  return;
  	}
  
--- 4520,4526 ----
  	  || inst.instruction == T_OPCODE_NEG
   	  || inst.instruction == T_OPCODE_MVN)
  	{
! 	  inst.error = BAD_ARGS;
  	  return;
  	}
  
*************** do_t_ldmstm (str)
*** 4689,4695 ****
        || (range = reg_list (&str)) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 4689,4695 ----
        || (range = reg_list (&str)) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_t_push_pop (str)
*** 4789,4795 ****
    if ((range = reg_list (&str)) == FAIL)
      {
        if (! inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 4789,4795 ----
    if ((range = reg_list (&str)) == FAIL)
      {
        if (! inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  
*************** do_t_adr (str)
*** 4877,4883 ****
        || my_get_expression (&inst.reloc.exp, &str))
      {
        if (!inst.error)
! 	inst.error = bad_args;
        return;
      }
  
--- 4877,4883 ----
        || my_get_expression (&inst.reloc.exp, &str))
      {
        if (!inst.error)
! 	inst.error = BAD_ARGS;
        return;
      }
  





More information about the Binutils mailing list