--- mon/src/mon.cpp 1999/10/25 08:04:45 1.5 +++ mon/src/mon.cpp 2002/09/07 12:48:15 1.20 @@ -1,7 +1,7 @@ /* - * mon.cpp - mon main program + * mon.cpp - cxmon main program * - * mon (C) 1997-1999 Christian Bauer, Marc Hellwig + * cxmon (C) 1997-2002 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 @@ -24,14 +24,24 @@ #include #include #include +#include +#include -#ifdef HAVE_READLINE_READLINE_H +#if defined(HAVE_READLINE_H) +extern "C" { +#include +} +#elif defined(HAVE_READLINE_READLINE_H) extern "C" { #include } #endif -#ifdef HAVE_READLINE_HISTORY_H +#if defined(HAVE_HISTORY_H) +extern "C" { +#include +} +#elif defined(HAVE_READLINE_HISTORY_H) extern "C" { #include } @@ -39,6 +49,11 @@ extern "C" { #include "mon.h" #include "mon_cmd.h" +#include "mon_lowmem.h" + +#ifndef VERSION +#define VERSION "3" +#endif // Buffer we're operating on @@ -56,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; @@ -64,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 @@ -81,13 +96,8 @@ static char *cmd_help; // Help text for // List of variables -struct Variable { - Variable *next; // Pointer to next variable (must be first element of struct) - char *name; // Variable name - uint32 value; // Variable value -}; - -static Variable *first_var; // Pointer to first variable +typedef std::map var_map; +static var_map vars; // Prototypes @@ -97,21 +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 Variable *lookup_var(const char *s); -static Variable *insert_var(const char *s); -static void remove_var(const char *s); +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); /* @@ -195,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); @@ -378,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(); @@ -387,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 @@ -402,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(); @@ -423,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; @@ -454,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; @@ -482,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; @@ -510,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; @@ -538,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; @@ -566,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; @@ -601,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; @@ -636,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; @@ -686,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: @@ -695,13 +703,14 @@ static bool factor(uint32 *number) return true; case T_NAME:{ - Variable *var; - if ((var = lookup_var(mon_name)) != NULL) { - *number = var->value; + var_map::const_iterator v = vars.find(mon_name); + if (v == vars.end()) + return false; + else { + *number = v->second; mon_get_token(); return true; - } else - return false; + } } case T_DOT: @@ -761,62 +770,6 @@ static bool factor(uint32 *number) /* - * Lookup the value of a variable - */ - -static Variable *lookup_var(const char *s) -{ - // Lookup variable - for (Variable *var=first_var; var; var=var->next) - if (!strcmp(s, var->name)) - return var; - - // Not found, error - mon_error("Undefined variable"); - return NULL; -} - - -/* - * Insert new variable (or redefine old) - */ - -static Variable *insert_var(const char *s) -{ - // Lookup variable - for (Variable *var=first_var; var; var=var->next) - if (!strcmp(s, var->name)) - return var; - - // Insert new variable - Variable *var = new Variable; - var->name = strdup(s); - var->next = first_var; - first_var = var; - return var; -} - - -/* - * Remove variable - */ - -static void remove_var(const char *s) -{ - Variable *var, *prev = (Variable *)&first_var; - - // Lookup variable and remove it - for (var=prev->next; var; prev=var, var=var->next) - if (!strcmp(s, var->name)) { - prev->next = var->next; - free(var->name); - free(var); - return; - } -} - - -/* * Set/clear/show variables * set [var[=value]] */ @@ -826,20 +779,21 @@ static void set_var(void) if (mon_token == T_END) { // Show all variables - if (first_var == NULL) + if (vars.empty()) fprintf(monout, "No variables defined\n"); - else - for (Variable *v=first_var; v; v=v->next) - fprintf(monout, "%s = %08x\n", v->name, v->value); + else { + var_map::const_iterator v = vars.begin(), end = vars.end(); + for (v=vars.begin(); v!=end; ++v) + fprintf(monout, "%s = %08x\n", v->first.c_str(), v->second); + } } else if (mon_token == T_NAME) { - char var_name[256]; - strcpy(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; @@ -847,12 +801,12 @@ static void set_var(void) mon_error("Too many arguments"); return; } - insert_var(var_name)->value = value; + vars[var_name] = value; } else if (mon_token == T_END) { // Clear variable - remove_var(var_name); + vars.erase(var_name); } else mon_error("'=' expected"); @@ -868,13 +822,7 @@ static void set_var(void) static void clear_vars(void) { - Variable *var, *next; - for (var=first_var; var; var=next) { - free(var->name); - next = var->next; - free(var); - } - first_var = NULL; + vars.clear(); } @@ -915,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"); @@ -948,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)) @@ -962,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; @@ -1056,37 +1004,40 @@ void mon_init(void) num_cmds = 0; cmd_help = NULL; - mon_add_command("??", mon_cmd_list, "?? Show list of commands\n"); - mon_add_command("ver", version, "ver Show version\n"); - mon_add_command("?", print_expr, "? expression Calculate expression\n"); - mon_add_command("@", reallocate, "@ [size] Reallocate buffer\n"); - mon_add_command("i", ascii_dump, "i [start [end]] ASCII memory dump\n"); - mon_add_command("m", memory_dump, "m [start [end]] Hex/ASCII memory dump\n"); - mon_add_command("d", disassemble_ppc, "d [start [end]] Disassemble PowerPC code\n"); - mon_add_command("d65", disassemble_6502, "d65 [start [end]] Disassemble 6502 code\n"); - mon_add_command("d68", disassemble_680x0, "d68 [start [end]] Disassemble 680x0 code\n"); - mon_add_command("d80", disassemble_8080, "d80 [start [end]] Disassemble 8080 code\n"); - mon_add_command("d86", disassemble_80x86, "d86 [start [end]] Disassemble 80x86 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"); + mon_add_command("??", mon_cmd_list, "?? Show list of commands\n"); + mon_add_command("ver", version, "ver Show version\n"); + mon_add_command("?", print_expr, "? expression Calculate expression\n"); + mon_add_command("@", reallocate, "@ [size] Reallocate buffer\n"); + mon_add_command("i", ascii_dump, "i [start [end]] ASCII memory dump\n"); + mon_add_command("m", memory_dump, "m [start [end]] Hex/ASCII memory dump\n"); + mon_add_command("b", binary_dump, "b [start [end]] Binary memory dump\n"); + mon_add_command("d", disassemble_ppc, "d [start [end]] Disassemble PowerPC code\n"); + mon_add_command("d65", disassemble_6502, "d65 [start [end]] Disassemble 6502 code\n"); + mon_add_command("d68", disassemble_680x0, "d68 [start [end]] Disassemble 680x0 code\n"); + 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"); mon_add_command("yb", apply_byte, NULL); mon_add_command("yh", apply_half, NULL); mon_add_command("yw", apply_word, NULL); - mon_add_command("t", transfer, "t start end dest Transfer memory\n"); - mon_add_command("c", compare, "c start end dest Compare memory\n"); - mon_add_command("h", help_or_hunt, "h start end string Search for byte string\n"); - mon_add_command("\\", shell_command, "\\ \"command\" Execute shell command\n"); - mon_add_command("ls", mon_exec, "ls [args] List directory contents\n"); - mon_add_command("rm", mon_exec, "rm [args] Remove file(s)\n"); - mon_add_command("cp", mon_exec, "cp [args] Copy file(s)\n"); - mon_add_command("mv", mon_exec, "mv [args] Move file(s)\n"); - mon_add_command("cd", mon_change_dir, "cd directory Change current directory\n"); - mon_add_command("o", redir_output, "o [\"file\"] Redirect output\n"); - mon_add_command("[", load_data, "[ start \"file\" Load data from file\n"); - 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_add_command("t", transfer, "t start end dest Transfer memory\n"); + mon_add_command("c", compare, "c start end dest Compare memory\n"); + mon_add_command("h", help_or_hunt, "h start end string Search for byte string\n"); + mon_add_command("\\", shell_command, "\\ \"command\" Execute shell command\n"); + mon_add_command("ls", mon_exec, "ls [args] List directory contents\n"); + mon_add_command("rm", mon_exec, "rm [args] Remove file(s)\n"); + mon_add_command("cp", mon_exec, "cp [args] Copy file(s)\n"); + mon_add_command("mv", mon_exec, "mv [args] Move file(s)\n"); + mon_add_command("cd", mon_change_dir, "cd directory Change current directory\n"); + mon_add_command("o", redir_output, "o [\"file\"] Redirect output\n"); + mon_add_command("[", load_data, "[ start \"file\" Load data from file\n"); + 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; @@ -1120,20 +1071,27 @@ void mon(int argc, char **argv) monout = stdout; monerr = stdout; - if (argc) { - // Access real memory if mon was started as "rmon" - char *prgname = argv[0]; - char *lastslash; - if ((lastslash = strrchr(prgname, '/')) != NULL) - prgname = lastslash + 1; - if (strcmp(prgname, "rmon") == 0) + // Make argc/argv point to the actual arguments + const char *prg_name = argv[0]; + if (argc) + argc--; argv++; + + // Parse arguments + mon_macos_mode = false; + mon_use_real_mem = false; + while (argc > 0) { + if (strcmp(argv[0], "-h") == 0 || strcmp(argv[0], "--help") == 0) { + printf("Usage: %s [-m] [-r] [command...]\n", prg_name); + exit(0); + } else if (strcmp(argv[0], "-m") == 0) + mon_macos_mode = true; + else if (strcmp(argv[0], "-r") == 0) mon_use_real_mem = true; - - // Make argc/argv point to the actual arguments - argc--; - argv++; - interactive = (argc == 0); + else + break; + argc--; argv++; } + interactive = (argc == 0); // Set up memory access functions if not supplied by the user if (mon_read_byte == NULL) { @@ -1156,8 +1114,20 @@ 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", MON_VERSION_MAJOR, MON_VERSION_MINOR); + fprintf(monerr, "\n *** cxmon V" VERSION " by Christian Bauer and Marc Hellwig ***\n" + " *** Press 'h' for help ***\n\n"); + } + + // Clear variables + vars.clear(); + + // In MacOS mode, pull in the lowmem globals as variables + if (mon_macos_mode) { + const lowmem_info *l = lowmem; + while (l->name) { + vars[l->name] = l->addr; + l++; + } } init_abort(); @@ -1166,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) {