* i386-dis.c (print_insn_i8086): New routine to disassemble using

	the 8086 instruction set.
	* i386-dis.c:  General cleanups.  Make most things static.  Add
	prototypes.  Get rid of static variables aflags and dflags.  Pass
	them as args (to almost everything).

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 6fcc724a8fdd32f60b0b5bfb357aad4f11dc62ef..f5c3aaa6733b5e69066709f89c7834b94f1138e3 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -1034,15 +1034,12 @@ print_insn_i386 (pc, info)
      bfd_vma pc;
      disassemble_info *info;
 {
-  print_insn_x86 (pc, info, 1, 1);
-}
-
-int
-print_insn_i8086 (pc, info)
-     bfd_vma pc;
-     disassemble_info *info;
-{
-  print_insn_x86 (pc, info, 0, 0);
+  if (info->mach == bfd_mach_i386_i386)
+    print_insn_x86 (pc, info, 1, 1);
+  else if (info->mach == bfd_mach_i386_i8086)
+    print_insn_x86 (pc, info, 0, 0);
+  else
+    abort ();
 }
 
 int