X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=s51%2Fs51-command.c;h=034d5dce9f21bef1c19c23303c9a96efeeb0c175;hp=7538a94ac3011e70fd6744a7a71dfced03d7c200;hb=a0a27600ee2bf237e74eb83767a8d2e7c91df24f;hpb=d2d9cfd74fd66836c913c02276e09136d83b35dc

diff --git a/s51/s51-command.c b/s51/s51-command.c
index 7538a94a..034d5dce 100644
--- a/s51/s51-command.c
+++ b/s51/s51-command.c
@@ -18,6 +18,8 @@
 
 #include "s51.h"
 
+static uint16_t start_address;
+
 static enum command_result
 parse_int(char *value, int *result)
 {
@@ -44,6 +46,21 @@ parse_uint16(char *value, uint16_t *uint16)
 	return command_success;
 }
 
+static enum command_result
+parse_uint8(char *value, uint8_t *uint8)
+{
+	int	v;
+	enum command_result result;
+
+	result = parse_int(value, &v);
+	if (result != command_success)
+		return command_error;
+	if (v < 0 || v > 0xff)
+		return command_error;
+	*uint8 = v;
+	return command_success;
+}
+
 enum command_result
 command_quit (int argc, char **argv)
 {
@@ -52,12 +69,12 @@ command_quit (int argc, char **argv)
 }
 
 static void
-dump_bytes(uint8_t *memory, int length, uint16_t start)
+dump_bytes(uint8_t *memory, int length, uint16_t start, char *format)
 {
 	int group, i;
 	
 	for (group = 0; group < length; group += 8) {
-		s51_printf("0x%04x ", start + group);
+		s51_printf(format, start + group);
 		for (i = group; i < length && i < group + 8; i++)
 			s51_printf("%02x ", memory[i]);
 		for (; i < group + 8; i++)
@@ -88,27 +105,27 @@ command_di (int argc, char **argv)
 		return command_error;
 	length = (int) end - (int) start + 1;
 	status = ccdbg_read_memory(s51_dbg, start + 0xff00, memory, length);
-	dump_bytes(memory, length, start);
+	dump_bytes(memory, length, start, "0x%02x ");
 	return command_success;
 }
 
 enum command_result
 command_ds (int argc, char **argv)
 {
-	uint16_t start, end;
-	uint8_t	memory[65536];
+	uint8_t start, end;
+	uint8_t	memory[0x100];
 	uint8_t status;
 	int length;
 	
 	if (argc != 3)
 		return command_error;
-	if (parse_uint16(argv[1], &start) != command_success)
+	if (parse_uint8(argv[1], &start) != command_success)
 		return command_error;
-	if (parse_uint16(argv[2], &end) != command_success)
+	if (parse_uint8(argv[2], &end) != command_success)
 		return command_error;
 	length = (int) end - (int) start + 1;
-	status = ccdbg_read_memory(s51_dbg, start + 0xdf00, memory, length);
-	dump_bytes(memory, length, start);
+	status = ccdbg_read_sfr(s51_dbg, start, memory, length);
+	dump_bytes(memory, length, start, "0x%02x ");
 	return command_success;
 }
 
@@ -128,28 +145,83 @@ command_dx (int argc, char **argv)
 		return command_error;
 	length = (int) end - (int) start + 1;
 	status = ccdbg_read_memory(s51_dbg, start, memory, length);
-	dump_bytes(memory, length, start);
+	dump_bytes(memory, length, start, "0x%04x ");
 	return command_success;
 }
 
 enum command_result
 command_set (int argc, char **argv)
 {
-	return command_error;
+	uint16_t address;
+	uint8_t *data;
+	int len = argc - 3;
+	int i;
+	enum command_result ret = command_success;
+
+	if (len < 0)
+		return command_error;
+	if (parse_uint16(argv[2], &address) != command_success)
+		return command_error;
+	if (len == 0)
+		return command_success;
+	data = malloc(len);
+	if (!data)
+		return command_error;
+	for (i = 0; i < len; i++)
+		if (parse_uint8(argv[i+3], &data[i]) != command_success)
+			return command_error;
+	
+	if (strcmp(argv[1], "xram") == 0) {
+		ccdbg_write_memory(s51_dbg, address, data, len);
+	} else if (strcmp(argv[1], "iram") == 0) {
+		ccdbg_write_memory(s51_dbg, address + 0xff00, data, len);
+	} else if (strcmp(argv[1], "sfr") == 0) {
+		ccdbg_write_sfr(s51_dbg, (uint8_t) address, data, len);
+	} else
+		ret = command_error;
+	free(data);
+	return ret;
 }
 
 enum command_result
 command_dump (int argc, char **argv)
 {
+	if (argv[1]) {
+		if (strcmp(argv[1], "rom") == 0 ||
+		    strcmp(argv[1], "xram") == 0)
+			return command_dx(argc-1, argv+1);
+		if (strcmp(argv[1], "iram") == 0)
+			return command_di(argc-1, argv+1);
+		if (strcmp(argv[1], "sfr") == 0)
+			return command_ds(argc-1, argv+1);
+	}
 	return command_error;
 }
 
 enum command_result
 command_file (int argc, char **argv)
 {
+	struct hex_file *hex;
+	struct hex_image *image;
+	FILE *file;
+	
 	if (argc != 2)
 		return command_error;
-	s51_printf("some words read from %s\n", argv[1]);
+	file = fopen (argv[1], "r");
+	if (!file)
+		return command_error;
+	hex = ccdbg_hex_file_read(file, argv[1]);
+	fclose(file);
+	if (!hex)
+		return command_error;
+	if (hex->nrecord == 0) {
+		ccdbg_hex_file_free(hex);
+		return command_error;
+	}
+	image = ccdbg_hex_image_create(hex);
+	ccdbg_hex_file_free(hex);
+	start_address = image->address;
+	ccdbg_set_rom(s51_dbg, image);
 	return command_success;
 }
 
