--- mon/src/mon_cmd.cpp	2000/06/10 19:07:37	1.6
+++ mon/src/mon_cmd.cpp	2000/09/25 12:44:34	1.7
@@ -24,11 +24,7 @@
 
 #include "mon.h"
 #include "mon_cmd.h"
-#include "mon_ppc.h"
-#include "mon_68k.h"
-#include "mon_x86.h"
-#include "mon_6502.h"
-#include "mon_8080.h"
+#include "mon_disass.h"
 
 #ifndef VERSION
 #define VERSION "2"
@@ -341,17 +337,8 @@ static void disassemble(CPUType type)
 
 		case CPU_680x0:
 			while (adr <= end_adr && !mon_aborted()) {
-				uint16 buf[8];
-				buf[0] = mon_read_half(adr);
-				buf[1] = mon_read_half(adr + 2);
-				buf[2] = mon_read_half(adr + 4);
-				buf[3] = mon_read_half(adr + 6);
-				buf[4] = mon_read_half(adr + 8);
-				buf[5] = mon_read_half(adr + 10);
-				buf[6] = mon_read_half(adr + 12);
-				buf[7] = mon_read_half(adr + 14);
 				fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size);
-				adr += disass_68k(monout, mon_use_real_mem ? adr : adr % mon_mem_size, buf);
+				adr += disass_68k(monout, mon_use_real_mem ? adr : adr % mon_mem_size);
 			}
 			break;
 
@@ -367,11 +354,8 @@ static void disassemble(CPUType type)
 
 		case CPU_80x86:
 			while (adr <= end_adr && !mon_aborted()) {
-				uint8 buf[16];
-				for (int i=0; i<16; i++)
-					buf[i] = mon_read_byte(adr + i);
 				fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size);
-				adr += disass_x86(monout, mon_use_real_mem ? adr : adr % mon_mem_size, buf);
+				adr += disass_x86(monout, mon_use_real_mem ? adr : adr % mon_mem_size);
 			}
 			break;
 	}