--- mon/src/mon.h	1999/10/25 08:04:47	1.3
+++ mon/src/mon.h	2003/09/27 20:33:06	1.9
@@ -1,7 +1,7 @@
 /*
- *  mon.h - mon main program
+ *  mon.h - cxmon main program
  *
- *  mon (C) 1997-1999 Christian Bauer, Marc Hellwig
+ *  cxmon (C) 1997-2003 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
@@ -25,14 +25,6 @@
 
 
 /*
- *  Version information
- */
-
-const int MON_VERSION_MAJOR = 2;
-const int MON_VERSION_MINOR = 2;
-
-
-/*
  *  Initialization, deinitialization and invocation
  */
 
@@ -76,7 +68,7 @@ enum Token {
 
 // Scanner variables
 extern enum Token mon_token;			// Last token read
-extern uint32 mon_number;				// Contains the number if mon_token==T_NUMBER
+extern uintptr mon_number;				// Contains the number if mon_token==T_NUMBER
 extern char mon_string[INPUT_LENGTH];	// Contains the string if mon_token==T_STRING
 extern char mon_name[INPUT_LENGTH];		// Contains the variable name if mon_token==T_NAME
 
@@ -84,26 +76,28 @@ extern char mon_name[INPUT_LENGTH];		//
 extern FILE *monin, *monout, *monerr;
 
 // Current address, value of '.' in expressions
-extern uint32 mon_dot_address;
+extern uintptr mon_dot_address;
 
 extern bool mon_use_real_mem;			// Flag: mon is using real memory
 extern uint32 mon_mem_size;				// Size of mon buffer (if mon_use_real_mem = false)
 
+extern bool mon_macos_mode;				// Flag: enable features in the disassembler for working with MacOS code
+
 // Add command to mon
 extern void mon_add_command(const char *name, void (*func)(void), const char *help_text);
 
 // Functions for commands
 extern void mon_error(const char *s);			// Print error message
 extern enum Token mon_get_token(void);			// Get next token
-extern bool mon_expression(uint32 *number);		// Parse expression
+extern bool mon_expression(uintptr *number);	// Parse expression
 extern bool mon_aborted(void);					// Check if Ctrl-C was pressed
 
 // Memory access
-extern uint32 (*mon_read_byte)(uint32 adr);
-extern void (*mon_write_byte)(uint32 adr, uint32 b);
-extern uint32 mon_read_half(uint32 adr);
-extern void mon_write_half(uint32 adr, uint32 w);
-extern uint32 mon_read_word(uint32 adr);
-extern void mon_write_word(uint32 adr, uint32 l);
+extern uint32 (*mon_read_byte)(uintptr adr);
+extern void (*mon_write_byte)(uintptr adr, uint32 b);
+extern uint32 mon_read_half(uintptr adr);
+extern void mon_write_half(uintptr adr, uint32 w);
+extern uint32 mon_read_word(uintptr adr);
+extern void mon_write_word(uintptr adr, uint32 l);
 
 #endif