X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fexec.c;h=8c9d5661122dc43dd742952fda95d065d83876bf;hp=2bca01145d89a48b8432b90abcc52d5d5abcd6be;hb=8365c3016d2564c0498d2dc21300b1bff57e929b;hpb=2a1b2ba47ff6596864ab38c8d9419e3c1372ef6e

diff --git a/src/exec.c b/src/exec.c
index 2bca011..8c9d566 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -70,16 +70,6 @@ WORD get_adr_x(WORD adr, WORD oprx);
  */
 WORD get_val_adr_x(WORD adr, WORD oprx);
 
-/**
- * @brief 汎用レジスタの番号からレジスタを表す文字列を返す
- *
- * @return 汎用レジスタを表す文字列。「GR0」「GR1」・・・「GR7」のいずれか
- *
- * @param word レジスタ番号[0-7]を表すWORD値
- */
-char *grstr(WORD word);
-
-
 /**
  * @brief 実行エラーの定義
  */
@@ -104,9 +94,9 @@ static CERR cerr_load[] = {
 };
 
 /**
- * @brief 実行モード: trace, logical, dump, step
+ * @brief 実行モード: trace, logical, dump, monitor, step
  */
-EXECMODE execmode = {false, false, false, false};
+EXECMODE execmode = {false, false, false, false, false};
 
 char *pr2str(WORD pr)
 {
@@ -126,7 +116,7 @@ void svcin()
         return;
     }
     for(i = 0; i < INSIZE; i++) {
-        if(*(buf + i) == '\0' || *(buf + i) == '\n') {
+        if(!buf[i] || buf[i] == '\n') {
             --i;
             break;
         }
@@ -236,25 +226,23 @@ void addcerrlist_exec()
     addcerrlist(ARRAYSIZE(cerr_exec), cerr_exec);
 }
 
-bool loadassemble(const char *file)
+WORD loadassemble(const char *file, WORD start)
 {
     FILE *fp;
-    bool stat = true;
+    WORD end;
 
     assert(file != NULL);
     if((fp = fopen(file, "rb")) == NULL) {
         perror(file);
-        return false;
+        return 0;
     }
-    execptr->end = execptr->start +
-        fread(sys->memory, sizeof(WORD), sys->memsize - execptr->start, fp);
-    if(execptr->end == sys->memsize) {
+    end = start + fread(sys->memory + start, sizeof(WORD), sys->memsize - start, fp);
+    if(end == sys->memsize) {
         setcerr(210, file);    /* load - memory overflow */
         fprintf(stderr, "Load error - %d: %s\n", cerr->num, cerr->msg);
-        stat = false;
     }
     fclose(fp);
-    return stat;
+    return end;
 }
 
 void nop()
@@ -773,21 +761,15 @@ void svc()
     sys->cpu->pr += 2;
 }
 
-char *grstr(WORD word)
-{
-    assert(word <= 7);
-    char *str = malloc_chk(3 + 1, "grstr.str");
-    sprintf(str, "GR%d", word);
-    return str;
-}
-
 void exec()
 {
     clock_t clock_begin, clock_end;
     void (*cmdptr)();
     char *s;
+    const char *monmsg = "COMET II machine code monitor. Type ? for help.\n";
+
+    create_cmdtable(HASH_CODE);                 /* 命令のコードとタイプがキーのハッシュ表を作成 */
 
-    create_code_cmdtype();                          /* 命令のコードとタイプがキーのハッシュ表を作成 */
     if(execmode.trace == true) {
         fprintf(stdout, "\nExecuting machine codes\n");
     }
@@ -805,8 +787,14 @@ void exec()
             }
             fprintf(stdout, "\n");
         }
-        /* デバッガーモードの場合、デバッガーを起動 */
-        if(execmode.step == true || getbps(sys->cpu->pr) == true) {
+        /* ステップモードまたはブレークポイントの場合、モニターを起動 */
+        if(
+            (execmode.monitor == true && sys->cpu->pr == execptr->start) ||
+            execmode.step == true || getbps(sys->cpu->pr) == true)
+        {
+            if(sys->cpu->pr == execptr->start) {
+                fprintf(stdout, "%s", monmsg);
+            }
             monitor();
         }
         /* プログラムレジスタをチェック */
@@ -834,9 +822,14 @@ void exec()
         if(cerr->num > 0) {
             goto execfin;
         }
-        /* 終了フラグがtrueの場合は、正常終了 */
+        /* 終了フラグがtrueの場合は、モニターまたは正常終了 */
         if(execptr->stop == true) {
-            break;
+            if(execmode.monitor == true) {
+                fprintf(stdout, "Return to top.\n");
+                monitor();
+            } else {
+                break;
+            }
         }
         /* クロック周波数の設定 */
         do {
@@ -845,106 +838,8 @@ void exec()
     }
 execfin:
     freebps();
-    free_code_cmdtype();                           /* 命令のコードとタイプがキーのハッシュ表を解放 */
+    free_cmdtable(HASH_CODE);              /* 命令のコードとタイプがキーのハッシュ表を解放 */
     if(cerr->num > 0) {
         fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);
     }
 }
