--- mon/src/mon.h 2000/10/15 15:07:12 1.6 +++ mon/src/mon.h 2004/02/12 16:42:35 1.10 @@ -1,7 +1,7 @@ /* * mon.h - cxmon main program * - * cxmon (C) 1997-2000 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 @@ -28,8 +28,8 @@ * Initialization, deinitialization and invocation */ -void mon_init(void); -void mon_exit(void); +void mon_init(); +void mon_exit(); void mon(int argc, char **argv); @@ -37,9 +37,6 @@ void mon(int argc, char **argv); * Definitions for adding commands to mon */ -// Maximum input length -const int INPUT_LENGTH = 256; - // Input tokens enum Token { T_NULL, // Invalid token @@ -67,37 +64,37 @@ 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 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 +extern enum Token mon_token; // Last token read +extern uintptr mon_number; // Contains the number if mon_token==T_NUMBER +extern char *mon_string; // Contains the string if mon_token==T_STRING +extern char *mon_name; // Contains the variable name if mon_token==T_NAME // Streams for input, output and error messages 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_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 +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); +extern void mon_add_command(const char *name, void (*func)(), 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_aborted(void); // Check if Ctrl-C was pressed +extern void mon_error(const char *s); // Print error message +extern enum Token mon_get_token(); // Get next token +extern bool mon_expression(uintptr *number); // Parse expression +extern bool mon_aborted(); // 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