--- mon/src/mon.h 2002/01/18 16:03:33 1.7 +++ mon/src/mon.h 2002/07/17 10:00:54 1.8 @@ -68,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 @@ -76,7 +76,7 @@ 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) @@ -89,15 +89,15 @@ extern void mon_add_command(const char * // 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