Commit ca66f1a1 authored by Lluís Vilanova's avatar Lluís Vilanova Committed by Stefan Hajnoczi
Browse files

disas: Remove unused macro '_' 



Eliminates a future compilation error when UI code includes the tracing
headers (indirectly pulling "disas/bfd.h" through "qom/cpu.h") and
GLib's i18n '_' macro.

Signed-off-by: default avatarLluís Vilanova <vilanova@ac.upc.edu>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 17f7ac75

disas/alpha.c

+3 −3
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static unsigned 
insert_bdisp(unsigned insn, int value, const char **errmsg)

{

  if (errmsg != (const char **)NULL && (value & 3))

    *errmsg = _("branch operand unaligned");

    *errmsg = "branch operand unaligned";

  return insn | ((value / 4) & 0x1FFFFF);

}
@@ -539,7 +539,7 @@ static unsigned 
insert_jhint(unsigned insn, int value, const char **errmsg)

{

  if (errmsg != (const char **)NULL && (value & 3))

    *errmsg = _("jump hint unaligned");

    *errmsg = "jump hint unaligned";

  return insn | ((value / 4) & 0x3FFF);

}
@@ -556,7 +556,7 @@ static unsigned 
insert_ev6hwjhint(unsigned insn, int value, const char **errmsg)

{

  if (errmsg != (const char **)NULL && (value & 3))

    *errmsg = _("jump hint unaligned");

    *errmsg = "jump hint unaligned";

  return insn | ((value / 4) & 0x1FFF);

}

disas/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -1817,7 +1817,7 @@ print_insn_coprocessor (bfd_vma pc, struct disassemble_info *info, long given, 
			  func (stream, "e");

			  break;

			default:

			  func (stream, _("<illegal precision>"));

			  func (stream, "<illegal precision>");

			  break;

			}

		      break;

disas/i386.c

+1 −1
Original line number Diff line number Diff line
@@ -3406,7 +3406,7 @@ static const struct dis386 three_byte_table[][256] = { 
  }

};



#define INTERNAL_DISASSEMBLER_ERROR _("<internal disassembler error>")

#define INTERNAL_DISASSEMBLER_ERROR "<internal disassembler error>"



static void

ckprefix (void)

disas/m68k.c

+2 −2
Original line number Diff line number Diff line
@@ -1676,7 +1676,7 @@ print_insn_arg (const char *d, 
	  (*info->fprintf_func) (info->stream, "%%sfc");

	else

	  /* xgettext:c-format */

	  (*info->fprintf_func) (info->stream, _("<function code %d>"), fc);

	  (*info->fprintf_func) (info->stream, "<function code %d>", fc);

      }

      break;
@@ -1827,7 +1827,7 @@ match_insn_m68k (bfd_vma memaddr, 
	{

	  info->fprintf_func (info->stream,

			      /* xgettext:c-format */

			      _("<internal error in opcode table: %s %s>\n"),

			      "<internal error in opcode table: %s %s>\n",

			      best->name,  best->args);

	  info->fprintf_func = save_printer;

	  info->print_address_func = save_print_address;

disas/mips.c

+25 −25
Original line number Diff line number Diff line
@@ -4257,7 +4257,7 @@ print_insn_args (const char *d, 
	    case '\0':

	      /* xgettext:c-format */

	      (*info->fprintf_func) (info->stream,

				     _("# internal error, incomplete extension sequence (+)"));

				     "# internal error, incomplete extension sequence (+)");

	      return;



	    case 'A':
@@ -4515,7 +4515,7 @@ print_insn_args (const char *d, 
	    default:

	      /* xgettext:c-format */

	      (*info->fprintf_func) (info->stream,

				     _("# internal error, undefined extension sequence (+%c)"),

				     "# internal error, undefined extension sequence (+%c)",

				     *d);

	      return;

	    }
@@ -4875,7 +4875,7 @@ print_insn_args (const char *d, 
	default:

	  /* xgettext:c-format */

	  (*info->fprintf_func) (info->stream,

				 _("# internal error, undefined modifier(%c)"),

				 "# internal error, undefined modifier(%c)",

				 *d);

	  return;

	}
@@ -5739,7 +5739,7 @@ print_mips16_insn_arg (char type, 
      /* xgettext:c-format */

      (*info->fprintf_func)

	(info->stream,

	 _("# internal disassembler error, unrecognised modifier (%c)"),

	 "# internal disassembler error, unrecognised modifier (%c)",

	 type);

      abort ();

    }
@@ -5750,51 +5750,51 @@ print_mips_disassembler_options (FILE *stream) 
{

  unsigned int i;



  fprintf (stream, _("\n\

  fprintf (stream, "\n\

The following MIPS specific disassembler options are supported for use\n\

with the -M switch (multiple options should be separated by commas):\n"));

with the -M switch (multiple options should be separated by commas):\n");



  fprintf (stream, _("\n\

  fprintf (stream, "\n\

  gpr-names=ABI            Print GPR names according to  specified ABI.\n\

                           Default: based on binary being disassembled.\n"));

                           Default: based on binary being disassembled.\n");



  fprintf (stream, _("\n\

  fprintf (stream, "\n\

  fpr-names=ABI            Print FPR names according to specified ABI.\n\

                           Default: numeric.\n"));

                           Default: numeric.\n");



  fprintf (stream, _("\n\

  fprintf (stream, "\n\

  cp0-names=ARCH           Print CP0 register names according to\n\

                           specified architecture.\n\

                           Default: based on binary being disassembled.\n"));

                           Default: based on binary being disassembled.\n");



  fprintf (stream, _("\n\

  fprintf (stream, "\n\

  hwr-names=ARCH           Print HWR names according to specified\n\

			   architecture.\n\

                           Default: based on binary being disassembled.\n"));

                           Default: based on binary being disassembled.\n");



  fprintf (stream, _("\n\

  fprintf (stream, "\n\

  reg-names=ABI            Print GPR and FPR names according to\n\

                           specified ABI.\n"));

                           specified ABI.\n");



  fprintf (stream, _("\n\

  fprintf (stream, "\n\

  reg-names=ARCH           Print CP0 register and HWR names according to\n\

                           specified architecture.\n"));

                           specified architecture.\n");



  fprintf (stream, _("\n\

  fprintf (stream, "\n\

  For the options above, the following values are supported for \"ABI\":\n\

   "));

   ");

  for (i = 0; i < ARRAY_SIZE (mips_abi_choices); i++)

    fprintf (stream, " %s", mips_abi_choices[i].name);

  fprintf (stream, _("\n"));

  fprintf (stream, "\n");



  fprintf (stream, _("\n\

  fprintf (stream, "\n\

  For the options above, The following values are supported for \"ARCH\":\n\

   "));

   ");

  for (i = 0; i < ARRAY_SIZE (mips_arch_choices); i++)

    if (*mips_arch_choices[i].name != '\0')

      fprintf (stream, " %s", mips_arch_choices[i].name);

  fprintf (stream, _("\n"));

  fprintf (stream, "\n");



  fprintf (stream, _("\n"));

  fprintf (stream, "\n");

}

#endif