--- mon/src/mon_cmd.cpp	1999/10/25 08:04:47	1.4
+++ 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
@@ -24,11 +24,11 @@
 
 #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"
+#endif
 
 
 /*
@@ -118,7 +118,7 @@ static inline uint8 char2print(uint8 c)
 
 void version(void)
 {
-	fprintf(monout, "mon V%d.%d\n", MON_VERSION_MAJOR, MON_VERSION_MINOR);
+	fprintf(monout, "mon V" VERSION "\n");
 }
 
 
@@ -264,20 +264,50 @@ void ascii_dump(void)
 
 
 /*
+ *  Binary dump
+ *  b [start [end]]
+ */
+
+void binary_dump(void)
+{
+	uint32 adr, end_adr;
+	uint8 str[9];
+
+	str[8] = 0;
+
+	if (!range_args(&adr, &end_adr, 7))  // 8 lines unless end address specified
+		return;
+
+	while (adr <= end_adr && !mon_aborted()) {
+		fprintf(monout, "%08x:", mon_use_real_mem ? adr : adr % mon_mem_size);
+		uint8 b = mon_read_byte(adr);
+		for (int m=0x80, i=0; i<8; m>>=1, i++)
+			str[i] = (b & m) ? '*' : '.';
+		fprintf(monout, " '%s'\n", str);
+		adr++;
+	}
+
+	mon_dot_address = adr;
+}
+
+
+/*
  *  Disassemble
  *  d [start [end]]
  *  d65 [start [end]]
  *  d68 [start [end]]
  *  d80 [start [end]]
  *  d86 [start [end]]
+ *  d8086 [start [end]]
  */
 
 enum CPUType {
 	CPU_PPC,
 	CPU_6502,
 	CPU_680x0,
-	CPU_8080,
-	CPU_80x86
+	CPU_Z80,
+	CPU_80x86_32,
+	CPU_80x86_16
 };
 
 static void disassemble(CPUType type)
@@ -309,37 +339,29 @@ 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;
 
-		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;
 
-		case CPU_80x86:
+		case CPU_80x86_32:
 			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, false);
+			}
+			break;
+
+		case CPU_80x86_16:
+			while (adr <= end_adr && !mon_aborted()) {
+				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, true);
 			}
 			break;
 	}
@@ -362,14 +384,19 @@ void disassemble_680x0(void)
 	disassemble(CPU_680x0);
 }
 
-void disassemble_8080(void)
+void disassemble_z80(void)
+{
+	disassemble(CPU_Z80);
+}
+
+void disassemble_80x86_32(void)
 {
-	disassemble(CPU_8080);
+	disassemble(CPU_80x86_32);
 }
 
-void disassemble_80x86(void)
+void disassemble_80x86_16(void)
 {
-	disassemble(CPU_80x86);
+	disassemble(CPU_80x86_16);
 }