Thu Feb 6 14:14:59 1997 Martin M. Hunt <hunt@pizza.cygnus.com>

	* objdump.c (disassemble_bytes): Added code to allow some control
 	over the way raw instructions are displayed.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4f43f98..d372b44 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  6 14:14:59 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+       * objdump.c (disassemble_bytes): Added code to allow some control
+       over the way raw instructions are displayed.
+
 Thu Feb  6 12:36:03 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * stabs.c (struct bincl_file): Add next_stack field.

diff --git a/binutils/objdump.c b/binutils/objdump.c
index fd73186..77a8d71 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1107,7 +1107,7 @@ disassemble_bytes (info, disassemble_fn, insns, data, start, stop, relppp,
        {
          char buf[1000];
          SFILE sfile;
-         int pb = 0;
+         int bpc, pb = 0;
 
          done_dot = false;
 
@@ -1139,6 +1139,7 @@ disassemble_bytes (info, disassemble_fn, insns, data, start, stop, relppp,
              info->fprintf_func = (fprintf_ftype) objdump_sprintf;
              info->stream = (FILE *) &sfile;
              info->bytes_per_line = 0;
+             info->bytes_per_chunk = 0;
              bytes = (*disassemble_fn) (section->vma + i, info);
              info->fprintf_func = (fprintf_ftype) fprintf;
              info->stream = stdout;
@@ -1170,15 +1171,31 @@ disassemble_bytes (info, disassemble_fn, insns, data, start, stop, relppp,
              long j;
 
              /* If ! prefix_addresses and ! wide_output, we print
-                 four bytes per line.  */
+                 bytes_per_line bytes per line.  */
              pb = bytes;
              if (pb > bytes_per_line && ! prefix_addresses && ! wide_output)
                pb = bytes_per_line;
 
-             for (j = i; j < i + pb; ++j)
+             if (info->bytes_per_chunk)
+               bpc = info->bytes_per_chunk;
+             else
+               bpc = 1;
+
+             for (j = i; j < i + pb; j += bpc)
                {
-                 printf ("%02x", (unsigned) data[j]);
-                 putchar (' ');
+                 int k;
+                 if (bpc > 1 && info->display_endian == BFD_ENDIAN_LITTLE)
+                   {
+                     for (k=bpc-1; k >= 0; k--)
+                       printf ("%02x", (unsigned) data[j+k]);
+                     putchar (' ');
+                   }
+                 else
+                   {
+                     for (k=0; k < bpc; k++)
+                       printf ("%02x", (unsigned) data[j+k]);
+                     putchar (' ');
+                   }
                }
 
              for (; pb < bytes_per_line; ++pb)