--- mon/src/mon.cpp	2002/01/18 16:03:33	1.15
+++ mon/src/mon.cpp	2002/09/07 12:48:15	1.20
@@ -52,7 +52,7 @@ extern "C" {
 #include "mon_lowmem.h"
 
 #ifndef VERSION
-#define VERSION "2"
+#define VERSION "3"
 #endif
 
 
@@ -71,7 +71,7 @@ static char *in_ptr;
 char *mon_args_ptr;
 
 // Current address, value of '.' in expressions
-uint32 mon_dot_address;
+uintptr mon_dot_address;
 
 // Current value of ':' in expression
 static uint32 colon_value;
@@ -79,7 +79,7 @@ static uint32 colon_value;
 
 // Scanner variables
 enum Token mon_token;			// Last token read
-uint32 mon_number;				// Contains the number if mon_token==T_NUMBER
+uintptr mon_number;				// Contains the number if mon_token==T_NUMBER
 char mon_string[INPUT_LENGTH];	// Contains the string if mon_token==T_STRING
 char mon_name[INPUT_LENGTH];	// Contains the variable name if mon_token==T_NAME
 
@@ -96,7 +96,7 @@ static char *cmd_help;		// Help text for
 
 
 // List of variables
-typedef map<string, uint32> var_map;
+typedef std::map<std::string, uintptr> var_map;
 static var_map vars;
 
 
@@ -107,18 +107,18 @@ static void exit_abort(void);
 static void read_line(char *prompt);		// Scanner
 static char get_char(void);
 static void put_back(char c);
-static enum Token get_hex_number(uint32 &i);
-static enum Token get_dec_number(uint32 &i);
-static enum Token get_char_number(uint32 &i);
+static enum Token get_hex_number(uintptr &i);
+static enum Token get_dec_number(uintptr &i);
+static enum Token get_char_number(uintptr &i);
 static enum Token get_string(char *str);
-static enum Token get_hex_or_name(uint32 &i, char *name);
+static enum Token get_hex_or_name(uintptr &i, char *name);
 
-static bool eor_expr(uint32 *number);	// Parser
-static bool and_expr(uint32 *number);
-static bool shift_expr(uint32 *number);
-static bool add_expr(uint32 *number);
-static bool mul_expr(uint32 *number);
-static bool factor(uint32 *number);
+static bool eor_expr(uintptr *number);	// Parser
+static bool and_expr(uintptr *number);
+static bool shift_expr(uintptr *number);
+static bool add_expr(uintptr *number);
+static bool mul_expr(uintptr *number);
+static bool factor(uintptr *number);
 
 
 /*
@@ -202,47 +202,47 @@ bool mon_aborted(void)
  *  Access to buffer
  */
 
-uint32 (*mon_read_byte)(uint32 adr);
+uint32 (*mon_read_byte)(uintptr adr);
 
-uint32 mon_read_byte_buffer(uint32 adr)
+uint32 mon_read_byte_buffer(uintptr adr)
 {
 	return mem[adr % mon_mem_size];
 }
 
-uint32 mon_read_byte_real(uint32 adr)
+uint32 mon_read_byte_real(uintptr adr)
 {
 	return *(uint8 *)adr;
 }
 
-void (*mon_write_byte)(uint32 adr, uint32 b);
+void (*mon_write_byte)(uintptr adr, uint32 b);
 
-void mon_write_byte_buffer(uint32 adr, uint32 b)
+void mon_write_byte_buffer(uintptr adr, uint32 b)
 {
 	mem[adr % mon_mem_size] = b;
 }
 
-void mon_write_byte_real(uint32 adr, uint32 b)
+void mon_write_byte_real(uintptr adr, uint32 b)
 {
 	*(uint8 *)adr = b;
 }
 
-uint32 mon_read_half(uint32 adr)
+uint32 mon_read_half(uintptr adr)
 {
 	return (mon_read_byte(adr) << 8) | mon_read_byte(adr+1);
 }
 
-void mon_write_half(uint32 adr, uint32 w)
+void mon_write_half(uintptr adr, uint32 w)
 {
 	mon_write_byte(adr, w >> 8);
 	mon_write_byte(adr+1, w);
 }
 
-uint32 mon_read_word(uint32 adr)
+uint32 mon_read_word(uintptr adr)
 {
 	return (mon_read_byte(adr) << 24) | (mon_read_byte(adr+1) << 16) | (mon_read_byte(adr+2) << 8) | mon_read_byte(adr+3);
 }
 
-void mon_write_word(uint32 adr, uint32 l)
+void mon_write_word(uintptr adr, uint32 l)
 {
 	mon_write_byte(adr, l >> 24);
 	mon_write_byte(adr+1, l >> 16);
@@ -385,7 +385,7 @@ enum Token mon_get_token(void)
 	}
 }
 
