[ViewVC] Diff of: cebix/mon/src/mon.cpp

Comparing mon/src/mon.cpp (file contents):
Revision 1.1.1.1 by cebix, 1999-10-04T19:31:09Z vs.
Revision 1.16 by cebix, 2002-03-03T16:19:10Z

#	Line 1 \| Line 1
1		/*
2	<	* mon.cpp - Machine language monitor
2	>	* mon.cpp - cxmon main program
3		*
4	<	* (C) 1997-1999 Christian Bauer
4	>	* cxmon (C) 1997-2002 Christian Bauer, Marc Hellwig
5	>	*
6	>	* This program is free software; you can redistribute it and/or modify
7	>	* it under the terms of the GNU General Public License as published by
8	>	* the Free Software Foundation; either version 2 of the License, or
9	>	* (at your option) any later version.
10	>	*
11	>	* This program is distributed in the hope that it will be useful,
12	>	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	>	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	>	* GNU General Public License for more details.
15	>	*
16	>	* You should have received a copy of the GNU General Public License
17	>	* along with this program; if not, write to the Free Software
18	>	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19		*/
20
21	<	#include <sys/types.h>
22	<	#include <netinet/in.h>
21	>	#include "sysdeps.h"
22	>
23		#include <stdio.h>
24		#include <stdlib.h>
11	–	#include <string.h>
25		#include <signal.h>
26		#include <ctype.h>
27	<	#include <unistd.h>
28	<	#include <errno.h>
27	>	#include <string>
28	>	#include <map>
29
30	+	#if defined(HAVE_READLINE_H)
31	+	extern "C" {
32	+	#include <readline.h>
33	+	}
34	+	#elif defined(HAVE_READLINE_READLINE_H)
35		extern "C" {
36	<	extern char readline(char prompt);
19	<	extern void add_history(char *str);
36	>	#include <readline/readline.h>
37		}
38	+	#endif
39	+
40	+	#if defined(HAVE_HISTORY_H)
41	+	extern "C" {
42	+	#include <history.h>
43	+	}
44	+	#elif defined(HAVE_READLINE_HISTORY_H)
45	+	extern "C" {
46	+	#include <readline/history.h>
47	+	}
48	+	#endif
49
50		#include "mon.h"
51		#include "mon_cmd.h"
52	+	#include "mon_lowmem.h"
53	+
54	+	#ifndef VERSION
55	+	#define VERSION "2"
56	+	#endif
57
58
59		// Buffer we're operating on
#	Line 63 \| Line 96 \| *static char cmd_help; // Help text for**
96
97
98		// List of variables
99	<	struct Variable {
100	<	Variable *next; // Pointer to next variable (must be first element of struct)
68	<	char *name; // Variable name
69	<	uint32 value; // Variable value
70	<	};
71	<
72	<	static Variable *first_var; // Pointer to first variable
99	>	typedef map<string, uint32> var_map;
100	>	static var_map vars;
101
102
103		// Prototypes
#	Line 91 \| Line 119 \| *static bool shift_expr(uint32 number);**
119		static bool add_expr(uint32 *number);
120		static bool mul_expr(uint32 *number);
121		static bool factor(uint32 *number);
94	–	static Variable lookup_var(const char s);
95	–	static Variable insert_var(const char s);
96	–	static void remove_var(const char *s);
122
123
124		/*
#	Line 177 \| Line 202 \| bool mon_aborted(void)
202		* Access to buffer
203		*/
204
205	<	uint32 mon_read_byte(uint32 adr)
205	>	uint32 (*mon_read_byte)(uint32 adr);
206	>
207	>	uint32 mon_read_byte_buffer(uint32 adr)
208		{
209	<	if (mon_use_real_mem)
183	<	return (uint8 )adr;
184	<	else
185	<	return mem[adr % mon_mem_size];
209	>	return mem[adr % mon_mem_size];
210		}
211
212	<	void mon_write_byte(uint32 adr, uint32 b)
212	>	uint32 mon_read_byte_real(uint32 adr)
213		{
214	<	if (mon_use_real_mem)
215	<	(uint8 )adr = b;
216	<	else
217	<	mem[adr % mon_mem_size] = b;
214	>	return (uint8 )adr;
215	>	}
216	>
217	>	void (*mon_write_byte)(uint32 adr, uint32 b);
218	>
219	>	void mon_write_byte_buffer(uint32 adr, uint32 b)
220	>	{
221	>	mem[adr % mon_mem_size] = b;
222	>	}
223	>
224	>	void mon_write_byte_real(uint32 adr, uint32 b)
225	>	{
226	>	(uint8 )adr = b;
227		}
228
229		uint32 mon_read_half(uint32 adr)
230		{
231	<	if (mon_use_real_mem)
199	<	return ntohs((uint16 )adr);
200	<	else
201	<	return mem[adr % mon_mem_size] << 8 \| mem[(adr+1) % mon_mem_size];
231	>	return (mon_read_byte(adr) << 8) \| mon_read_byte(adr+1);
232		}
233
234		void mon_write_half(uint32 adr, uint32 w)
235		{
236	<	if (mon_use_real_mem)
237	<	(uint16 )adr = htons(w);
208	<	else {
209	<	mem[adr % mon_mem_size] = w >> 8;
210	<	mem[(adr+1) % mon_mem_size] = w;
211	<	}
236	>	mon_write_byte(adr, w >> 8);
237	>	mon_write_byte(adr+1, w);
238		}
239
240		uint32 mon_read_word(uint32 adr)
241		{
242	<	if (mon_use_real_mem)
217	<	return ntohl((uint32 )adr);
218	<	else
219	<	return mon_read_byte(adr) << 24 \| mon_read_byte(adr+1) << 16 \| mon_read_byte(adr+2) << 8 \| mon_read_byte(adr+3);
242	>	return (mon_read_byte(adr) << 24) \| (mon_read_byte(adr+1) << 16) \| (mon_read_byte(adr+2) << 8) \| mon_read_byte(adr+3);
243		}
244
245		void mon_write_word(uint32 adr, uint32 l)
246		{
247	<	if (mon_use_real_mem)
248	<	(uint32 )adr = htonl(l);
249	<	else {
250	<	mem[adr % mon_mem_size] = l >> 24;
228	<	mem[(adr+1) % mon_mem_size] = l >> 16;
229	<	mem[(adr+2) % mon_mem_size] = l >> 8;
230	<	mem[(adr+3) % mon_mem_size] = l;
231	<	}
247	>	mon_write_byte(adr, l >> 24);
248	>	mon_write_byte(adr+1, l >> 16);
249	>	mon_write_byte(adr+2, l >> 8);
250	>	mon_write_byte(adr+3, l);
251		}
252
253
#	Line 238 \| Line 257 \| void mon_write_word(uint32 adr, uint32 l
257
258		static void read_line(char *prompt)
259		{
260	+	#ifdef HAVE_LIBREADLINE
261		static char *line_read = NULL;
262
263		if (line_read) {
#	Line 252 \| Line 272 \| *static void read_line(char prompt)**
272
273		strncpy(in_ptr = input, line_read, INPUT_LENGTH);
274		input[INPUT_LENGTH-1] = 0;
275	+	#else
276	+	fprintf(monout, prompt);
277	+	fflush(monout);
278	+	fgets(in_ptr = input, INPUT_LENGTH, monin);
279	+	char *s = strchr(input, '\n');
280	+	if (s != NULL)
281	+	*s = 0;
282	+	#endif
283		}
284
285
#	Line 366 \| Line 394 \| static enum Token get_hex_number(uint32
394		return T_NULL;
395
396		do {
397	+	c = tolower(c);
398		if (c < 'a')
399		i = (i << 4) + (c - '0');
400		else
#	Line 674 \| Line 703 \| *static bool factor(uint32 number)**
703		return true;
704
705		case T_NAME:{
706	<	Variable *var;
707	<	if ((var = lookup_var(mon_name)) != NULL) {
708	<	*number = var->value;
706	>	var_map::const_iterator v = vars.find(mon_name);
707	>	if (v == vars.end())
708	>	return false;
709	>	else {
710	>	*number = v->second;
711		mon_get_token();
712		return true;
713	<	} else
683	<	return false;
713	>	}
714		}
715
716		case T_DOT:
#	Line 740 \| Line 770 \| *static bool factor(uint32 number)**
770
771
772		/*
743	–	* Lookup the value of a variable
744	–	*/
745	–
746	–	static Variable lookup_var(const char s)
747	–	{
748	–	// Lookup variable
749	–	for (Variable *var=first_var; var; var=var->next)
750	–	if (!strcmp(s, var->name))
751	–	return var;
752	–
753	–	// Not found, error
754	–	mon_error("Undefined variable");
755	–	return NULL;
756	–	}
757	–
758	–
759	–	/*
760	–	* Insert new variable (or redefine old)
761	–	*/
762	–
763	–	static Variable insert_var(const char s)
764	–	{
765	–	// Lookup variable
766	–	for (Variable *var=first_var; var; var=var->next)
767	–	if (!strcmp(s, var->name))
768	–	return var;
769	–
770	–	// Insert new variable
771	–	Variable *var = new Variable;
772	–	var->name = strdup(s);
773	–	var->next = first_var;
774	–	first_var = var;
775	–	return var;
776	–	}
777	–
778	–
779	–	/*
780	–	* Remove variable
781	–	*/
782	–
783	–	static void remove_var(const char *s)
784	–	{
785	–	Variable var, prev = (Variable *)&first_var;
786	–
787	–	// Lookup variable and remove it
788	–	for (var=prev->next; var; prev=var, var=var->next)
789	–	if (!strcmp(s, var->name)) {
790	–	prev->next = var->next;
791	–	free(var->name);
792	–	free(var);
793	–	return;
794	–	}
795	–	}
796	–
797	–
798	–	/*
773		* Set/clear/show variables
774		* set [var[=value]]
775		*/
#	Line 805 \| Line 779 \| static void set_var(void)
779		if (mon_token == T_END) {
780
781		// Show all variables
782	<	if (first_var == NULL)
782	>	if (vars.empty())
783		fprintf(monout, "No variables defined\n");
784	<	else
785	<	for (Variable *v=first_var; v; v=v->next)
786	<	fprintf(monout, "%s = %08lx\n", v->name, v->value);
784	>	else {
785	>	var_map::const_iterator v = vars.begin(), end = vars.end();
786	>	for (v=vars.begin(); v!=end; ++v)
787	>	fprintf(monout, "%s = %08x\n", v->first.c_str(), v->second);
788	>	}
789
790		} else if (mon_token == T_NAME) {
791	<	char var_name[256];
816	<	strcpy(var_name, mon_name);
791	>	string var_name = mon_name;
792		mon_get_token();
793		if (mon_token == T_ASSIGN) {
794
#	Line 826 \| Line 801 \| static void set_var(void)
801		mon_error("Too many arguments");
802		return;
803		}
804	<	insert_var(var_name)->value = value;
804	>	vars[var_name] = value;
805
806		} else if (mon_token == T_END) {
807
808		// Clear variable
809	<	remove_var(var_name);
809	>	vars.erase(var_name);
810
811		} else
812		mon_error("'=' expected");
#	Line 847 \| Line 822 \| static void set_var(void)
822
823		static void clear_vars(void)
824		{
825	<	Variable var, next;
851	<	for (var=first_var; var; var=next) {
852	<	free(var->name);
853	<	next = var->next;
854	<	free(var);
855	<	}
856	<	first_var = NULL;
825	>	vars.clear();
826		}
827
828
#	Line 902 \| Line 871 \| static void reallocate(void)
871		}
872
873		if (mon_token == T_END) {
874	<	fprintf(monerr, "Buffer size: %08lx bytes\n", mon_mem_size);
874	>	fprintf(monerr, "Buffer size: %08x bytes\n", mon_mem_size);
875		return;
876		}
877
#	Line 914 \| Line 883 \| static void reallocate(void)
883		}
884
885		if ((mem = (uint8 *)realloc(mem, size)) != NULL)
886	<	fprintf(monerr, "Buffer size: %08lx bytes\n", mon_mem_size = size);
886	>	fprintf(monerr, "Buffer size: %08x bytes\n", mon_mem_size = size);
887		else
888		fprintf(monerr, "Unable to reallocate buffer\n");
889		}
#	Line 956 \| Line 925 \| static void apply(int size)
925		read_func = mon_read_word;
926		write_func = mon_write_word;
927		break;
928	+	default:
929	+	abort();
930	+	break;
931		}
932
933		while (adr<=end_adr) {
#	Line 1032 \| Line 1004 \| void mon_init(void)
1004		num_cmds = 0;
1005		cmd_help = NULL;
1006
1007	<	mon_add_command("??", mon_cmd_list, "?? Show list of commands\n");
1008	<	mon_add_command("ver", version, "ver Show version\n");
1009	<	mon_add_command("?", print_expr, "? expression Calculate expression\n");
1010	<	mon_add_command("@", reallocate, "@ [size] Reallocate buffer\n");
1011	<	mon_add_command("i", ascii_dump, "i [start [end]] ASCII memory dump\n");
1012	<	mon_add_command("m", memory_dump, "m [start [end]] Hex/ASCII memory dump\n");
1013	<	mon_add_command("d", disassemble_ppc, "d [start [end]] Disassemble PowerPC code\n");
1014	<	mon_add_command("d65", disassemble_6502, "d65 [start [end]] Disassemble 6502 code\n");
1015	<	mon_add_command("d68", disassemble_680x0, "d68 [start [end]] Disassemble 680x0 code\n");
1016	<	mon_add_command("d80", disassemble_8080, "d80 [start [end]] Disassemble 8080 code\n");
1017	<	mon_add_command("d86", disassemble_80x86, "d86 [start [end]] Disassemble 80x86 code\n");
1018	<	mon_add_command(":", modify, ": start string Modify memory\n");
1019	<	mon_add_command("f", fill, "f start end string Fill memory\n");
1020	<	mon_add_command("y", apply_byte, "y[b\|h\|w] start end expr Apply expression to memory\n");
1007	>	mon_add_command("??", mon_cmd_list, "?? Show list of commands\n");
1008	>	mon_add_command("ver", version, "ver Show version\n");
1009	>	mon_add_command("?", print_expr, "? expression Calculate expression\n");
1010	>	mon_add_command("@", reallocate, "@ [size] Reallocate buffer\n");
1011	>	mon_add_command("i", ascii_dump, "i [start [end]] ASCII memory dump\n");
1012	>	mon_add_command("m", memory_dump, "m [start [end]] Hex/ASCII memory dump\n");
1013	>	mon_add_command("b", binary_dump, "b [start [end]] Binary memory dump\n");
1014	>	mon_add_command("d", disassemble_ppc, "d [start [end]] Disassemble PowerPC code\n");
1015	>	mon_add_command("d65", disassemble_6502, "d65 [start [end]] Disassemble 6502 code\n");
1016	>	mon_add_command("d68", disassemble_680x0, "d68 [start [end]] Disassemble 680x0 code\n");
1017	>	mon_add_command("d80", disassemble_z80, "d80 [start [end]] Disassemble Z80 code\n");
1018	>	mon_add_command("d86", disassemble_80x86_32, "d86 [start [end]] Disassemble 80x86 (32-bit) code\n");
1019	>	mon_add_command("d8086", disassemble_80x86_16, "d8086 [start [end]] Disassemble 80x86 (16-bit) code\n");
1020	>	mon_add_command(":", modify, ": start string Modify memory\n");
1021	>	mon_add_command("f", fill, "f start end string Fill memory\n");
1022	>	mon_add_command("y", apply_byte, "y[b\|h\|w] start end expr Apply expression to memory\n");
1023		mon_add_command("yb", apply_byte, NULL);
1024		mon_add_command("yh", apply_half, NULL);
1025		mon_add_command("yw", apply_word, NULL);
1026	<	mon_add_command("t", transfer, "t start end dest Transfer memory\n");
1027	<	mon_add_command("c", compare, "c start end dest Compare memory\n");
1028	<	mon_add_command("h", help_or_hunt, "h start end string Search for byte string\n");
1029	<	mon_add_command("\\", shell_command, "\\ \"command\" Execute shell command\n");
1030	<	mon_add_command("ls", mon_exec, "ls [args] List directory contents\n");
1031	<	mon_add_command("rm", mon_exec, "rm [args] Remove file(s)\n");
1032	<	mon_add_command("cp", mon_exec, "cp [args] Copy file(s)\n");
1033	<	mon_add_command("mv", mon_exec, "mv [args] Move file(s)\n");
1034	<	mon_add_command("cd", mon_change_dir, "cd directory Change current directory\n");
1035	<	mon_add_command("o", redir_output, "o [\"file\"] Redirect output\n");
1036	<	mon_add_command("[", load_data, "[ start \"file\" Load data from file\n");
1037	<	mon_add_command("]", save_data, "] start size \"file\" Save data to file\n");
1038	<	mon_add_command("set", set_var, "set [var[=value]] Set/clear/show variables\n");
1039	<	mon_add_command("cv", clear_vars, "cv Clear all variables\n");
1026	>	mon_add_command("t", transfer, "t start end dest Transfer memory\n");
1027	>	mon_add_command("c", compare, "c start end dest Compare memory\n");
1028	>	mon_add_command("h", help_or_hunt, "h start end string Search for byte string\n");
1029	>	mon_add_command("\\", shell_command, "\\ \"command\" Execute shell command\n");
1030	>	mon_add_command("ls", mon_exec, "ls [args] List directory contents\n");
1031	>	mon_add_command("rm", mon_exec, "rm [args] Remove file(s)\n");
1032	>	mon_add_command("cp", mon_exec, "cp [args] Copy file(s)\n");
1033	>	mon_add_command("mv", mon_exec, "mv [args] Move file(s)\n");
1034	>	mon_add_command("cd", mon_change_dir, "cd directory Change current directory\n");
1035	>	mon_add_command("o", redir_output, "o [\"file\"] Redirect output\n");
1036	>	mon_add_command("[", load_data, "[ start \"file\" Load data from file\n");
1037	>	mon_add_command("]", save_data, "] start size \"file\" Save data to file\n");
1038	>	mon_add_command("set", set_var, "set [var[=value]] Set/clear/show variables\n");
1039	>	mon_add_command("cv", clear_vars, "cv Clear all variables\n");
1040	>
1041	>	mon_read_byte = NULL;
1042	>	mon_write_byte = NULL;
1043		}
1044
1045
#	Line 1093 \| Line 1070 \| void mon(int argc, char argv)**
1070		monout = stdout;
1071		monerr = stdout;
1072
1073	<	if (argc) {
1074	<	// Access real memory if mon was started as "rmon"
1075	<	char *prgname = argv[0];
1076	<	char *lastslash;
1077	<	if ((lastslash = strrchr(prgname, '/')) != NULL)
1078	<	prgname = lastslash + 1;
1079	<	if (strcmp(prgname, "rmon") == 0)
1073	>	// Make argc/argv point to the actual arguments
1074	>	const char *prg_name = argv[0];
1075	>	if (argc)
1076	>	argc--; argv++;
1077	>
1078	>	// Parse arguments
1079	>	mon_macos_mode = false;
1080	>	mon_use_real_mem = false;
1081	>	while (argc > 0) {
1082	>	if (strcmp(argv[0], "-h") == 0 \|\| strcmp(argv[0], "--help") == 0) {
1083	>	printf("Usage: %s [-m] [-r] [command...]\n", prg_name);
1084	>	exit(0);
1085	>	} else if (strcmp(argv[0], "-m") == 0)
1086	>	mon_macos_mode = true;
1087	>	else if (strcmp(argv[0], "-r") == 0)
1088		mon_use_real_mem = true;
1089	+	else
1090	+	break;
1091	+	argc--; argv++;
1092	+	}
1093	+	interactive = (argc == 0);
1094
1095	<	// Make argc/argv point to the actual arguments
1096	<	argc--;
1097	<	argv++;
1098	<	interactive = (argc == 0);
1095	>	// Set up memory access functions if not supplied by the user
1096	>	if (mon_read_byte == NULL) {
1097	>	if (mon_use_real_mem)
1098	>	mon_read_byte = mon_read_byte_real;
1099	>	else
1100	>	mon_read_byte = mon_read_byte_buffer;
1101	>	}
1102	>	if (mon_write_byte == NULL) {
1103	>	if (mon_use_real_mem)
1104	>	mon_write_byte = mon_write_byte_real;
1105	>	else
1106	>	mon_write_byte = mon_write_byte_buffer;
1107		}
1108
1109		// Allocate buffer
#	Line 1115 \| Line 1113 \| void mon(int argc, char argv)**
1113
1114		// Print banner
1115		if (interactive)
1116	<	fprintf(monerr, "\n * mon V%d.%d by Christian Bauer *\n"
1117	<	" * Press 'h' for help *\n\n", MON_VERSION, MON_REVISION);
1116	>	fprintf(monerr, "\n * cxmon V" VERSION " by Christian Bauer and Marc Hellwig *\n"
1117	>	" * Press 'h' for help *\n\n");
1118	>	}
1119	>
1120	>	// Clear variables
1121	>	vars.clear();
1122	>
1123	>	// In MacOS mode, pull in the lowmem globals as variables
1124	>	if (mon_macos_mode) {
1125	>	const lowmem_info *l = lowmem;
1126	>	while (l->name) {
1127	>	vars[l->name] = l->addr;
1128	>	l++;
1129	>	}
1130		}
1131
1132		init_abort();
#	Line 1125 \| Line 1135 \| void mon(int argc, char argv)**
1135		while (!done) {
1136		if (interactive) {
1137		char prompt[16];
1138	<	sprintf(prompt, "[%08lx]-> ", mon_dot_address);
1138	>	sprintf(prompt, "[%08x]-> ", mon_dot_address);
1139		read_line(prompt);
1140		} else {
1141		if (argc == 0) {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing mon/src/mon.cpp (file contents): Revision 1.1.1.1 by cebix, 1999-10-04T19:31:09Z vs. Revision 1.16 by cebix, 2002-03-03T16:19:10Z

Diff Legend

Comparing mon/src/mon.cpp (file contents):
Revision 1.1.1.1 by cebix, 1999-10-04T19:31:09Z vs.
Revision 1.16 by cebix, 2002-03-03T16:19:10Z