X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmonitor.c;h=89ad9186ba0704f7b1f72b762dc62c0fc50f646a;hb=c4f28a62ae8cefe85ccc43989dba326a318c6376;hp=a799f7cb8e661953ab712f4fe221135edd12a0b3;hpb=8521d91eea4d77630d668ad269dc0634f4a426ff;p=YACASL2.git

diff --git a/src/monitor.c b/src/monitor.c
index a799f7c..89ad918 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];
@@ -224,26 +229,27 @@ void mon_break(int argc, char *argv[])
 
 void mon_dump(int argc, char *argv[])
 {
-    int i = 0;
+    int i = 0, j;
     WORD start = 0, end = 0xFFFF;
     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]);
-            }
+        i++;
+    }
+    if(argc > i) {
+        start = execmode.dump_start = nh2word(argv[i++]);
+        if(argc > i) {
+            end = execmode.dump_end = nh2word(argv[i++]);
         }
         dumpmemory(start, end);
-        if(argc > 2) {
-            for(i = 2; i < argc; i++) {
-                if(i > 2) {
+        if(argc > i) {
+            for(j = i; i < argc; j++) {
+                if(j > i) {
                     fprintf(stderr, " ");
                 }
-                fprintf(stderr, "%s", argv[i+1]);
+                fprintf(stderr, "%s", argv[j]);
             }
             fprintf(stderr, ": ignored.\n");
         }
@@ -346,7 +352,7 @@ void monitor()
     MONCMDTYPE cmdtype = MONREPEAT;
 
     do {
-        fprintf(stdout, "- ");
+        fprintf(stdout, "%s ", monitor_prompt);
         buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
         fgets(buf, MONINSIZE, stdin);
         fprintf(stdout, "%s", buf);