X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fexec.c;h=aea3be747b2bc74a7da9eb9ddfcb798c325e225f;hp=c667598c2674bec7cc3c7fc664faff48a6fee1b6;hb=7ec8afe886e95655022c8d435ea6085bd819b5fd;hpb=1708c99d4b6263863304d48ebca3b3473d6a0112

diff --git a/src/exec.c b/src/exec.c
index c667598..aea3be7 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -237,7 +237,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 +345,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 +381,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 +389,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 +398,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 +406,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;
 }
 
@@ -758,7 +774,7 @@ void exec()
     void (*cmdptr)();
     char *s;
 
-    create_code_type();                             /* 命令のコードとタイプがキーのハッシュ表を作成 */
+    create_code_cmdtype();                          /* 命令のコードとタイプがキーのハッシュ表を作成 */
     if(execmode.trace == true) {
         fprintf(stdout, "\nExecuting machine codes\n");
     }
@@ -811,7 +827,7 @@ void exec()
         } while(clock_end - clock_begin < CLOCKS_PER_SEC / sys->clocks);
     }
 execfin:
-    free_code_type();                              /* 命令のコードとタイプがキーのハッシュ表を解放 */
+    free_code_cmdtype();                           /* 命令のコードとタイプがキーのハッシュ表を解放 */
     if(cerr->num > 0) {
         fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);
     }