-static enum Token get_hex_number(uint32 &i)
+static enum Token get_hex_number(uintptr &i)
 {
 	char c = get_char();
 
@@ -394,6 +394,7 @@ static enum Token get_hex_number(uint32
 		return T_NULL;
 
 	do {
+		c = tolower(c);
 		if (c < 'a')
 			i = (i << 4) + (c - '0');
 		else
@@ -409,7 +410,7 @@ static enum Token get_hex_number(uint32
 	}
 }
 
-static enum Token get_dec_number(uint32 &i)
+static enum Token get_dec_number(uintptr &i)
 {
 	char c = get_char();
 
@@ -430,7 +431,7 @@ static enum Token get_dec_number(uint32
 	}
 }
 
-static enum Token get_char_number(uint32 &i)
+static enum Token get_char_number(uintptr &i)
 {
 	char c;
 
@@ -461,7 +462,7 @@ static enum Token get_string(char *str)
 	return T_NULL;
 }
 
-static enum Token get_hex_or_name(uint32 &i, char *name)
+static enum Token get_hex_or_name(uintptr &i, char *name)
 {
 	char *old_in_ptr = in_ptr;
 	char c;
@@ -489,9 +490,9 @@ static enum Token get_hex_or_name(uint32
  *  true: OK, false: Error
  */
 
-bool mon_expression(uint32 *number)
+bool mon_expression(uintptr *number)
 {
-	uint32 accu, expr;
+	uintptr accu, expr;
 
 	if (!eor_expr(&accu))
 		return false;
@@ -517,9 +518,9 @@ bool mon_expression(uint32 *number)
  *  true: OK, false: Error
  */
 
-static bool eor_expr(uint32 *number)
+static bool eor_expr(uintptr *number)
 {
-	uint32 accu, expr;
+	uintptr accu, expr;
 
 	if (!and_expr(&accu))
 		return false;
@@ -545,9 +546,9 @@ static bool eor_expr(uint32 *number)
  *  true: OK, false: Error
  */
 
-static bool and_expr(uint32 *number)
+static bool and_expr(uintptr *number)
 {
-	uint32 accu, expr;
+	uintptr accu, expr;
 
 	if (!shift_expr(&accu))
 		return false;
@@ -573,9 +574,9 @@ static bool and_expr(uint32 *number)
  *  true: OK, false: Error
  */
 
-static bool shift_expr(uint32 *number)
+static bool shift_expr(uintptr *number)
 {
-	uint32 accu, expr;
+	uintptr accu, expr;
 
 	if (!add_expr(&accu))
 		return false;
@@ -608,9 +609,9 @@ static bool shift_expr(uint32 *number)
  *  true: OK, false: Error
  */
 
-static bool add_expr(uint32 *number)
+static bool add_expr(uintptr *number)
 {
-	uint32 accu, expr;
+	uintptr accu, expr;
 
 	if (!mul_expr(&accu))
 		return false;
@@ -643,9 +644,9 @@ static bool add_expr(uint32 *number)
  *  true: OK, false: Error
  */
 
-static bool mul_expr(uint32 *number)
+static bool mul_expr(uintptr *number)
 {
-	uint32 accu, fact;
+	uintptr accu, fact;
 
 	if (!factor(&accu))
 		return false;
@@ -693,7 +694,7 @@ static bool mul_expr(uint32 *number)
  *  true: OK, false: Error
  */
 
-static bool factor(uint32 *number)
+static bool factor(uintptr *number)
 {
 	switch (mon_token) {
 		case T_NUMBER:
@@ -787,12 +788,12 @@ static void set_var(void)
 		}
 
 	} else if (mon_token == T_NAME) {
-		string var_name = mon_name;
+		std::string var_name = mon_name;
 		mon_get_token();
 		if (mon_token == T_ASSIGN) {
 
 			// Set variable
-			uint32 value;
+			uintptr value;
 			mon_get_token();
 			if (!mon_expression(&value))
 				return;
@@ -862,7 +863,7 @@ static void mon_cmd_list(void)
 
 static void reallocate(void)
 {
-	uint32 size;
+	uintptr size;
 
 	if (mon_use_real_mem) {
 		fprintf(monerr, "Cannot reallocate buffer in real mode\n");
@@ -895,7 +896,7 @@ static void reallocate(void)
 
 static void apply(int size)
 {
-	uint32 adr, end_adr, value;
+	uintptr adr, end_adr, value;
 	char c;
 
 	if (!mon_expression(&adr))
@@ -909,8 +910,8 @@ static void apply(int size)
 		return;
 	}
 
-	uint32 (*read_func)(uint32 adr);
-	void (*write_func)(uint32 adr, uint32 val);
+	uint32 (*read_func)(uintptr adr);
+	void (*write_func)(uintptr adr, uint32 val);
 	switch (size) {
 		case 1:
 			read_func = mon_read_byte;
@@ -1016,6 +1017,7 @@ void mon_init(void)
 	mon_add_command("d80", disassemble_z80,			"d80 [start [end]]        Disassemble Z80 code\n");
 	mon_add_command("d86", disassemble_80x86_32,	"d86 [start [end]]        Disassemble 80x86 (32-bit) code\n");
 	mon_add_command("d8086", disassemble_80x86_16,	"d8086 [start [end]]      Disassemble 80x86 (16-bit) code\n");
+	mon_add_command("d8664", disassemble_x86_64,	"d8664 [start [end]]      Disassemble x86-64 code\n");
 	mon_add_command(":", modify,					": start string           Modify memory\n");
 	mon_add_command("f", fill,						"f start end string       Fill memory\n");
 	mon_add_command("y", apply_byte,				"y[b|h|w] start end expr  Apply expression to memory\n");
@@ -1134,7 +1136,7 @@ void mon(int argc, char **argv)
 	while (!done) {
 		if (interactive) {
 			char prompt[16];
-			sprintf(prompt, "[%08x]-> ", mon_dot_address);
+			sprintf(prompt, "[%0*lx]-> ", 2 * sizeof(mon_dot_address), mon_dot_address);
 			read_line(prompt);
 		} else {
 			if (argc == 0) {