-
-void disassemble_cmd_adr_x(CMDTYPE cmdtype, const char *cmdname, WORD word, WORD adr, WORD loc)
-{
-    WORD x;
-    char *g;
-    fprintf(stdout, "\t%s\t", cmdname);
-    if(cmdtype == R_ADR_X) {
-        fprintf(stdout, "%s,", g = grstr((word & 0x00F0) >> 4));
-        FREE(g);
-    }
-    fprintf(stdout, "#%04X", adr);
-    if((x = (word & 0x000F)) != 0) {
-        fprintf(stdout, ",%s", g = grstr(x));
-        FREE(g);
-    }
-    fprintf(stdout, "\t\t\t\t; #%04X: #%04X #%04X", loc, word, adr);
-}
-
-void disassemble_cmd_r(CMDTYPE cmdtype, const char *cmdname, WORD word, WORD loc)
-{
-    char *g, *g1, *g2;
-    fprintf(stdout, "\t%s", cmdname);
-    if(cmdtype == R1_R2) {
-        g1 = grstr((word & 0x00F0) >> 4);
-        g2 = grstr(word & 0x000F);
-        fprintf(stdout, "\t%s,%s", g1, g2);
-        FREE(g1);
-        FREE(g2);
-    } else if(cmdtype == R_) {
-        g = grstr((word & 0x00F0) >> 4);
-        fprintf(stdout, "\t%s", g);
-        FREE(g);
-    }
-    fprintf(stdout, "\t\t\t\t; #%04X: #%04X", loc, word);
-}
-
-bool disassemble_file(const char *file)
-{
-    bool stat = true;
-    FILE *fp;
-    WORD i = 0, w, cmd, adr;
-    CMDTYPE cmdtype = 0;
-    char *cmdname;
-
-    assert(file != NULL);
-    if((fp = fopen(file, "rb")) == NULL) {
-        perror(file);
-        return false;
-    }
-
-    create_code_cmdtype();                          /* 命令のコードとタイプがキーのハッシュ表を作成 */
-
-    fprintf(stdout, "MAIN\tSTART\n");
-    for(fread(&w, sizeof(WORD), 1, fp); !feof(fp); fread(&w, sizeof(WORD), 1, fp)) {
-        cmd = w & 0xFF00;
-        cmdname = getcmdname(cmd);
-        cmdtype = getcmdtype(cmd);
-        if(cmd == 0xFF00 || (w != 0 && cmd == 0)) {
-            fprintf(stdout, "\tDC\t%d\t\t\t\t; #%04X: #%04X :: ", w, i++, w);
-            print_dumpword(w, true);
-        } else if(cmdtype == R_ADR_X || cmdtype == ADR_X) {
-            fread(&adr, sizeof(WORD), 1, fp);
-            disassemble_cmd_adr_x(cmdtype, cmdname, w, adr, i);
-            i += 2;
-        } else {
-            disassemble_cmd_r(cmdtype, cmdname, w, i++);
-        }
-        fprintf(stdout, "\n");
-    }
-    fprintf(stdout, "\tEND\n");
-    free_code_cmdtype();
-    fclose(fp);
-    return stat;
-}
-
-void disassemble_memory(WORD start, WORD end)
-{
-    WORD i, w, cmd, adr;
-    CMDTYPE cmdtype = 0;
-    char *cmdname;
-
-    for(i = start; i <= end; i++) {
-        w = sys->memory[i];
-        cmd = w & 0xFF00;
-        cmdname = getcmdname(cmd);
-        cmdtype = getcmdtype(cmd);
-        if(cmd == 0xFF00 || (w != 0 && cmd == 0)) {
-            fprintf(stdout, "\tDC\t%d\t\t\t\t; #%04X: #%04X :: ", w, i, w);
-            print_dumpword(w, true);
-        } else if(cmdtype == R_ADR_X || cmdtype == ADR_X) {
-            adr = sys->memory[i+1];
-            disassemble_cmd_adr_x(cmdtype, cmdname, w, adr, i++);
-        } else {
-            disassemble_cmd_r(cmdtype, cmdname, w, i);
-        }
-        fprintf(stdout, "\n");
-    }
-}