X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmonitor.c;h=24f2156b224d02ad7b0343fc4c52f0cf2e51c8ba;hb=170d5903618ef67fae20a54cac942ca8b8821f10;hp=4fcd425fb655f54303da18f28298204c07516646;hpb=3614c0ec65e1548e52d9149e6ef6925f37458fc6;p=YACASL2.git

diff --git a/src/monitor.c b/src/monitor.c
index 4fcd425..24f2156 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -5,25 +5,6 @@
  */
 static BPSLIST *bps[BPSTABSIZE];
 
-/**
- * @brief ブレークポイントのエラー
- */
-static CERR cerr_bps[] = {
-    { 101, "break point already defined" },
-    { 102, "break point table is full" },
-    { 103, "break point not found" },
-    { 104, "break point address not set" },
-    { 105, "illegal break point address" },
-};
-
-/**
- * @brief ブレークポイントのエラーをエラーリストに追加する
- *
- * @return なし
- */
-void addcerrlist_bps();
-
-
 unsigned adrhash(WORD adr)
 {
     HKEY *key[1];
@@ -36,11 +17,6 @@ unsigned adrhash(WORD adr)
     return h;
 }
 
-void addcerrlist_bps()
-{
-    addcerrlist(ARRAYSIZE(cerr_bps), cerr_bps);
-}
-
 bool getbps(WORD adr)
 {
     BPSLIST *p;
@@ -246,17 +222,54 @@ void mon_break(int argc, char *argv[])
     }
 }
 
-bool monitorcmd(char *cmd, MONARGS *args)
+void mon_dump(int argc, char *argv[])
 {
-    bool next = false;
-    if(stracmp(cmd, 2, (char* []){"s", "step"})) {
-        execmode.step = true;
-        next = true;
-    } else if(stracmp(cmd, 2, (char* []){"b", "break"})) {
+    int i = 0;
+    WORD start = 0, end = 0xFFFF;
+    if(argc > 0 && stracmp(argv[0], 2, (char* []){"a", "auto"})) {
+        execmode.dump = true;
+    } 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]);
+            }
+            fprintf(stderr, ": ignored.\n");
+        }
+    }
+}
+
+MONCMDTYPE monitorcmd(char *cmd, MONARGS *args)
+{
+    MONCMDTYPE cmdtype = MONREPEAT;
+    if(stracmp(cmd, 2, (char* []){"b", "break"})) {
         mon_break(args->argc, args->argv);
     } else if(stracmp(cmd, 2, (char* []){"c", "continue"})) {
         execmode.step = false;
-        next = true;
+        cmdtype = MONNEXT;
+    } else if(stracmp(cmd, 2, (char* []){"d", "dump"})) {
+        mon_dump(args->argc, args->argv);
+    } else if(stracmp(cmd, 2, (char* []){"q", "quit"})) {
+        fprintf(stdout, "Quit: COMET II monitor\n");
+        cmdtype = MONQUIT;
+    } else if(stracmp(cmd, 2, (char* []){"r", "reverse"})) {
+        if(args->argc == 2) {
+            disassemble_memory(nh2word(args->argv[0]), nh2word(args->argv[1]));
+        }
+    } else if(stracmp(cmd, 2, (char* []){"s", "step"})) {
+        execmode.step = true;
+        cmdtype = MONNEXT;
     } else if(stracmp(cmd, 2, (char* []){"t", "trace"})) {
         if(args->argc > 0 && stracmp(args->argv[0], 2, (char* []){"a", "auto"})) {
             execmode.logical = false;
@@ -277,23 +290,18 @@ bool monitorcmd(char *cmd, MONARGS *args)
             fprintf(stdout, "#%04X: Register::::\n", sys->cpu->pr);
             dspregister();
         }
-    } else if(stracmp(cmd, 2, (char* []){"d", "dump"})) {
-        if(args->argc > 0 && stracmp(args->argv[0], 2, (char* []){"a", "auto"})) {
-            execmode.dump = true;
-        } else if(args->argc > 0 && stracmp(args->argv[0], 2, (char* []){"no", "noauto"})) {
-            execmode.dump = false;
-        } else {
-            dumpmemory();
-        }
     } else if(stracmp(cmd, 3, (char* []){"?", "h", "help"})) {
-        fprintf(stdout, "b[reak] -- Manipulate Breakpoints. Details in `b ?'.\n");
-        fprintf(stdout, "s[tep] -- Step by step running your program until next interaction.\n");
+        fprintf(stdout, "b[reak] -- Manipulate Breakpoints. See details, `b ?'.\n");
         fprintf(stdout, "c[ontinue] -- Continue running your program.\n");
-        fprintf(stdout, "t[race] -- Display CPU register. `t[race] a[uto]/n[oauto]' set auto/noauto display. \n");
         fprintf(stdout, "d[ump] -- Display memory dump. `d[ump] a[uto]/n[oauto]' set auto/noauto display.\n");
+        fprintf(stdout, "q[uit] -- Quit running your program.\n");
+        fprintf(stdout, "r[everse] -- Disassemble memory. `r[everse] <start address> <end address>.\n");
+        fprintf(stdout, "s[tep] -- Step by step running your program until next interaction.\n");
+        fprintf(stdout, "t[race] -- Display CPU register. `t[race] a[uto]/n[oauto]' set auto/noauto display. \n");
+        fprintf(stdout, "T[race] -- Display CPU register as logical value. `t[race] a[uto]/n[oauto]' set auto/noauto display. \n");
         fprintf(stdout, "?/h[elp] -- Display this help.\n");
     }
-    return next;
+    return cmdtype;
 }
 
 void free_moncmdline(MONCMDLINE *moncmdl)
@@ -318,7 +326,7 @@ void monitor()
 {
     char *buf, *p;
     MONCMDLINE *moncmdl;
-    bool next = false;
+    MONCMDTYPE cmdtype = MONREPEAT;
     do {
         fprintf(stdout, "COMET II (Type ? for help) > ");
         buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
@@ -327,9 +335,16 @@ void monitor()
             *p = '\0';
         }
         if((moncmdl = monlinetok(buf)) != NULL) {
-            next = monitorcmd(moncmdl->cmd, moncmdl->args);
+            cmdtype = monitorcmd(moncmdl->cmd, moncmdl->args);
             free_moncmdline(moncmdl);
         }
         FREE(buf);
-    } while(next == false);
+        if(cmdtype == MONQUIT) {
+            shutdown();
+            freebps();
+            free_code_cmdtype();
+            freecerr();
+            exit(0);
+        }
+    } while(cmdtype == MONREPEAT);
 }