--- mon/src/mon_cmd.cpp	2002/07/17 10:00:54	1.11
+++ mon/src/mon_cmd.cpp	2004/04/20 19:39:03	1.18
@@ -1,7 +1,7 @@
 /*
  *  mon_cmd.cpp - cxmon standard commands
  *
- *  cxmon (C) 1997-2002 Christian Bauer, Marc Hellwig
+ *  cxmon (C) 1997-2004 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
@@ -27,7 +27,7 @@
 #include "mon_disass.h"
 
 #ifndef VERSION
-#define VERSION "2"
+#define VERSION "3"
 #endif
 
 
@@ -67,10 +67,12 @@ static bool range_args(uintptr *adr, uin
  *  byte_string = (expression | STRING) {COMMA (expression | STRING)} END
  */
 
-static bool byte_string(uint8 *s, uintptr &len)
+static bool byte_string(uint8 *&str, uintptr &len)
 {
 	uintptr value;
 
+	static const int GRANULARITY = 16; // must be a power of 2
+	str = NULL;
 	len = 0;
 	goto start;
 
@@ -81,20 +83,27 @@ static bool byte_string(uint8 *s, uintpt
 start:
 			if (mon_token == T_STRING) {
 				uint8 *p = (uint8 *)mon_string;
-				while ((*s++ = *p++) != 0) ;
-				s--;
-				len += strlen(mon_string);
+				unsigned n = strlen(mon_string);
+				str = (uint8 *)realloc(str, (len + n - 1 + GRANULARITY) & ~(GRANULARITY - 1));
+				memcpy(str + len, mon_string, n);
+				len += n;
 				mon_get_token();
 			} else if (mon_expression(&value)) {
-				*s++ = value;
+				str = (uint8 *)realloc(str, (len + GRANULARITY) & ~(GRANULARITY - 1));
+				str[len] = value;
 				len++;
-			} else
+			} else {
+				if (str)
+					free(str);
 				return false;
+			}
 
-		} else if (mon_token == T_END)
+		} else if (mon_token == T_END) {
 			return true;
-		else {
+		} else {
 			mon_error("',' expected");
+			if (str)
+				free(str);
 			return false;
 		}
 	}
@@ -118,7 +127,7 @@ static inline uint8 char2print(uint8 c)
 
 void version(void)
 {
-	fprintf(monout, "mon V" VERSION "\n");
+	fprintf(monout, "cxmon V" VERSION "\n");
 }
 
 
@@ -253,7 +262,7 @@ void ascii_dump(void)
 		return;
 
 	while (adr <= end_adr && !mon_aborted()) {
-		fprintf(monout, "%08x:", mon_use_real_mem ? adr : adr % mon_mem_size);
+		fprintf(monout, "%0*lx:", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size);
 		for (int i=0; i<ASCIIDUMP_BPL; i++, adr++)
 			str[i] = char2print(mon_read_byte(adr));
 		fprintf(monout, " '%s'\n", str);
@@ -279,7 +288,7 @@ void binary_dump(void)
 		return;
 
 	while (adr <= end_adr && !mon_aborted()) {
-		fprintf(monout, "%08x:", mon_use_real_mem ? adr : adr % mon_mem_size);
+		fprintf(monout, "%0*lx:", 2 * sizeof(adr), 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) ? '*' : '.';
@@ -307,7 +316,8 @@ enum CPUType {
 	CPU_680x0,
 	CPU_Z80,
 	CPU_80x86_32,
-	CPU_80x86_16
+	CPU_80x86_16,
+	CPU_x86_64
 };
 
 static void disassemble(CPUType type)
@@ -321,7 +331,7 @@ static void disassemble(CPUType type)
 		case CPU_PPC:
 			while (adr <= end_adr && !mon_aborted()) {
 				uint32 w = mon_read_word(adr);
-				fprintf(monout, "%08x: %08x\t", mon_use_real_mem ? adr : adr % mon_mem_size, w);
+				fprintf(monout, "%0*lx: %08x\t", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size, w);
 				disass_ppc(monout, mon_use_real_mem ? adr : adr % mon_mem_size, w);
 				adr += 4;
 			}
@@ -332,38 +342,44 @@ static void disassemble(CPUType type)
 				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);
+				fprintf(monout, "%0*lx: ", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size);
 				adr += disass_6502(monout, mon_use_real_mem ? adr : adr % mon_mem_size, op, lo, hi);
 			}
 			break;
 
 		case CPU_680x0:
 			while (adr <= end_adr && !mon_aborted()) {
-				fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size);
+				fprintf(monout, "%0*lx: ", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size);
 				adr += disass_68k(monout, mon_use_real_mem ? adr : adr % mon_mem_size);
 			}
 			break;
 
 		case CPU_Z80:
 			while (adr <= end_adr && !mon_aborted()) {
-				fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size);
+				fprintf(monout, "%0*lx: ", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size);
 				adr += disass_z80(monout, mon_use_real_mem ? adr : adr % mon_mem_size);
 			}
 			break;
 
