From fc19bbf28ea2fdd9e42bc0c93ca49651aef8a752 Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Sun, 17 Feb 2019 22:37:11 +0900
Subject: [PATCH] =?utf8?q?comet2monitor=E3=81=A7=E3=80=81=E5=BC=95?=
 =?utf8?q?=E6=95=B0=E3=81=8C=E5=A4=9A=E3=81=99=E3=81=8E=E3=82=8B=E5=A0=B4?=
 =?utf8?q?=E5=90=88=E3=81=AB=E8=AD=A6=E5=91=8A=E3=82=92=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/monitor.c | 46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/monitor.c b/src/monitor.c
index 205c4d1..ec24645 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -186,12 +186,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 {
@@ -201,18 +216,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");
@@ -221,12 +239,15 @@ 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, j;
+    int i = 0;
     WORD dump_start = 0, dump_end = 0x40;
     if(argc > 0 && stracmp(argv[0], 2, (char* []){"a", "auto"})) {
         execmode.dump = true;
@@ -236,21 +257,24 @@ void mon_dump(int argc, char *argv[])
         i++;
     }
     if(argc > i) {
-        dump_start = execmode.dump_start = nh2word(argv[i++]);
+        dump_start = nh2word(argv[i++]);
         if(argc > i) {
-            dump_end = execmode.dump_end = nh2word(argv[i++]);
-        }
-        if(argc > i) {
-            for(j = i; j < argc; j++) {
-                if(j > i) {
-                    fprintf(stderr, " ");
-                }
-                fprintf(stderr, "%s", argv[j]);
+            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)
-- 
2.18.0