diff options
| author | Jim Kingdon <jkingdon@engr.sgi.com> | 1993-04-01 16:56:06 +0000 |
|---|---|---|
| committer | Jim Kingdon <jkingdon@engr.sgi.com> | 1993-04-01 16:56:06 +0000 |
| commit | f7ed13c7d50d5eb44360d2dd991e78c574460064 (patch) | |
| tree | 687fb4d06db813458d01e3c1726fe4c5af4f507f /binutils | |
| parent | d1c89c281780bf3f8a3c584e5b44926ff347a442 (diff) | |
| download | gdb-f7ed13c7d50d5eb44360d2dd991e78c574460064.zip gdb-f7ed13c7d50d5eb44360d2dd991e78c574460064.tar.gz gdb-f7ed13c7d50d5eb44360d2dd991e78c574460064.tar.bz2 | |
merge binutils and gdb sparc disassemblers
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/.Sanitize | 21 | ||||
| -rw-r--r-- | binutils/ChangeLog | 4 | ||||
| -rw-r--r-- | binutils/Makefile.in | 5 | ||||
| -rw-r--r-- | binutils/objdump.c | 3 |
4 files changed, 7 insertions, 26 deletions
diff --git a/binutils/.Sanitize b/binutils/.Sanitize index 50d2953..7cd4f67 100644 --- a/binutils/.Sanitize +++ b/binutils/.Sanitize @@ -69,24 +69,3 @@ strip.1 version.c Do-last: - -v9dirty="sparc-pinsn.c" - -if ( echo $* | grep keep\-v9 > /dev/null ) ; then - echo Keeping v9 in ${v9dirty} -else - for i in ${v9dirty} ; do - echo Sanitizing v9 in $i - rm -f new - sed '/^#ifndef[ ]NO_V9/,/^#endif/d' < $i > new - if grep -s -i v9 new ; then - echo ***** SANITIZING V9 IN $i FAILED ***** - fi - if [ -n "${safe}" ] ; then - mv $i .Recover - else - rm $i - fi - mv new $i - done -fi diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 0e6dd46..d5837a5 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,9 @@ Wed Mar 31 10:25:29 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + * objdump.c (disassemble_data): print_insn_sparc is now a + `disassemble' not a `print'. + Makefile.in: Remove sparc-pinsn.c (now in libopcodes.a). + * objdump.c (disassemble_data): Use new read_memory_func stuff. Thu Mar 25 10:38:11 1993 Ken Raeburn (raeburn@cambridge.cygnus.com) diff --git a/binutils/Makefile.in b/binutils/Makefile.in index ac7e7b7..595d640 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -112,7 +112,7 @@ INCLUDES = -I. -I$(srcdir) -I$(BASEDIR)/include -I$(BASEDIR)/bfd # When adding .o files, to make VPATH work in Sun Make, you have to # also add a foo.o: foo.c line at the bottom of the file. -DISASMS = i960-pinsn.o sparc-pinsn.o am29k-pinsn.o +DISASMS = i960-pinsn.o am29k-pinsn.o # ## Random definitions @@ -156,7 +156,7 @@ testsuite: check: all /bin/sh $(srcdir)/sanity.sh . -test-install: +installcheck: /bin/sh $(srcdir)/sanity.sh $(bindir) info: binutils.info @@ -411,7 +411,6 @@ not-ranlib.o:not-ranlib.c not-strip.o:not-strip.c objdump.o: objdump.c size.o: size.c -sparc-pinsn.o: sparc-pinsn.c strip.o:strip.c version.o: $(srcdir)/version.c $(CC) $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) -DVERSION='"$(VERSION)"' -c $(srcdir)/version.c diff --git a/binutils/objdump.c b/binutils/objdump.c index 7d36ad0..ab9bb8d 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -311,7 +311,6 @@ disassemble_data (abfd) disassembler_ftype disassemble = 0; /* New style */ unsigned int print_insn_a29k (); unsigned int print_insn_i960 (); - unsigned int print_insn_sparc (); unsigned int print_insn_h8300 (); enum bfd_architecture a; struct disassemble_info disasm_info; @@ -378,7 +377,7 @@ disassemble_data (abfd) switch (a) { case bfd_arch_sparc: - print = print_insn_sparc; + disassemble = print_insn_sparc; break; case bfd_arch_z8k: if (bfd_get_mach(abfd) == bfd_mach_z8001) |