+		case CPU_x86_64:
+			while (adr <= end_adr && !mon_aborted()) {
+				fprintf(monout, "%0*lx: ", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size);
+				adr += disass_x86(monout, mon_use_real_mem ? adr : adr % mon_mem_size, 64);
+			}
+			break;
+
 		case CPU_80x86_32:
 			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, false);
+				fprintf(monout, "%0*lx: ", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size);
+				adr += disass_x86(monout, mon_use_real_mem ? adr : adr % mon_mem_size, 32);
 			}
 			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);
+				fprintf(monout, "%0*lx: ", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size);
+				adr += disass_x86(monout, mon_use_real_mem ? adr : adr % mon_mem_size, 16);
 			}
-			break;
 	}
 
 	mon_dot_address = adr;
@@ -399,6 +415,11 @@ void disassemble_80x86_16(void)
 	disassemble(CPU_80x86_16);
 }
 
+void disassemble_x86_64(void)
+{
+	disassemble(CPU_x86_64);
+}
+
 
 /*
  *  Modify memory
@@ -408,7 +429,7 @@ void disassemble_80x86_16(void)
 void modify(void)
 {
 	uintptr adr, len, src_adr = 0;
-	uint8 str[256];
+	uint8 *str;
 
 	if (!mon_expression(&adr))
 		return;
@@ -417,8 +438,9 @@ void modify(void)
 
 	while (src_adr < len)
 		mon_write_byte(adr++, str[src_adr++]);
-
 	mon_dot_address = adr;
+
+	free(str);
 }
 
 
@@ -430,7 +452,7 @@ void modify(void)
 void fill(void)
 {
 	uintptr adr, end_adr, len, src_adr = 0;
-	uint8 str[256];
+	uint8 *str;
 
 	if (!mon_expression(&adr))
 		return;
@@ -441,6 +463,8 @@ void fill(void)
 
 	while (adr <= end_adr)
 		mon_write_byte(adr++, str[src_adr++ % len]);
+
+	free(str);
 }
 
 
@@ -501,7 +525,7 @@ void compare(void)
 
 	while (adr <= end_adr && !mon_aborted()) {
 		if (mon_read_byte(adr) != mon_read_byte(dest)) {
-			fprintf(monout, "%08x ", mon_use_real_mem ? adr : adr % mon_mem_size);
+			fprintf(monout, "%0*lx ", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size);
 			num++;
 			if (!(num & 7))
 				fputc('\n', monout);
@@ -523,7 +547,7 @@ void compare(void)
 void hunt(void)
 {
 	uintptr adr, end_adr, len;
-	uint8 str[256];
+	uint8 *str;
 	int num = 0;
 
 	if (!mon_expression(&adr))
@@ -541,7 +565,7 @@ void hunt(void)
 				break;
 
 		if (i == len) {
-			fprintf(monout, "%08x ", mon_use_real_mem ? adr : adr % mon_mem_size);
+			fprintf(monout, "%0*lx ", 2 * sizeof(adr), mon_use_real_mem ? adr : adr % mon_mem_size);
 			num++;
 			if (num == 1)
 				mon_dot_address = adr;
@@ -551,6 +575,8 @@ void hunt(void)
 		adr++;
 	}
 
+	free(str);
+
 	if (num & 7)
 		fputc('\n', monout);
 	fprintf(monout, "Found %d occurrences\n", num);
@@ -593,7 +619,7 @@ void load_data(void)
 			mon_write_byte(adr++, fc);
 		fclose(file);
 
-		fprintf(monerr, "%08x bytes read from %08x to %08x\n", adr - start_adr, mon_use_real_mem ? start_adr : start_adr % mon_mem_size, mon_use_real_mem ? adr-1 : (adr-1) % mon_mem_size);
+		fprintf(monerr, "%08x bytes read from %0*lx to %0*lx\n", adr - start_adr, 2 * sizeof(adr), mon_use_real_mem ? start_adr : start_adr % mon_mem_size, 2 * sizeof(adr), mon_use_real_mem ? adr-1 : (adr-1) % mon_mem_size);
 		mon_dot_address = adr;
 	}
 }
@@ -636,6 +662,6 @@ void save_data(void)
 			fputc(mon_read_byte(adr++), file);
 		fclose(file);
 
-		fprintf(monerr, "%08x bytes written from %08x to %08x\n", size, mon_use_real_mem ? start_adr : start_adr % mon_mem_size, mon_use_real_mem ? end_adr : end_adr % mon_mem_size);
+		fprintf(monerr, "%08x bytes written from %0*lx to %0*lx\n", size, 2 * sizeof(adr), mon_use_real_mem ? start_adr : start_adr % mon_mem_size, 2 * sizeof(adr), mon_use_real_mem ? end_adr : end_adr % mon_mem_size);
 	}
 }