--- mon/src/mon.cpp	1999/10/05 18:19:55	1.4
+++ mon/src/mon.cpp	1999/10/25 08:04:45	1.5
@@ -20,6 +20,11 @@
 
 #include "sysdeps.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <ctype.h>
+
 #ifdef HAVE_READLINE_READLINE_H
 extern "C" {
 #include <readline/readline.h>
@@ -34,7 +39,6 @@ extern "C" {
 
 #include "mon.h"
 #include "mon_cmd.h"
-#include "version.h"
 
 
 // Buffer we're operating on
@@ -191,58 +195,52 @@ bool mon_aborted(void)
  *  Access to buffer
  */
 
-uint32 mon_read_byte(uint32 adr)
+uint32 (*mon_read_byte)(uint32 adr);
+
+uint32 mon_read_byte_buffer(uint32 adr)
 {
-	if (mon_use_real_mem)
-		return *(uint8 *)adr;
-	else
-		return mem[adr % mon_mem_size];
+	return mem[adr % mon_mem_size];
 }
 
-void mon_write_byte(uint32 adr, uint32 b)
+uint32 mon_read_byte_real(uint32 adr)
 {
-	if (mon_use_real_mem)
-		*(uint8 *)adr = b;
-	else
-		mem[adr % mon_mem_size] = b;
+	return *(uint8 *)adr;
+}
+
+void (*mon_write_byte)(uint32 adr, uint32 b);
+
+void mon_write_byte_buffer(uint32 adr, uint32 b)
+{
+	mem[adr % mon_mem_size] = b;
+}
+
+void mon_write_byte_real(uint32 adr, uint32 b)
+{
+	*(uint8 *)adr = b;
 }
 
 uint32 mon_read_half(uint32 adr)
 {
-	if (mon_use_real_mem)
-		return ntohs(*(uint16 *)adr);
-	else
-		return mem[adr % mon_mem_size] << 8 | mem[(adr+1) % mon_mem_size];
+	return (mon_read_byte(adr) << 8) | mon_read_byte(adr+1);
 }
 
 void mon_write_half(uint32 adr, uint32 w)
 {
-	if (mon_use_real_mem)
-		*(uint16 *)adr = htons(w);
-	else {
-		mem[adr % mon_mem_size] = w >> 8;
-		mem[(adr+1) % mon_mem_size] = w;
-	}
+	mon_write_byte(adr, w >> 8);
+	mon_write_byte(adr+1, w);
 }
 
 uint32 mon_read_word(uint32 adr)
 {
-	if (mon_use_real_mem)
-		return ntohl(*(uint32 *)adr);
-	else
-		return mon_read_byte(adr) << 24 | mon_read_byte(adr+1) << 16 | mon_read_byte(adr+2) << 8 | mon_read_byte(adr+3);
+	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)
 {
-	if (mon_use_real_mem)
-		*(uint32 *)adr = htonl(l);
-	else {
-		mem[adr % mon_mem_size] = l >> 24;
-		mem[(adr+1) % mon_mem_size] = l >> 16;
-		mem[(adr+2) % mon_mem_size] = l >> 8;
-		mem[(adr+3) % mon_mem_size] = l;
-	}
+	mon_write_byte(adr, l >> 24);
+	mon_write_byte(adr+1, l >> 16);
+	mon_write_byte(adr+2, l >> 8);
+	mon_write_byte(adr+3, l);
 }
 
 
@@ -1089,6 +1087,9 @@ void mon_init(void)
 	mon_add_command("]", save_data,				"] start size \"file\"      Save data to file\n");
 	mon_add_command("set", set_var,				"set [var[=value]]        Set/clear/show variables\n");
 	mon_add_command("cv", clear_vars,			"cv                       Clear all variables\n");
+
+	mon_read_byte = NULL;
+	mon_write_byte = NULL;
 }
 
 
@@ -1134,6 +1135,20 @@ void mon(int argc, char **argv)
 		interactive = (argc == 0);
 	}
 
+	// Set up memory access functions if not supplied by the user
+	if (mon_read_byte == NULL) {
+		if (mon_use_real_mem)
+			mon_read_byte = mon_read_byte_real;
+		else
+			mon_read_byte = mon_read_byte_buffer;
+	}
+	if (mon_write_byte == NULL) {
+		if (mon_use_real_mem)
+			mon_write_byte = mon_write_byte_real;
+		else
+			mon_write_byte = mon_write_byte_buffer;
+	}
+
 	// Allocate buffer
 	if (!mon_use_real_mem) {
 		mon_mem_size = 0x100000;
@@ -1142,7 +1157,7 @@ void mon(int argc, char **argv)
 		// Print banner
 		if (interactive)
 			fprintf(monerr, "\n *** mon V%d.%d by Christian Bauer and Marc Hellwig ***\n"
-							" ***              Press 'h' for help              ***\n\n", VERSION_MAJOR, VERSION_MINOR);
+							" ***              Press 'h' for help              ***\n\n", MON_VERSION_MAJOR, MON_VERSION_MINOR);
 	}
 
 	init_abort();