X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fexec.c;h=b22fbf40bf57b7bfb221fef0aa1d8cf843dc76f8;hp=3ef778dff4628a2e4840ae151f9c656ca523118e;hb=15a07be760d84746bbace2d70326cd939f4568fd;hpb=ae04e48ee62a95f6f77794d5611db189a19e70de

diff --git a/src/exec.c b/src/exec.c
index 3ef778d..b22fbf4 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,9 +1,4 @@
-#include <stdio.h>
-#include <assert.h>
-#include <time.h>
-
 #include "exec.h"
-#include "cerr.h"
 
 /**
  * @brief プログラムレジスタ（PR）を表すWORD値を文字列に変換
@@ -99,9 +94,9 @@ static CERR cerr_load[] = {
 };
 
 /**
- * @brief 実行モード: trace, logical, dump
+ * @brief 実行モード: trace, logical, dump, step
  */
-EXECMODE execmode = {false, false, false};
+EXECMODE execmode = {false, false, false, false};
 
 char *pr2str(WORD pr)
 {
@@ -114,14 +109,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 +124,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()
@@ -345,40 +340,34 @@ void suba_r1_r2()
     sys->cpu->pr += 1;
 }
 
-void addl_subl_flagset(long val)
+void addl_gr(WORD r, WORD val, bool add)
 {
-    sys->cpu->fr = 0x0;
-
-    if(val > 65535) {
-        sys->cpu->fr += OF;
-    }
-    if(((WORD)(val) & 0x8000) == 0x8000) {
-        sys->cpu->fr += SF;
-    } else if(val == 0x0) {
-        sys->cpu->fr += ZF;
-    }
-}
+    unsigned long o, s;
 
-void addl(WORD r, WORD val)
-{
-    long s;
+    o = sys->cpu->gr[r];
+    sys->cpu->fr = 0x0;    /* flag initialize */
 
-    s = sys->cpu->gr[r] + val;
+    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;
+        }
+    }
     sys->cpu->gr[r] = (WORD)s;
-    addl_subl_flagset(s);
-}
-
-void subl(WORD r, WORD val)
-{
-    long s;
 
-    if((s = sys->cpu->gr[r] + (~val + 1)) > 0x10000) {
-        s -= 0x10000;
+    if((s & 0x8000) == 0x8000) {
+        sys->cpu->fr += SF;
     }
-    sys->cpu->gr[r] = (WORD)s;
-    addl_subl_flagset(s);
-    if(r < val) {
-        sys->cpu->fr += OF;
+    else if(s == 0x0) {
+        sys->cpu->fr += ZF;
     }
 }
 
@@ -387,7 +376,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;
 }
 
@@ -395,7 +384,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;
 }
 
@@ -404,7 +393,7 @@ void subl_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    subl(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]), false);
     sys->cpu->pr += 2;
 }
 
@@ -412,7 +401,7 @@ void subl_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    subl(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])], false);
     sys->cpu->pr += 1;
 }
 
@@ -774,6 +763,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;
@@ -794,10 +791,14 @@ void exec()
             }
             if(execmode.dump) {                    /* dumpオプション指定時、メモリを出力 */
                 fprintf(stdout, "#%04X: Memory::::\n", sys->cpu->pr);
-                dumpmemory();
+                dumpmemory(0x0, 0xFFFF);
             }
             fprintf(stdout, "\n");
         }
+        /* デバッガーモードの場合、デバッガーを起動 */
+        if(execmode.step == true || getbps(sys->cpu->pr) == true) {
+            monitor();
+        }
         /* プログラムレジスタをチェック */
         if(sys->cpu->pr >= sys->memsize) {
             setcerr(201, s = pr2str(sys->cpu->pr));        /* Program Register (PR) - memory overflow */
@@ -833,6 +834,7 @@ void exec()
         } while(clock_end - clock_begin < CLOCKS_PER_SEC / sys->clocks);
     }
 execfin:
+    freebps();
     free_code_cmdtype();                           /* 命令のコードとタイプがキーのハッシュ表を解放 */
     if(cerr->num > 0) {
         fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);