--- mon/src/mon.cpp	2000/10/15 15:07:12	1.14
+++ mon/src/mon.cpp	2002/01/18 16:03:33	1.15
@@ -1,7 +1,7 @@
 /*
  *  mon.cpp - cxmon main program
  *
- *  cxmon (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 <stdlib.h>
 #include <signal.h>
 #include <ctype.h>
+#include <string>
+#include <map>
 
 #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 map<string, uint32> 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);
 
 
 /*
@@ -707,13 +702,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 +769,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 +778,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);
+		string var_name = mon_name;
 		mon_get_token();
 		if (mon_token == T_ASSIGN) {
 
@@ -859,12 +800,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 +821,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();
 }
 
 
@@ -1135,6 +1070,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 +1078,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;
@@ -1177,6 +1116,18 @@ void mon(int argc, char **argv)
 							" ***               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();
 
 	// Read and parse command line