X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fmonitor.c;h=30893b66e1f294c90a2fb0cca6e47ea3b9532167;hp=9fe71f59bd13aeda83eebc6c52ed865456653fe1;hb=169407674e2df2da91b62a9d1c51d497dcce2bd3;hpb=21b0a348f1e1660a3da0ebf0c4e7009a4ac11c71

diff --git a/src/monitor.c b/src/monitor.c
index 9fe71f5..30893b6 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -5,6 +5,11 @@
  */
 static BPSLIST *bps[BPSTABSIZE];
 
+/**
+ * @brief comet2monitorのプロンプト
+ */
+static char *monitor_prompt = "(comet2 monitor)";
+
 unsigned adrhash(WORD adr)
 {
     HKEY *key[1];
@@ -118,49 +123,51 @@ void freebps()
 MONARGS *monargstok(const char *str)
 {
     MONARGS *args = malloc_chk(sizeof(MONARGS), "args");
-    char *p, *q, *r, *sepp;     /* pは文字列全体の先頭位置、qはトークンの先頭位置、rは文字の位置 */
-    int sepc = ' ';
+    char *tok, *p, sepc = ' ';
+    int i = 0;
 
     args->argc = 0;
-    if(str == NULL) {
+    if(!str || !str[0]) {
         return args;
     }
-    p = q = r = strdup_chk(str, "argstok.p");
+    tok = p = strdup_chk(str, "argstok.p");
     do {
-        while(*q == ' ' || *q == '\t'){
-            q = ++r;
-        }
-        sepp = r + strcspn(r, " ");
-        sepc = *sepp;
-        *sepp = '\0';
-        args->argv[++(args->argc)-1] = strdup_chk(q, "args.argv[]");
-        q = r = sepp + 1;
+        i = strcspn(p, " ");
+        sepc = p[i];
+        args->argv[(args->argc)++] = strndup_chk(p, i, "args->argv[]");
+        p += i + 1;
+        i = 0;
     } while(sepc == ' ');
-    FREE(p);
+    FREE(tok);
     return args;
 }
 
 MONCMDLINE *monlinetok(const char *line)
 {
     char *tokens, *p;
-    long l;
+    int i;
     MONCMDLINE *moncmdl = NULL;
 
-    if(*line == '\n' || *line == '\0') {
+    if(!line[0] || line[0] == '\n') {
         return NULL;
     }
     p = tokens = strdup_chk(line, "tokens");
+    /* コメントを削除 */
+    strip_casl2_comment(p);
+    /* 文字列末尾の改行と空白を削除 */
+    strip_end(p);
+
     moncmdl = malloc_chk(sizeof(MONCMDLINE), "moncmdl");
     /* コマンドの取得 */
-    moncmdl->cmd = malloc_chk((l = strcspn(p, " \t\n")) + 1, "moncmdl.cmd");
-    strncpy(moncmdl->cmd, p, l);
+    i = strcspn(p, " \t\n");
+    moncmdl->cmd = strndup_chk(p, i, "moncmdl->cmd");
     /* コマンドと引数の間の空白をスキップ */
-    p += l;
+    p += i;
     while(*p == ' ' || *p == '\t') {
         p++;
     }
     /* 引数として、改行までの文字列を取得 */
-    if((l = strcspn(p, "\n")) > 0) {
+    if(strcspn(p, "\n") > 0) {
         moncmdl->args = monargstok(p);
     } else {
         moncmdl->args = malloc_chk(sizeof(MONARGS), "moncmdl.args");
@@ -184,12 +191,27 @@ bool stracmp(char *str1, int str2c, char *str2v[])
     return false;
 }
 
+void warn_ignore_arg(int argc, char *argv[])
+{
+    int i;
+    for(i = 0; i < argc; i++) {
+        if(i > 0) {
+            fprintf(stderr, " ");
+        }
+        fprintf(stderr, "%s", argv[i]);
+    }
+    fprintf(stderr, ": ignored.\n");
+}
+
 void mon_break(int argc, char *argv[])
 {
     WORD w;
+    int i = 0;
     if(stracmp(argv[0], 2, (char* []){"l", "list"})) {
+        i++;
         listbps();
     } else if(stracmp(argv[0], 2, (char* []){"r", "reset"})) {
+        i++;
         freebps();
         fprintf(stdout, "All breakpoints are deleted.\n");
     } else {
@@ -199,18 +221,21 @@ void mon_break(int argc, char *argv[])
             }
         }
         if(stracmp(argv[0], 2, (char* []){"a", "add"})) {
+            i += 2;
             if(addbps(w) == true) {
                 fprintf(stdout, "#%04X: breakpoint added\n", w);
             } else {
                 fprintf(stdout, "No breakpoint added\n");
             }
         } else if(stracmp(argv[0], 2, (char* []){"d", "del"})) {
+            i += 2;
             if(delbps(w) == true) {
                 fprintf(stdout, "#%04X: breakpoint deleted\n", w);
             } else {
                 fprintf(stdout, "No breakpoint deleted\n");
             }
         } else if(stracmp(argv[0], 3, (char* []){"?", "h", "help"})) {
+            i++;
             fprintf(stdout, "breakpoint manipulate:\n");
             fprintf(stdout, "    b[reak] a[dd] <address>\n");
             fprintf(stdout, "    b[reak] d[el] <address>\n");
@@ -219,35 +244,42 @@ void mon_break(int argc, char *argv[])
         } else {
             fprintf(stderr, "%s: Not breakpoint manipulate command. see `b ?'.\n", argv[0]);
         }
+        if(argc > i) {
+            warn_ignore_arg(argc - i, argv + i);
+        }
     }
 }
 
 void mon_dump(int argc, char *argv[])
 {
     int i = 0;
-    WORD start = 0, end = 0xFFFF;
+    WORD dump_start = 0, dump_end = 0x40;
     if(argc > 0 && stracmp(argv[0], 2, (char* []){"a", "auto"})) {
         execmode.dump = true;
+        i++;
     } else if(argc > 0 && stracmp(argv[0], 2, (char* []){"no", "noauto"})) {
         execmode.dump = false;
-    } else {
-        if(argc > 0) {
-            start = nh2word(argv[0]);
-            if(argc > 1) {
-                end = nh2word(argv[1]);
-            }
-        }
-        dumpmemory(start, end);
-        if(argc > 2) {
-            for(i = 2; i < argc; i++) {
-                if(i > 2) {
-                    fprintf(stderr, " ");
-                }
-                fprintf(stderr, "%s", argv[i+1]);
+        i++;
+    }
+    if(argc > i) {
+        dump_start = nh2word(argv[i++]);
+        if(argc > i) {
+            if(argv[i][0] =='+') {
+                dump_end = dump_start + nh2word(argv[i] + 1);
+            } else {
+                dump_end = nh2word(argv[i]);
             }
-            fprintf(stderr, ": ignored.\n");
+        } else {
+            dump_end += dump_start;
         }
+        i++;
     }
+    if(argc > i) {
+        warn_ignore_arg(argc - i, argv + i);
+    }
+    dumpmemory(dump_start, dump_end);
+    execmode.dump_start = dump_start;
+    execmode.dump_end = dump_end;
 }
 
 MONCMDTYPE monitorcmd(char *cmd, MONARGS *args)
@@ -269,7 +301,7 @@ MONCMDTYPE monitorcmd(char *cmd, MONARGS *args)
     } else if(stracmp(cmd, 2, (char* []){"d", "dump"})) {
         mon_dump(args->argc, args->argv);
     } else if(stracmp(cmd, 2, (char* []){"l", "load"})) {
-        loadassemble(args->argv[0], nh2word(args->argv[1]));
+        execptr->end = loadassemble(args->argv[0], nh2word(args->argv[1]));
     } else if(stracmp(cmd, 2, (char* []){"n", "next"})) {
         execmode.step = true;
         cmdtype = MONNEXT;
@@ -340,16 +372,21 @@ void free_moncmdline(MONCMDLINE *moncmdl)
 
 void monitor()
 {
-    char *buf, *p;
+    char *buf = NULL;
+    int i;
     MONCMDLINE *moncmdl;
     MONCMDTYPE cmdtype = MONREPEAT;
 
     do {
-        fprintf(stdout, "- ");
+        fprintf(stdout, "%s ", monitor_prompt);
         buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
         fgets(buf, MONINSIZE, stdin);
-        if((p = strchr(buf, '\n')) != NULL) {
-            *p = '\0';
+        fprintf(stdout, "%s", buf);
+        if(!buf[0]) {
+            cmdtype = MONQUIT;
+        }
+        if((i = strcspn(buf, "\n")) > 0 || buf[0] == '\n') {
+            buf[i] = '\0';
         }
         if((moncmdl = monlinetok(buf)) != NULL) {
             cmdtype = monitorcmd(moncmdl->cmd, moncmdl->args);
@@ -359,7 +396,7 @@ void monitor()
         if(cmdtype == MONQUIT) {
             shutdown();
             freebps();
-            free_cmdtable(HASH_CODE);
+            free_cmdtable(HASH_CMDTYPE);
             freecerr();
             exit(0);
         }