逆アセンブル出力と、マシンコードモニター機能の修正

[YACASL2.git] / src / exec.c

diff --git a/src/exec.c b/src/exec.c
index 2bca011..b22fbf4 100644 (file)
--- 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 実行エラーの定義
  */
@@ -850,101 +840,3 @@ execfin:
         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");
-    }
-}