comet2monitorのダンプで引数のない場合は0から#40までダンプ

[YACASL2.git] / src / monitor.c

diff --git a/src/monitor.c b/src/monitor.c
index 89ad918..205c4d1 100644 (file)
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -123,25 +123,22 @@ 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;
-        strcpy(sepp, "");
-        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;
 }
 
@@ -230,7 +227,7 @@ void mon_break(int argc, char *argv[])
 void mon_dump(int argc, char *argv[])
 {
     int i = 0, j;
-    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++;
@@ -239,13 +236,12 @@ void mon_dump(int argc, char *argv[])
         i++;
     }
     if(argc > i) {
-        start = execmode.dump_start = nh2word(argv[i++]);
+        dump_start = execmode.dump_start = nh2word(argv[i++]);
         if(argc > i) {
-            end = execmode.dump_end = nh2word(argv[i++]);
+            dump_end = execmode.dump_end = nh2word(argv[i++]);
         }
-        dumpmemory(start, end);
         if(argc > i) {
-            for(j = i; i < argc; j++) {
+            for(j = i; j < argc; j++) {
                 if(j > i) {
                     fprintf(stderr, " ");
                 }
@@ -254,6 +250,7 @@ void mon_dump(int argc, char *argv[])
             fprintf(stderr, ": ignored.\n");
         }
     }
+    dumpmemory(dump_start, dump_end);
 }
 
 MONCMDTYPE monitorcmd(char *cmd, MONARGS *args)
@@ -275,7 +272,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;