Cope with renames of a few BFD types & enums.

This commit is contained in:
John Gilmore 1991-10-05 04:50:54 +00:00
parent 0a5403df39
commit e779a58cf4
2 changed files with 117 additions and 90 deletions

View File

@ -1,3 +1,7 @@
Fri Oct 4 21:49:44 1991 John Gilmore (gnu at cygnus.com)
* objdump.c: Cope with renames of a few BFD types & enums.
Fri Oct 4 19:08:09 1991 Roland H. Pesch (pesch at cygnus.com)
* binutils.texinfo: add new file (rudimentary docn)

View File

@ -102,6 +102,7 @@ bfd *abfd;
#define PF(x,y) \
if (section->flags & x) { printf("%s%s",comma,y); comma = ", "; }
printf("SECTION %d [%s]\t: size %08x",
section->index,
section->name,
@ -255,13 +256,15 @@ disassemble_data(abfd)
bfd *abfd;
{
bfd_byte *data = NULL;
bfd_arch_info_type *info ;
bfd_size_type datasize = 0;
bfd_size_type i;
int (*print)() ;
int print_insn_m68k();
int print_insn_a29k();
int print_insn_i960();
int print_insn_sparc();
unsigned int (*print)() ;
unsigned int print_insn_m68k();
unsigned int print_insn_a29k();
unsigned int print_insn_i960();
unsigned int print_insn_sparc();
unsigned int print_insn_h8300();
enum bfd_architecture a;
unsigned long m;
asection *section;
@ -291,17 +294,26 @@ bfd *abfd;
}
if (machine!= (char *)NULL) {
if (bfd_scan_arch_mach(machine, &a, &m) == false) {
info = bfd_scan_arch(machine);
if (info == 0) {
fprintf(stderr,"%s: Can't use supplied machine %s\n",
program_name,
machine);
exit(1);
}
abfd->arch_info = info;
}
/* See if we can disassemble using bfd */
if(abfd->arch_info->disassemble) {
print = abfd->arch_info->disassemble;
}
else {
a = bfd_get_architecture(abfd);
}
a = bfd_get_arch(abfd);
switch (a) {
case bfd_arch_sparc:
print = print_insn_sparc;
@ -318,10 +330,11 @@ bfd *abfd;
default:
fprintf(stderr,"%s: Can't disassemble for architecture %s\n",
program_name,
bfd_printable_arch_mach(bfd_get_architecture(abfd),0));
bfd_printable_arch_mach(bfd_get_arch(abfd),0));
exit(1);
}
}
for (section = abfd->sections;
section != (asection *)NULL;
@ -407,8 +420,8 @@ display_bfd (abfd)
char *comma = "";
printf("architecture: %s, ",
bfd_printable_arch_mach (bfd_get_architecture (abfd),
bfd_get_machine (abfd)));
bfd_printable_arch_mach (bfd_get_arch (abfd),
bfd_get_mach (abfd)));
printf("flags 0x%08x:\n", abfd->flags);
#define PF(x, y) if (abfd->flags & x) {printf("%s%s", comma, y); comma=", ";}
@ -553,12 +566,14 @@ dump_symbols (abfd)
printf("SYMBOL TABLE:\n");
for (count = 0; count < symcount; count++) {
if ((*current)->the_bfd) {
if (*current && (*current)->the_bfd) {
bfd_print_symbol((*current)->the_bfd,
stdout,
*current, bfd_print_symbol_all_enum);
*current, bfd_print_symbol_all);
printf("\n");
}
current++;
}
@ -647,9 +662,11 @@ DEFUN_VOID(display_info)
{
for (j = (int)bfd_arch_obscure +1; j < (int)bfd_arch_last; j++)
{
if (bfd_set_arch_mach(abfd, (enum bfd_architecture)j, 0))
printf(" %s\n",
bfd_printable_arch_mach((enum bfd_architecture)j,0));
}
}
@ -660,14 +677,18 @@ DEFUN_VOID(display_info)
printf("%s ",target_vector[i]->name);
}
printf("\n");
for (j = (int)bfd_arch_obscure +1; j <(int) bfd_arch_last; j++) {
printf("%11s ", bfd_printable_arch_mach((enum bfd_architecture)j,0));
for (j = (int)bfd_arch_obscure +1; (int)j <(int) bfd_arch_last; j++)
{
if (strcmp(bfd_printable_arch_mach(j,0),"UNKNOWN!") != 0) {
printf("%11s ", bfd_printable_arch_mach(j,0));
for (i = 0; target_vector[i]; i++) {
{
bfd_target *p = target_vector[i];
bfd *abfd = bfd_openw("##dummy",p->name);
int l = strlen(p->name);
int ok = bfd_set_arch_mach(abfd, (enum bfd_architecture)j, 0);
int ok = bfd_set_arch_mach(abfd, j, 0);
if (ok) {
printf("%s ", p->name);
}
@ -679,11 +700,12 @@ DEFUN_VOID(display_info)
}
}
}
}
printf("\n");
}
}
}
/** main and like trivia */
int
main (argc, argv)
@ -697,6 +719,7 @@ main (argc, argv)
boolean seenflag = false;
int ind = 0;
bfd_init();
program_name = *argv;
while ((c = getopt_long (argc, argv, "ib:m:dlfahrtxsj:", long_options, &ind))