Correctly comment which bit the beep program uses

[fw/altos] / s51 / s51-command.c

diff --git a/s51/s51-command.c b/s51/s51-command.c
index b4f853be7794b60ac244902d5eeb2e38ef39fb2a..034d5dce9f21bef1c19c23303c9a96efeeb0c175 100644 (file)
--- a/s51/s51-command.c
+++ b/s51/s51-command.c
@@ -46,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)
 {
@@ -54,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++)
@@ -90,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;
 }
 
@@ -130,19 +145,56 @@ 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;
 }
 
@@ -150,6 +202,7 @@ enum command_result
 command_file (int argc, char **argv)
 {
        struct hex_file *hex;
+       struct hex_image *image;
        FILE *file;
        
        if (argc != 2)
@@ -165,7 +218,10 @@ command_file (int argc, char **argv)
                ccdbg_hex_file_free(hex);
                return command_error;
        }
-       start_address = hex->records[0]->address;
+       image = ccdbg_hex_image_create(hex);
+       ccdbg_hex_file_free(hex);
+       start_address = image->address;
+       ccdbg_set_rom(s51_dbg, image);
        return command_success;
 }
 
@@ -449,6 +505,12 @@ 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)
 {
@@ -487,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)
 {