X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fexec.c;h=2a716101789650c36b6e8cc59db30c97291983e9;hp=a6c7edcd830e280ef8a64938d7978e6c00363245;hb=aac61489b663d7156faba49d9c3e99702dcf9b8c;hpb=03e322484530da78d796401413d9f5f493d95345

diff --git a/src/exec.c b/src/exec.c
index a6c7edc..2a71610 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -4,6 +4,7 @@
 
 #include "exec.h"
 #include "cerr.h"
+#include "debugger.h"
 
 /**
  * @brief プログラムレジスタ（PR）を表すWORD値を文字列に変換
@@ -75,6 +76,16 @@ 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 実行エラーの定義
  */
@@ -99,9 +110,9 @@ static CERR cerr_load[] = {
 };
 
 /**
- * @brief 実行モード: trace, logical, dump
+ * @brief 実行モード: trace, logical, dump, debugger
  */
-EXECMODE execmode = {false, false, false};
+EXECMODE execmode = {false, false, false, false};
 
 char *pr2str(WORD pr)
 {
@@ -114,14 +125,14 @@ char *pr2str(WORD pr)
 void svcin()
 {
     int i;
-    char *buffer = malloc_chk(INSIZE + 1, "svcin.buffer");
+    char *buf = malloc_chk(INSIZE + 1, "svcin.buf");
 
-    if(fgets(buffer, INSIZE, stdin) == NULL) {
+    if(fgets(buf, INSIZE, stdin) == NULL) {
         sys->memory[sys->cpu->gr[1]] = sys->memory[sys->cpu->gr[2]] = 0x0;
         return;
     }
     for(i = 0; i < INSIZE; i++) {
-        if(*(buffer + i) == '\0' || *(buffer + i) == '\n') {
+        if(*(buf + i) == '\0' || *(buf + i) == '\n') {
             --i;
             break;
         }
@@ -129,10 +140,10 @@ void svcin()
             setcerr(208, "");    /* SVC input - memory overflow */
             break;
         }
-        sys->memory[sys->cpu->gr[1]+i] = *(buffer + i);
+        sys->memory[sys->cpu->gr[1]+i] = *(buf + i);
     }
     sys->memory[sys->cpu->gr[2]] = i + 1;
-    FREE(buffer);
+    FREE(buf);
 }
 
 void svcout()
@@ -237,7 +248,7 @@ bool loadassemble(const char *file)
     bool stat = true;
 
     assert(file != NULL);
-    if((fp = fopen(file, "r")) == NULL) {
+    if((fp = fopen(file, "rb")) == NULL) {
         perror(file);
         return false;
     }
@@ -345,17 +356,33 @@ void suba_r1_r2()
     sys->cpu->pr += 1;
 }
 
-void addl(WORD r, WORD val)
+void addl_gr(WORD r, WORD val, bool add)
 {
-    long tmp;
-    sys->cpu->fr = 0x0;
+    unsigned long o, s;
 
-    if((tmp = sys->cpu->gr[r] + val) < 0 || tmp > 65535) {
-        sys->cpu->fr += OF;
+    o = sys->cpu->gr[r];
+    sys->cpu->fr = 0x0;    /* flag initialize */
+
+    if(add == true) {
+        s = o + val;
+        if(s > 0xFFFF) {
+            sys->cpu->fr += OF;
+        }
+    } else {
+        if(o < val) {
+            sys->cpu->fr += OF;
+        }
+        s = o + (~val + 1);
+        if(s > 0xFFFF) {
+            s &= 0xFFFF;
+        }
     }
-    if(((sys->cpu->gr[r] = (WORD)(tmp & 0xFFFF)) & 0x8000) == 0x8000) {
+    sys->cpu->gr[r] = (WORD)s;
+
+    if((s & 0x8000) == 0x8000) {
         sys->cpu->fr += SF;
-    } else if(sys->cpu->gr[r] == 0x0) {
+    }
+    else if(s == 0x0) {
         sys->cpu->fr += ZF;
     }
 }
@@ -365,7 +392,7 @@ void addl_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    addl(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
+    addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), true);
     sys->cpu->pr += 2;
 }
 
@@ -373,7 +400,7 @@ void addl_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    addl(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
+    addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], true);
     sys->cpu->pr += 1;
 }
 
@@ -382,7 +409,7 @@ void subl_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    addl(get_r_r1(w[0]), ~(get_val_adr_x(w[1], w[0])) + 1);
+    addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), false);
     sys->cpu->pr += 2;
 }
 
@@ -390,7 +417,7 @@ void subl_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    addl(get_r_r1(w[0]), ~(sys->cpu->gr[get_x_r2(w[0])]) + 1);
+    addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], false);
     sys->cpu->pr += 1;
 }
 
@@ -752,6 +779,14 @@ 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;
@@ -776,6 +811,10 @@ void exec()
             }
             fprintf(stdout, "\n");
         }
+        /* デバッガーモードの場合、デバッガーを起動 */
+        if(execmode.debugger == true || getbps(sys->cpu->pr) == true) {
+            debugger();
+        }
         /* プログラムレジスタをチェック */
         if(sys->cpu->pr >= sys->memsize) {
             setcerr(201, s = pr2str(sys->cpu->pr));        /* Program Register (PR) - memory overflow */
@@ -816,3 +855,69 @@ execfin:
         fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);
     }
 }
+
+bool disassemble_file(const char *file)
+{
+    bool stat = true;
+    FILE *fp;
+    WORD i = 0, w, cmd, x, adr;
+    CMDTYPE cmdtype = 0;
+    char *cmdname, *g, *g1, *g2;
+
+    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);
+        if(feof(fp)) {
+            break;
+        }
+        cmd = w & 0xFF00;
+        cmdname = getcmdname(cmd);
+        cmdtype = getcmdtype(cmd);
+        if(cmd == 0xFF00 || (w != 0 && cmd == 0x0000)) {
+            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);
+            fprintf(stdout, "\t%s\t", cmdname);
+            if(cmdtype == R_ADR_X) {
+                g = grstr((w & 0x00F0) >> 4);
+                fprintf(stdout, "%s,", g);
+                FREE(g);
+            }
+            fprintf(stdout, "#%04X", adr);
+            if((x = w & 0x000F) != 0) {
+                fprintf(stdout, ",%s", g = grstr(x));
+                FREE(g);
+            }
+            fprintf(stdout, "\t\t\t\t; #%04X: #%04X #%04X", i, w, adr);
+            i += 2;
+        } else {
+            fprintf(stdout, "\t%s", cmdname);
+            if(cmdtype == R1_R2) {
+                g1 = grstr((w & 0x00F0) >> 4);
+                g2 = grstr(w & 0x000F);
+                fprintf(stdout, "\t%s,%s", g1, g2);
+                FREE(g1);
+                FREE(g2);
+            } else if(cmdtype == R_) {
+                g = grstr((w & 0x00F0) >> 4);
+                fprintf(stdout, "\t%s", g);
+                FREE(g);
+            }
+            fprintf(stdout, "\t\t\t\t; #%04X: #%04X", i++, w);
+        }
+        fprintf(stdout, "\n");
+    }
+    fprintf(stdout, "\tEND\n");
+    free_code_cmdtype();
+    fclose(fp);
+    return stat;
+}