X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fcoffdump.c;h=90ce55032e6d2e60ec871fc4428bfdf0b4077a3d;hb=8b89121d4444e5c23295c63835da538b11d4cb49;hp=428f598bc68d374b05870fc38802fadc61c7ec1e;hpb=9382dad2ae0113981f7b1a27145d6d790b492b55;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/coffdump.c b/binutils/coffdump.c index 428f598bc6..90ce55032e 100644 --- a/binutils/coffdump.c +++ b/binutils/coffdump.c @@ -1,6 +1,5 @@ /* Coff file dumper. - Copyright 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, - 2011 Free Software Foundation, Inc. + Copyright (C) 1994-2015 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -127,56 +126,56 @@ static void dump_coff_type (struct coff_type *p) { tab (1); - printf ("size %d ", p->size); + printf (_("size %d "), p->size); switch (p->type) { case coff_secdef_type: - printf ("section definition at %x size %x\n", + printf (_("section definition at %x size %x\n"), p->u.asecdef.address, p->u.asecdef.size); nl (); break; case coff_pointer_type: - printf ("pointer to"); + printf (_("pointer to")); nl (); dump_coff_type (p->u.pointer.points_to); break; case coff_array_type: - printf ("array [%d] of", p->u.array.dim); + printf (_("array [%d] of"), p->u.array.dim); nl (); dump_coff_type (p->u.array.array_of); break; case coff_function_type: - printf ("function returning"); + printf (_("function returning")); nl (); dump_coff_type (p->u.function.function_returns); dump_coff_lines (p->u.function.lines); - printf ("arguments"); + printf (_("arguments")); nl (); dump_coff_scope (p->u.function.parameters); tab (0); - printf ("code"); + printf (_("code")); nl (); dump_coff_scope (p->u.function.code); tab(0); break; case coff_structdef_type: - printf ("structure definition"); + printf (_("structure definition")); nl (); dump_coff_scope (p->u.astructdef.elements); break; case coff_structref_type: if (!p->u.aenumref.ref) - printf ("structure ref to UNKNOWN struct"); + printf (_("structure ref to UNKNOWN struct")); else - printf ("structure ref to %s", p->u.aenumref.ref->name); + printf (_("structure ref to %s"), p->u.aenumref.ref->name); break; case coff_enumref_type: - printf ("enum ref to %s", p->u.astructref.ref->name); + printf (_("enum ref to %s"), p->u.astructref.ref->name); break; case coff_enumdef_type: - printf ("enum definition"); + printf (_("enum definition")); nl (); dump_coff_scope (p->u.aenumdef.elements); break; @@ -249,22 +248,22 @@ dump_coff_where (struct coff_where *p) switch (p->where) { case coff_where_stack: - printf ("Stack offset %x", p->offset); + printf (_("Stack offset %x"), p->offset); break; case coff_where_memory: - printf ("Memory section %s+%x", p->section->name, p->offset); + printf (_("Memory section %s+%x"), p->section->name, p->offset); break; case coff_where_register: - printf ("Register %d", p->offset); + printf (_("Register %d"), p->offset); break; case coff_where_member_of_struct: - printf ("Struct Member offset %x", p->offset); + printf (_("Struct Member offset %x"), p->offset); break; case coff_where_member_of_enum: - printf ("Enum Member offset %x", p->offset); + printf (_("Enum Member offset %x"), p->offset); break; case coff_where_unknown: - printf ("Undefined symbol"); + printf (_("Undefined symbol")); break; case coff_where_strtag: printf ("STRTAG"); @@ -331,27 +330,27 @@ static void dump_coff_symbol (struct coff_symbol *p) { tab (1); - printf ("List of symbols"); + printf (_("List of symbols")); nl (); while (p) { tab (1); tab (1); - printf ("Symbol %s, tag %d, number %d", p->name, p->tag, p->number); + printf (_("Symbol %s, tag %d, number %d"), p->name, p->tag, p->number); nl (); tab (-1); tab (1); - printf ("Type"); + printf (_("Type")); nl (); dump_coff_type (p->type); tab (-1); tab (1); - printf ("Where"); + printf (_("Where")); dump_coff_where (p->where); tab (-1); tab (1); - printf ("Visible"); + printf (_("Visible")); dump_coff_visible (p->visible); tab (-1); p = p->next; @@ -366,7 +365,8 @@ dump_coff_scope (struct coff_scope *p) if (p) { tab (1); - printf ("List of blocks %" BFD_VMA_FMT "x ",(bfd_vma) (uintptr_t) p); + printf ("%s %" BFD_VMA_FMT "x ", + _("List of blocks "), (bfd_vma) (uintptr_t) p); if (p->sec) printf( " %s %x..%x", p->sec->name,p->offset, p->offset + p->size -1); @@ -379,10 +379,10 @@ dump_coff_scope (struct coff_scope *p) while (p) { tab (0); - printf ("vars %d", p->nvars); + printf (_("vars %d"), p->nvars); nl (); dump_coff_symbol (p->vars_head); - printf ("blocks"); + printf (_("blocks")); nl (); dump_coff_scope (p->list_head); nl (); @@ -400,13 +400,13 @@ static void dump_coff_sfile (struct coff_sfile *p) { tab (1); - printf ("List of source files"); + printf (_("List of source files")); nl (); while (p) { tab (0); - printf ("Source file %s", p->name); + printf (_("Source file %s"), p->name); nl (); dump_coff_scope (p->scope); p = p->next; @@ -417,21 +417,23 @@ dump_coff_sfile (struct coff_sfile *p) static void dump_coff_section (struct coff_section *ptr) { - int i; + unsigned int i; tab (1); - printf ("section %s %d %d address %x size %x number %d nrelocs %d", + printf (_("section %s %d %d address %x size %x number %d nrelocs %u"), ptr->name, ptr->code, ptr->data, ptr->address,ptr->size, ptr->number, ptr->nrelocs); nl (); for (i = 0; i < ptr->nrelocs; i++) { + struct coff_reloc * r = ptr->relocs + i; tab (0); printf ("(%x %s %x)", - ptr->relocs[i].offset, - ptr->relocs[i].symbol->name, - ptr->relocs[i].addend); + r->offset, + /* PR 17512: file: 0a38fb7c. */ + r->symbol == NULL ? _("") : r->symbol->name, + r->addend); nl (); } @@ -445,7 +447,7 @@ coff_dump (struct coff_ofile *ptr) printf ("Coff dump"); nl (); - printf ("#sources %d", ptr->nsources); + printf (_("#sources %d"), ptr->nsources); nl (); dump_coff_sfile (ptr->source_head); @@ -498,6 +500,7 @@ main (int ac, char **av) program_name = av[0]; xmalloc_set_program_name (program_name); + bfd_set_error_program_name (program_name); expandargv (&ac, &av); @@ -549,9 +552,11 @@ main (int ac, char **av) } tree = coff_grok (abfd); - - coff_dump (tree); - printf ("\n"); + if (tree) + { + coff_dump (tree); + printf ("\n"); + } return 0; }