@@ -200,6 +272,15 @@ enable_breakpoint(int b)
 		s51_printf("enable_breakpoint status 0x%02x\n", status);
 }
 
+static void
+enable_breakpoints(void)
+{
+	int b;
+	for (b = 0; b < CC_NUM_BREAKPOINTS; b++)
+		if (breakpoints[b].enabled)
+			enable_breakpoint(b);
+}
+
 enum command_result
 set_breakpoint(uint16_t address, int temporary)
 {
@@ -261,8 +342,7 @@ find_breakpoint(uint16_t address)
 			break;
 	if (b == CC_NUM_BREAKPOINTS)
 		return -1;
-	if (breakpoints[b].temporary)
-		clear_breakpoint(address, 1);
+	return b;
 }
 
 enum command_result
@@ -317,6 +397,9 @@ cc_stopped(uint8_t status)
 			pc = pc - 1;
 			code = 104;
 			reason = "Breakpoint";
+			b = find_breakpoint(pc);
+			if (b != -1 && breakpoints[b].temporary)
+				clear_breakpoint(pc, 1);
 			ccdbg_set_pc(s51_dbg, pc);
 		} else {
 			code = 105;
@@ -360,6 +443,10 @@ command_run (int argc, char **argv)
 			if (result != command_success)
 				return result;
 		}
+		if (start_address && start == 0) {
+			start = start_address;
+			s51_printf("Starting at 0x%04x\n", start);
+		}
 		ccdbg_set_pc(s51_dbg, start);
 	}
 	else
@@ -418,10 +505,18 @@ command_halt (int argc, char **argv)
 	return command_success;
 }
 
+enum command_result
+command_stop (int argc, char **argv)
+{
+	return command_success;
+}
+
 enum command_result
 command_reset (int argc, char **argv)
 {
 	ccdbg_debug_mode(s51_dbg);
+	ccdbg_halt(s51_dbg);
+	enable_breakpoints();
 	return command_success;
 }
 
@@ -454,6 +549,58 @@ command_status(int argc, char **argv)
 	return command_success;
 }
 
+static enum command_result
+info_breakpoints(int argc, char **argv)
+{
+	int b;
+	uint16_t address;
+	enum command_result result;
+
+	if (argc == 1) {
+		s51_printf("Num Type       Disp Hit   Cnt   Address  What\n");
+		for (b = 0; b < CC_NUM_BREAKPOINTS; b++)
+			if (breakpoints[b].enabled) {
+				s51_printf("%-3d fetch      %s 1     1     0x%04x   uc::disass() unimplemented\n",
+					   b,
+					   breakpoints[b].temporary ? "del " : "keep",
+					   breakpoints[b].address);
+			}
+		return command_success;
+	}
+	
+}
+
+static enum command_result
+info_help(int argc, char **argv);
+
+static struct command_function infos[] = {
+	{ "breakpoints", "b", info_breakpoints, "[b]reakpoints",
+		"List current breakpoints\n" },
+	{ "help",   "?",  info_help,	"help",
+		"Print this list\n" },
+	
+	{ NULL, NULL, NULL, NULL, NULL },
+};
+
+static enum command_result
+info_help(int argc, char **argv)
+{
+	return command_function_help(infos, argc, argv);
+}
+
+enum command_result
+command_info(int argc, char **argv)
+{
+	struct command_function *func;
+	
+	if (argc < 2)
+		return command_error;
+	func = command_string_to_function(infos, argv[1]);
+	if (!func)
+		return command_syntax;
+	return (*func->func)(argc-1, argv+1);
+}
+
 enum command_result
 cc_wait(void)
 {