関数名を変更

[YACASL2.git] / src / exec.c

diff --git a/src/exec.c b/src/exec.c
index 074b043..aea3be7 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -345,41 +345,34 @@ void suba_r1_r2()
     sys->cpu->pr += 1;
 }
 
-void addl_subl_flagset(long val)
-{
-    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;
-    }
-}
-
-void addl(WORD r, WORD val)
-{
-    long s;
-
-    s = sys->cpu->gr[r] + val;
-    sys->cpu->gr[r] = (WORD)s;
-    addl_subl_flagset(s);
-}
-
-void subl(WORD r, WORD val)
+void addl_gr(WORD r, WORD val, bool add)
 {
     unsigned long o, s;
 
     o = sys->cpu->gr[r];
-    if((s = o + (~val + 1)) > 0x10000) {
-        s -= 0x10000;
+    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;
+        }
     }
     sys->cpu->gr[r] = (WORD)s;
-    addl_subl_flagset(s);
-    if(o < val) {
-        sys->cpu->fr += OF;
+
+    if((s & 0x8000) == 0x8000) {
+        sys->cpu->fr += SF;
+    }
+    else if(s == 0x0) {
+        sys->cpu->fr += ZF;
     }
 }
 
@@ -388,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;
 }
 
@@ -396,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;
 }
 
@@ -405,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];
-    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;
 }
 
@@ -413,7 +406,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;
 }