X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fmonitor.c;h=4278c6ae6ab0a2847c45f1892fbadc2813f1a57d;hp=d4189faf3820be34abf35e355f94ebd55a941165;hb=2f0b91ab1a54973a084e1609b46a1432c8b8e334;hpb=2a1b2ba47ff6596864ab38c8d9419e3c1372ef6e

diff --git a/src/monitor.c b/src/monitor.c
index d4189fa..4278c6a 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -222,17 +222,67 @@ void mon_break(int argc, char *argv[])
     }
 }
 
+void mon_dump(int argc, char *argv[])
+{
+    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* []){"s", "step"})) {
-        execmode.step = true;
-        cmdtype = MONNEXT;
+    if(stracmp(cmd, 2, (char* []){"a", "assemble"})) {
+        if(args->argc == 0) {
+            fprintf(stderr, "Error: Input file name.\n");
+        } else if(args->argc == 1) {
+            assemble(1, (char* []){args->argv[0]}, 0);
+        } else {
+            assemble(1, (char* []){args->argv[0]}, nh2word(args->argv[1]));
+        }
     } else if(stracmp(cmd, 2, (char* []){"b", "break"})) {
         mon_break(args->argc, args->argv);
     } else if(stracmp(cmd, 2, (char* []){"c", "continue"})) {
         execmode.step = false;
         cmdtype = MONNEXT;
+    } 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]));
+    } else if(stracmp(cmd, 2, (char* []){"n", "next"})) {
+        execmode.step = true;
+        cmdtype = MONNEXT;
+    } 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, 1, (char* []){"reset"})) {
+        fprintf(stdout, "Reset COMET II.\n");
+        reset(sys->memsize, sys->clocks);     /* COMET II仮想マシンのリセット */
     } else if(stracmp(cmd, 2, (char* []){"t", "trace"})) {
         if(args->argc > 0 && stracmp(args->argv[0], 2, (char* []){"a", "auto"})) {
             execmode.logical = false;
@@ -253,29 +303,18 @@ MONCMDTYPE 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 if(args->argc == 1) {
-            dumpmemory(nh2word(args->argv[0]), 0xFFFF);
-        } else if(args->argc > 1) {
-            dumpmemory(nh2word(args->argv[0]), nh2word(args->argv[1]));
-        }
-    } 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* []){"q", "quit"})) {
-        fprintf(stdout, "Quit: COMET II monitor\n");
-        cmdtype = MONQUIT;
     } 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, "l[oad] -- Load object from a file to the memory. `l[oad] <filepath> <address>' if address is omitted, load to address 0.\n");
+        fprintf(stdout, "n[ext] -- Go next instruction.\n");
+        fprintf(stdout, "q[uit] -- Quit running your program.\n");
+        fprintf(stdout, "reset -- Reset the system.\n");
+        fprintf(stdout, "r[everse] -- Disassemble memory. `r[everse] <start address> <end address>.\n");
+        fprintf(stdout, "s[ave] -- Save object from the memory to a file. `s[ave] <filepath> [<start address1> [<end address>]]' if <start address> and <end address> is omitted, save the whole memory. if <end address> is omitted, save the memory after <start address>.\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 cmdtype;
@@ -304,8 +343,9 @@ void monitor()
     char *buf, *p;
     MONCMDLINE *moncmdl;
     MONCMDTYPE cmdtype = MONREPEAT;
+
     do {
-        fprintf(stdout, "COMET II (Type ? for help) > ");
+        fprintf(stdout, "- ");
         buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
         fgets(buf, MONINSIZE, stdin);
         if((p = strchr(buf, '\n')) != NULL) {