--- mon/src/mon.cpp 2000/10/08 17:51:58 1.13 +++ mon/src/mon.cpp 2002/03/18 13:40:20 1.17 @@ -1,7 +1,7 @@ /* - * mon.cpp - mon main program + * mon.cpp - cxmon main program * - * mon (C) 1997-2000 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,6 +24,8 @@ #include #include #include +#include +#include #if defined(HAVE_READLINE_H) extern "C" { @@ -47,6 +49,7 @@ extern "C" { #include "mon.h" #include "mon_cmd.h" +#include "mon_lowmem.h" #ifndef VERSION #define VERSION "2" @@ -93,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 @@ -121,9 +119,6 @@ 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); /* @@ -399,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 @@ -707,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: @@ -773,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]] */ @@ -838,15 +779,16 @@ 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) { @@ -859,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"); @@ -880,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(); } @@ -1078,7 +1014,7 @@ void mon_init(void) 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("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(":", modify, ": start string Modify memory\n"); @@ -1135,6 +1071,7 @@ void mon(int argc, char **argv) monerr = stdout; // Make argc/argv point to the actual arguments + const char *prg_name = argv[0]; if (argc) argc--; argv++; @@ -1142,7 +1079,10 @@ void mon(int argc, char **argv) mon_macos_mode = false; mon_use_real_mem = false; while (argc > 0) { - if (strcmp(argv[0], "-m") == 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; @@ -1173,8 +1113,20 @@ void mon(int argc, char **argv) // Print banner if (interactive) - fprintf(monerr, "\n *** mon V" VERSION " by Christian Bauer and Marc Hellwig ***\n" - " *** Press 'h' for help ***\n\n"); + 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();