--- mon/src/mon_cmd.cpp	2000/10/06 00:04:22	1.8
+++ mon/src/mon_cmd.cpp	2000/10/15 15:07:13	1.9
@@ -1,7 +1,7 @@
 /*
- *  mon_cmd.cpp - mon standard commands
+ *  mon_cmd.cpp - cxmon standard commands
  *
- *  mon (C) 1997-1999 Christian Bauer, Marc Hellwig
+ *  cxmon (C) 1997-1999 Christian Bauer, Marc Hellwig
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -298,13 +298,14 @@ void binary_dump(void)
  *  d68 [start [end]]
  *  d80 [start [end]]
  *  d86 [start [end]]
+ *  d8086 [start [end]]
  */
 
 enum CPUType {
 	CPU_PPC,
 	CPU_6502,
 	CPU_680x0,
-	CPU_8080,
+	CPU_Z80,
 	CPU_80x86_32,
 	CPU_80x86_16
 };
@@ -343,13 +344,10 @@ static void disassemble(CPUType type)
 			}
 			break;
 
-		case CPU_8080:
+		case CPU_Z80:
 			while (adr <= end_adr && !mon_aborted()) {
-				uint8 op = mon_read_byte(adr);
-				uint8 lo = mon_read_byte(adr + 1);
-				uint8 hi = mon_read_byte(adr + 2);
 				fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size);
-				adr += disass_8080(monout, mon_use_real_mem ? adr : adr % mon_mem_size, op, lo, hi);
+				adr += disass_z80(monout, mon_use_real_mem ? adr : adr % mon_mem_size);
 			}
 			break;
 
@@ -386,9 +384,9 @@ void disassemble_680x0(void)
 	disassemble(CPU_680x0);
 }
 
-void disassemble_8080(void)
+void disassemble_z80(void)
 {
-	disassemble(CPU_8080);
+	disassemble(CPU_Z80);
 }
 
 void disassemble_80x86_32(void)