テストとexec.cの整理

diff --git a/as/cmd/SUBL/subl_r_adr__ao.casl b/as/cmd/SUBL/subl_r_adr__ao.casl
index 2a390a9e6794bcdd13221e70b43048ef5de9beca..6b9fee46a500050fe3fb17d7c12271e994e35c54 100644 (file)
--- a/as/cmd/SUBL/subl_r_adr__ao.casl
+++ b/as/cmd/SUBL/subl_r_adr__ao.casl
@@ -4,5 +4,5 @@ MAIN    START
         SUBL    GR1,B
         RET
 A       DC      #7FFE           ; 32766
-B       DC      #FFF6           ; -10
+B       DC      #FFF6           ; 65526
         END

diff --git a/as/cmd/SUBL/subl_r_adr__as1.casl b/as/cmd/SUBL/subl_r_adr__as1.casl
index 79c762c6100f6cd5c8dca7c87799957dc6279bc0..937379889f271bb15971dcbf6de731e8eac16731 100644 (file)
--- a/as/cmd/SUBL/subl_r_adr__as1.casl
+++ b/as/cmd/SUBL/subl_r_adr__as1.casl
@@ -3,6 +3,6 @@ MAIN    START
         LD      GR1,A
         SUBL    GR1,B
         RET
-A       DC      #FFEC           ; -20
-B       DC      #FFF6           ; -10
+A       DC      #FFEC           ; 65516
+B       DC      #FFF6           ; 65526
         END

diff --git a/as/cmd/SUBL/subl_r_adr__z.casl b/as/cmd/SUBL/subl_r_adr__z.casl
index 1296e30d9e07ded65ffd94e3abd5d7efe950b40f..a53bbe5cbadc1dafdf08d0cf5714f9a5a3c94811 100644 (file)
--- a/as/cmd/SUBL/subl_r_adr__z.casl
+++ b/as/cmd/SUBL/subl_r_adr__z.casl
@@ -3,6 +3,6 @@ MAIN    START
         LD      GR1,A
         SUBL    GR1,B
         RET
-A       DC      #FFF6           ; -10
-B       DC      #FFF6           ; -10
+A       DC      #FFF6           ; 65526
+B       DC      #FFF6           ; 65526
         END

diff --git a/as/fe_tests/2011_10/Q12/call_div.casl b/as/fe_tests/2011_10/Q12/call_div.casl
index 592fcf4c9a4336981abf59b68c8345b035933ce4..5f8d8257864136ce8d63ea6c8ae6a5f35aa90c3b 100644 (file)
--- a/as/fe_tests/2011_10/Q12/call_div.casl
+++ b/as/fe_tests/2011_10/Q12/call_div.casl
@@ -1,6 +1,6 @@
 MAIN    START
         LAD     GR1,0
-        LAD     GR2,15
+        LAD     GR2,17
         LAD     GR3,OP
         CALL    DIV
         RET

diff --git a/src/exec.c b/src/exec.c
index 074b0435d2e4b6a4627afcd123774752025e133e..aea3be747b2bc74a7da9eb9ddfcb798c325e225f 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;
 }
 

diff --git a/test/system/casl2_cmd/cmd_addl_r1_r2/cmd b/test/system/casl2_cmd/cmd_addl_r1_r2/cmd
index dff10dbe9d6861d9bd021b38bb463c4f851b2cdc..320bd6bbc20805706ed698145102712481834eaa 100755 (executable)
--- a/test/system/casl2_cmd/cmd_addl_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r1_r2/cmd
@@ -1,2 +1,2 @@
 cat ../../../../as/cmd/ADDL/addl_r1_r2.casl
-../../../../casl2 -atd -M16 ../../../../as/cmd/ADDL/addl_r1_r2.casl
+../../../../casl2 -aTd -M16 ../../../../as/cmd/ADDL/addl_r1_r2.casl

diff --git a/test/system/casl2_cmd/cmd_addl_r_adr/cmd b/test/system/casl2_cmd/cmd_addl_r_adr/cmd
index c05fda31f146cdd03402f2df23aeff1531cc20ce..09953f172b0b755633310691af98e80240b1b61b 100755 (executable)
--- a/test/system/casl2_cmd/cmd_addl_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r_adr/cmd
@@ -1,2 +1,2 @@
 cat ../../../../as/cmd/ADDL/addl_r_adr.casl
-../../../../casl2 -atd -M8 ../../../../as/cmd/ADDL/addl_r_adr.casl
+../../../../casl2 -aTd -M8 ../../../../as/cmd/ADDL/addl_r_adr.casl

diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt
index a8d0c7277d551279c008b16e91c793f63408f650..874a22a96b24376a462533b106ca8ef2ed326134 100644 (file)
--- a/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt
@@ -59,7 +59,7 @@ Executing machine codes
 #0002: 0000: 1010 0005 2210 0006 8100 000A FFEC 0000 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1:    -10 = #FFF6 = 1111111111110110
+#0004: GR1:  65526 = #FFF6 = 1111111111110110
 #0004: GR2:      0 = #0000 = 0000000000000000
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000

diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__as0/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__as0/cmd
index 38ff48eaf45a984929bdd8063adc13f0aef23702..c1b39befbd7f51f9708df9f87e279e0768dfd98b 100755 (executable)
--- a/test/system/casl2_cmd/cmd_addl_r_adr__as0/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__as0/cmd
@@ -1,2 +1,2 @@
 cat ../../../../as/cmd/ADDL/addl_r_adr__as0.casl
-../../../../casl2 -atd -M8 ../../../../as/cmd/ADDL/addl_r_adr__as0.casl
+../../../../casl2 -aTd -M8 ../../../../as/cmd/ADDL/addl_r_adr__as0.casl

diff --git a/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/0.txt
deleted file mode 100644 (file)
index 0e7c8d7..0000000
--- a/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/0.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-;;; ADDL r,adr,x
-MAIN    START
-BEGIN   LD      GR1,A
-        LAD     GR2,1
-        ADDL    GR1,A,GR2
-        RET
-A       DC      3
-        DC      1
-        END
-
-Assemble ../../../../as/cmd/ADDL/addl1.casl (0)
-
-Assemble ../../../../as/cmd/ADDL/addl1.casl (1)
-../../../../as/cmd/ADDL/addl1.casl:    1:;;; ADDL r,adr,x
-../../../../as/cmd/ADDL/addl1.casl:    2:MAIN    START
-../../../../as/cmd/ADDL/addl1.casl:    3:BEGIN   LD      GR1,A
-       #0000   #1010
-       #0001   #0007
-../../../../as/cmd/ADDL/addl1.casl:    4:        LAD     GR2,1
-       #0002   #1220
-       #0003   #0001
-../../../../as/cmd/ADDL/addl1.casl:    5:        ADDL    GR1,A,GR2
-       #0004   #2212
-       #0005   #0007
-../../../../as/cmd/ADDL/addl1.casl:    6:        RET
-       #0006   #8100
-../../../../as/cmd/ADDL/addl1.casl:    7:A       DC      3
-       #0007   #0003
-../../../../as/cmd/ADDL/addl1.casl:    8:        DC      1
-       #0008   #0001
-../../../../as/cmd/ADDL/addl1.casl:    9:        END
-
-Executing machine codes
-#0000: Register::::
-#0000: GR0:      0 = #0000 = 0000000000000000
-#0000: GR1:      0 = #0000 = 0000000000000000
-#0000: GR2:      0 = #0000 = 0000000000000000
-#0000: GR3:      0 = #0000 = 0000000000000000
-#0000: GR4:      0 = #0000 = 0000000000000000
-#0000: GR5:      0 = #0000 = 0000000000000000
-#0000: GR6:      0 = #0000 = 0000000000000000
-#0000: GR7:      0 = #0000 = 0000000000000000
-#0000: SP:      16 = #0010 = 0000000000010000
-#0000: PR:       0 = #0000 = 0000000000000000
-#0000: FR (OF SF ZF): 000
-#0000: Memory::::
-#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-#0000: 0000: 1010 0007 1220 0001 2212 0007 8100 0003 0001 0000 0000 0000 0000 0000 0000 0000
-
-#0002: Register::::
-#0002: GR0:      0 = #0000 = 0000000000000000
-#0002: GR1:      3 = #0003 = 0000000000000011
-#0002: GR2:      0 = #0000 = 0000000000000000
-#0002: GR3:      0 = #0000 = 0000000000000000
-#0002: GR4:      0 = #0000 = 0000000000000000
-#0002: GR5:      0 = #0000 = 0000000000000000
-#0002: GR6:      0 = #0000 = 0000000000000000
-#0002: GR7:      0 = #0000 = 0000000000000000
-#0002: SP:      16 = #0010 = 0000000000010000
-#0002: PR:       2 = #0002 = 0000000000000010
-#0002: FR (OF SF ZF): 000
-#0002: Memory::::
-#0002: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-#0002: 0000: 1010 0007 1220 0001 2212 0007 8100 0003 0001 0000 0000 0000 0000 0000 0000 0000
-
-#0004: Register::::
-#0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1:      3 = #0003 = 0000000000000011
-#0004: GR2:      1 = #0001 = 0000000000000001
-#0004: GR3:      0 = #0000 = 0000000000000000
-#0004: GR4:      0 = #0000 = 0000000000000000
-#0004: GR5:      0 = #0000 = 0000000000000000
-#0004: GR6:      0 = #0000 = 0000000000000000
-#0004: GR7:      0 = #0000 = 0000000000000000
-#0004: SP:      16 = #0010 = 0000000000010000
-#0004: PR:       4 = #0004 = 0000000000000100
-#0004: FR (OF SF ZF): 000
-#0004: Memory::::
-#0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-#0004: 0000: 1010 0007 1220 0001 2212 0007 8100 0003 0001 0000 0000 0000 0000 0000 0000 0000
-
-#0006: Register::::
-#0006: GR0:      0 = #0000 = 0000000000000000
-#0006: GR1:      4 = #0004 = 0000000000000100
-#0006: GR2:      1 = #0001 = 0000000000000001
-#0006: GR3:      0 = #0000 = 0000000000000000
-#0006: GR4:      0 = #0000 = 0000000000000000
-#0006: GR5:      0 = #0000 = 0000000000000000
-#0006: GR6:      0 = #0000 = 0000000000000000
-#0006: GR7:      0 = #0000 = 0000000000000000
-#0006: SP:      16 = #0010 = 0000000000010000
-#0006: PR:       6 = #0006 = 0000000000000110
-#0006: FR (OF SF ZF): 000
-#0006: Memory::::
-#0006: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-#0006: 0000: 1010 0007 1220 0001 2212 0007 8100 0003 0001 0000 0000 0000 0000 0000 0000 0000
-

diff --git a/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/Makefile
deleted file mode 100644 (file)
index b6dac59..0000000
--- a/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../Define.mk
-include ../Test.mk

diff --git a/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/cmd b/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/cmd
deleted file mode 100755 (executable)
index f162c38..0000000
--- a/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-cat ../../../../as/cmd/ADDL/addl1.casl
-../../../../casl2 -atd -M16 ../../../../as/cmd/ADDL/addl1.casl

diff --git a/test/system/casl2_cmd/cmd_subl_r1_r2/cmd b/test/system/casl2_cmd/cmd_subl_r1_r2/cmd
index 7dccf049c907f6118d867b5dcb44c169a7e772ae..30fdc5eca7bf133ff6269dd62f1828d6dff467d5 100755 (executable)
--- a/test/system/casl2_cmd/cmd_subl_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r1_r2/cmd
@@ -1,2 +1,2 @@
 cat ../../../../as/cmd/SUBL/subl_r1_r2.casl
-../../../../casl2 -atd -M16 ../../../../as/cmd/SUBL/subl_r1_r2.casl
+../../../../casl2 -aTd -M16 ../../../../as/cmd/SUBL/subl_r1_r2.casl

diff --git a/test/system/casl2_cmd/cmd_subl_r_adr/cmd b/test/system/casl2_cmd/cmd_subl_r_adr/cmd
index 1b51bd6818aaf97ba7e48340d3084e9eb493d10a..ac4e5bf06a249785d1b15b16d5987962b4e7b3d4 100755 (executable)
--- a/test/system/casl2_cmd/cmd_subl_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r_adr/cmd
@@ -1,2 +1,2 @@
 cat ../../../../as/cmd/SUBL/subl_r_adr.casl
-../../../../casl2 -atd -M8 ../../../../as/cmd/SUBL/subl_r_adr.casl
+../../../../casl2 -aTd -M8 ../../../../as/cmd/SUBL/subl_r_adr.casl

diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__ao/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__ao/0.txt
index 96dbb9ff57454edc7102f550167d157885310e70..ffc2de1d6e745abb71dea325031aeb6851ba71bd 100644 (file)
--- a/test/system/casl2_cmd/cmd_subl_r_adr__ao/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__ao/0.txt
@@ -4,7 +4,7 @@ MAIN    START
         SUBL    GR1,B
         RET
 A       DC      #7FFE           ; 32766
-B       DC      #FFF6           ; -10
+B       DC      #FFF6           ; 65526
         END
 
 Assemble ../../../../as/cmd/SUBL/subl_r_adr__ao.casl (0)
@@ -22,7 +22,7 @@ Assemble ../../../../as/cmd/SUBL/subl_r_adr__ao.casl (1)
        #0004   #8100
 ../../../../as/cmd/SUBL/subl_r_adr__ao.casl:    6:A       DC      #7FFE           ; 32766
        #0005   #7FFE
-../../../../as/cmd/SUBL/subl_r_adr__ao.casl:    7:B       DC      #FFF6           ; -10
+../../../../as/cmd/SUBL/subl_r_adr__ao.casl:    7:B       DC      #FFF6           ; 65526
        #0006   #FFF6
 ../../../../as/cmd/SUBL/subl_r_adr__ao.casl:    8:        END
 

diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__as0/0.txt
index 8fcd52e4100135924415639d4dba573e379f658b..eb0b5435980c11a1f130f5f1849f998b3698dc36 100644 (file)
--- a/test/system/casl2_cmd/cmd_subl_r_adr__as0/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__as0/0.txt
@@ -59,7 +59,7 @@ Executing machine codes
 #0002: 0000: 1010 0005 2310 0006 8100 000A 0014 0000 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1:    -10 = #FFF6 = 1111111111110110
+#0004: GR1:  65526 = #FFF6 = 1111111111110110
 #0004: GR2:      0 = #0000 = 0000000000000000
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000

diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__as0/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__as0/cmd
index 9f63e099de5e6e75288e4da7cdc13c7ac6837104..83b8a64564daa1f1ddf030f7e8aaa9d188bd123d 100755 (executable)
--- a/test/system/casl2_cmd/cmd_subl_r_adr__as0/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__as0/cmd
@@ -1,2 +1,2 @@
 cat ../../../../as/cmd/SUBL/subl_r_adr__as0.casl
-../../../../casl2 -atd -M8 ../../../../as/cmd/SUBL/subl_r_adr__as0.casl
+../../../../casl2 -aTd -M8 ../../../../as/cmd/SUBL/subl_r_adr__as0.casl

diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__as1/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__as1/0.txt
index 5a311a6b0cc5f352025ed4d662876b1f75c4efdb..76de7b91f8547423797428534e8c3b25486e8bbd 100644 (file)
--- a/test/system/casl2_cmd/cmd_subl_r_adr__as1/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__as1/0.txt
@@ -3,8 +3,8 @@ MAIN    START
         LD      GR1,A
         SUBL    GR1,B
         RET
-A       DC      #FFEC           ; -20
-B       DC      #FFF6           ; -10
+A       DC      #FFEC           ; 65516
+B       DC      #FFF6           ; 65526
         END
 
 Assemble ../../../../as/cmd/SUBL/subl_r_adr__as1.casl (0)
@@ -20,9 +20,9 @@ Assemble ../../../../as/cmd/SUBL/subl_r_adr__as1.casl (1)
        #0003   #0006
 ../../../../as/cmd/SUBL/subl_r_adr__as1.casl:    5:        RET
        #0004   #8100
-../../../../as/cmd/SUBL/subl_r_adr__as1.casl:    6:A       DC      #FFEC           ; -20
+../../../../as/cmd/SUBL/subl_r_adr__as1.casl:    6:A       DC      #FFEC           ; 65516
        #0005   #FFEC
-../../../../as/cmd/SUBL/subl_r_adr__as1.casl:    7:B       DC      #FFF6           ; -10
+../../../../as/cmd/SUBL/subl_r_adr__as1.casl:    7:B       DC      #FFF6           ; 65526
        #0006   #FFF6
 ../../../../as/cmd/SUBL/subl_r_adr__as1.casl:    8:        END
 

diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__z/0.txt
index 63e73728442ac9f03eb5ec97fb2b4a1ecab79982..238b33e2c161f1f99d8dc019278622ce4d43c8c9 100644 (file)
--- a/test/system/casl2_cmd/cmd_subl_r_adr__z/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__z/0.txt
@@ -3,8 +3,8 @@ MAIN    START
         LD      GR1,A
         SUBL    GR1,B
         RET
-A       DC      #FFF6           ; -10
-B       DC      #FFF6           ; -10
+A       DC      #FFF6           ; 65526
+B       DC      #FFF6           ; 65526
         END
 
 Assemble ../../../../as/cmd/SUBL/subl_r_adr__z.casl (0)
@@ -20,9 +20,9 @@ Assemble ../../../../as/cmd/SUBL/subl_r_adr__z.casl (1)
        #0003   #0006
 ../../../../as/cmd/SUBL/subl_r_adr__z.casl:    5:        RET
        #0004   #8100
-../../../../as/cmd/SUBL/subl_r_adr__z.casl:    6:A       DC      #FFF6           ; -10
+../../../../as/cmd/SUBL/subl_r_adr__z.casl:    6:A       DC      #FFF6           ; 65526
        #0005   #FFF6
-../../../../as/cmd/SUBL/subl_r_adr__z.casl:    7:B       DC      #FFF6           ; -10
+../../../../as/cmd/SUBL/subl_r_adr__z.casl:    7:B       DC      #FFF6           ; 65526
        #0006   #FFF6
 ../../../../as/cmd/SUBL/subl_r_adr__z.casl:    8:        END
 

diff --git a/test/system/casl2_cmd/cmd_subl_r_adr_x/cmd b/test/system/casl2_cmd/cmd_subl_r_adr_x/cmd
index a391f8ed083231681dc6da4e3fbc32ddfa8f1d98..617c47f4f6f88e62506d60ce853166bffc2720a0 100755 (executable)
--- a/test/system/casl2_cmd/cmd_subl_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r_adr_x/cmd
@@ -1,2 +1,2 @@
 cat ../../../../as/cmd/SUBL/subl_r_adr_x.casl
-../../../../casl2 -atd -M16 ../../../../as/cmd/SUBL/subl_r_adr_x.casl
+../../../../casl2 -aTd -M16 ../../../../as/cmd/SUBL/subl_r_adr_x.casl

diff --git a/test/system/comet2_cmd/cmd_addl_r1_r2/cmd b/test/system/comet2_cmd/cmd_addl_r1_r2/cmd
index fcb6a439160693f3177d70365a087acdd93c64f0..0b3f66fafe8be705a60eb9f6dd829b68879cf4be 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r1_r2/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r1_r2.casl
-../../../../comet2 -td -M16 a.o
+../../../../comet2 -Td -M16 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr/cmd b/test/system/comet2_cmd/cmd_addl_r_adr/cmd
index 03d70fee1725739c4e0a65b40894e5446cac3a7a..3f61679f8a1d8ba165e271fad34f92fd4649c1b1 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__ao/0.txt b/test/system/comet2_cmd/cmd_addl_r_adr__ao/0.txt
index a423063312cc3b6f6ba5f21c9a251a4242b2eb41..36d2beccda9d90cde1032ec3691c4286d1903e88 100644 (file)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__ao/0.txt
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__ao/0.txt
@@ -32,7 +32,7 @@ Executing machine codes
 #0002: 0000: 1010 0005 2210 0006 8100 7FFE 000A 0000 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1: -32760 = #8008 = 1000000000001000
+#0004: GR1:  32776 = #8008 = 1000000000001000
 #0004: GR2:      0 = #0000 = 0000000000000000
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__ao/cmd b/test/system/comet2_cmd/cmd_addl_r_adr__ao/cmd
index 5ae3bf13334d01808003f53aba447ad9bf3b86fa..4adcd9b0e3b4edd7055443001dc7e2eb095dec6e 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__ao/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__ao/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__ao.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__as0/0.txt b/test/system/comet2_cmd/cmd_addl_r_adr__as0/0.txt
index 17c6a874399de628c3ff2da3215be7544aca8da2..7d092e468658731a2852643ed098fe340ad3d904 100644 (file)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__as0/0.txt
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__as0/0.txt
@@ -32,7 +32,7 @@ Executing machine codes
 #0002: 0000: 1010 0005 2210 0006 8100 000A FFEC 0000 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1:    -10 = #FFF6 = 1111111111110110
+#0004: GR1:  65526 = #FFF6 = 1111111111110110
 #0004: GR2:      0 = #0000 = 0000000000000000
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__as0/cmd b/test/system/comet2_cmd/cmd_addl_r_adr__as0/cmd
index 73c8c00d3a1b473bfb85e8883c6f780f36fcc499..af15cbb86b583b8063039e9e6a96a60b7bf8dac0 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__as0/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__as0/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__as0.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__as1/0.txt b/test/system/comet2_cmd/cmd_addl_r_adr__as1/0.txt
index cf2a1c70b488bc3eb0a8c5e824b0573acd9b0f1c..8fcf9c3a66331cb36172f994bf7b1a542cd443ba 100644 (file)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__as1/0.txt
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__as1/0.txt
@@ -17,7 +17,7 @@ Executing machine codes
 #0000: 0000: 1010 0005 2210 0006 8100 FFEC 000A 0000 
 #0002: Register::::
 #0002: GR0:      0 = #0000 = 0000000000000000
-#0002: GR1:    -20 = #FFEC = 1111111111101100
+#0002: GR1:  65516 = #FFEC = 1111111111101100
 #0002: GR2:      0 = #0000 = 0000000000000000
 #0002: GR3:      0 = #0000 = 0000000000000000
 #0002: GR4:      0 = #0000 = 0000000000000000
@@ -32,7 +32,7 @@ Executing machine codes
 #0002: 0000: 1010 0005 2210 0006 8100 FFEC 000A 0000 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1:    -10 = #FFF6 = 1111111111110110
+#0004: GR1:  65526 = #FFF6 = 1111111111110110
 #0004: GR2:      0 = #0000 = 0000000000000000
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__as1/cmd b/test/system/comet2_cmd/cmd_addl_r_adr__as1/cmd
index 38211d3820edeb60bdd1a27ab47c7cc80140da34..cf620e90aa5b4af12f4c26eae35e7042ad6a7880 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__as1/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__as1/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__as1.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__az/0.txt b/test/system/comet2_cmd/cmd_addl_r_adr__az/0.txt
index 212a2894c17497805fa326889bebe2442286bba8..471e1c3b5da9ccdbd9b10b873ef88921c45ae259 100644 (file)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__az/0.txt
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__az/0.txt
@@ -17,7 +17,7 @@ Executing machine codes
 #0000: 0000: 1010 0005 2210 0006 8100 FFF6 000A 0000 
 #0002: Register::::
 #0002: GR0:      0 = #0000 = 0000000000000000
-#0002: GR1:    -10 = #FFF6 = 1111111111110110
+#0002: GR1:  65526 = #FFF6 = 1111111111110110
 #0002: GR2:      0 = #0000 = 0000000000000000
 #0002: GR3:      0 = #0000 = 0000000000000000
 #0002: GR4:      0 = #0000 = 0000000000000000
@@ -41,7 +41,7 @@ Executing machine codes
 #0004: GR7:      0 = #0000 = 0000000000000000
 #0004: SP:       8 = #0008 = 0000000000001000
 #0004: PR:       4 = #0004 = 0000000000000100
-#0004: FR (OF SF ZF): 101
+#0004: FR (OF SF ZF): 100
 #0004: Memory::::
 #0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007
 #0004: 0000: 1010 0005 2210 0006 8100 FFF6 000A 0000 

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__az/cmd b/test/system/comet2_cmd/cmd_addl_r_adr__az/cmd
index 9f25569e0ea7f0e586ac898b1a13941a940b9c66..4563670926f3c26f9136f7c5850f02aa7ccb5eb8 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__az/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__az/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__az.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__lo/0.txt b/test/system/comet2_cmd/cmd_addl_r_adr__lo/0.txt
index cbce47e7faea18571e33f68d4579db780b7df889..c2e795612c099839ee3b0cc53206591a240d3721 100644 (file)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__lo/0.txt
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__lo/0.txt
@@ -17,7 +17,7 @@ Executing machine codes
 #0000: 0000: 1010 0005 2210 0006 8100 FFFE 000F 0000 
 #0002: Register::::
 #0002: GR0:      0 = #0000 = 0000000000000000
-#0002: GR1:     -2 = #FFFE = 1111111111111110
+#0002: GR1:  65534 = #FFFE = 1111111111111110
 #0002: GR2:      0 = #0000 = 0000000000000000
 #0002: GR3:      0 = #0000 = 0000000000000000
 #0002: GR4:      0 = #0000 = 0000000000000000

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__lo/cmd b/test/system/comet2_cmd/cmd_addl_r_adr__lo/cmd
index 908df1cae954068bf43dd70a38953c451b0c960c..6f901c6a9b06a8adef11e07fcb5ace1a5cdf3b47 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__lo/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__lo/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__lo.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__o/0.txt b/test/system/comet2_cmd/cmd_addl_r_adr__o/0.txt
index 4a7474a0a8c86e2872bcf8e7566ff16bf087cb10..531d8ef76a9374a431331f4726d527fa3e4ccb51 100644 (file)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__o/0.txt
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__o/0.txt
@@ -17,7 +17,7 @@ Executing machine codes
 #0000: 0000: 1010 0005 2210 0006 8100 8002 8001 0000 
 #0002: Register::::
 #0002: GR0:      0 = #0000 = 0000000000000000
-#0002: GR1: -32766 = #8002 = 1000000000000010
+#0002: GR1:  32770 = #8002 = 1000000000000010
 #0002: GR2:      0 = #0000 = 0000000000000000
 #0002: GR3:      0 = #0000 = 0000000000000000
 #0002: GR4:      0 = #0000 = 0000000000000000

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__o/cmd b/test/system/comet2_cmd/cmd_addl_r_adr__o/cmd
index 8bcec82fce7f0b32258a7e5613dd22bbebac05be..8331829e737986da0580ac98ca4daa82e3a6395f 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__o/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__o/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__o.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__z/cmd b/test/system/comet2_cmd/cmd_addl_r_adr__z/cmd
index e278f841e59ec7892e21baf1f3ab0ea1b02dbeb7..7bb43f592f5dd50c59b9e87eb19cc82eea1c3b88 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r_adr__z/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__z/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__z.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_addl_r_adr_x/cmd b/test/system/comet2_cmd/cmd_addl_r_adr_x/cmd
index 4ef659146b34168e9b54c8128f9827ecde9e8baa..a7c12836ec2da795183d464d1c5a9a0ed0bf2e9b 100755 (executable)
--- a/test/system/comet2_cmd/cmd_addl_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr_x/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr_x.casl
-../../../../comet2 -td -M16 a.o
+../../../../comet2 -Td -M16 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_subl_r1_r2/0.txt b/test/system/comet2_cmd/cmd_subl_r1_r2/0.txt
index 6fe20ca764d3585c1425f3a5a1432a2a3ff3e9a7..30293985d73b378aa7eae8742f99b3276df39c6c 100644 (file)
--- a/test/system/comet2_cmd/cmd_subl_r1_r2/0.txt
+++ b/test/system/comet2_cmd/cmd_subl_r1_r2/0.txt
@@ -59,7 +59,7 @@ Executing machine codes
 #0005: GR7:      0 = #0000 = 0000000000000000
 #0005: SP:      16 = #0010 = 0000000000010000
 #0005: PR:       5 = #0005 = 0000000000000101
-#0005: FR (OF SF ZF): 100
+#0005: FR (OF SF ZF): 000
 #0005: Memory::::
 #0005: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
 #0005: 0000: 1010 0006 1020 0007 2712 8100 0003 0001 0000 0000 0000 0000 0000 0000 0000 0000

diff --git a/test/system/comet2_cmd/cmd_subl_r1_r2/cmd b/test/system/comet2_cmd/cmd_subl_r1_r2/cmd
index 6fb784bda690a9ff7670366d701776257488af14..d63ce4f4118f4175b3078607c7415318a3960659 100755 (executable)
--- a/test/system/comet2_cmd/cmd_subl_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r1_r2/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r1_r2.casl
-../../../../comet2 -td -M16 a.o
+../../../../comet2 -Td -M16 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr/0.txt b/test/system/comet2_cmd/cmd_subl_r_adr/0.txt
index 95a5613e8a2ba847788edce5b93e4c6691685d30..999e983ef3f4a59eb084bee7faf37f8f114eef43 100644 (file)
--- a/test/system/comet2_cmd/cmd_subl_r_adr/0.txt
+++ b/test/system/comet2_cmd/cmd_subl_r_adr/0.txt
@@ -41,7 +41,7 @@ Executing machine codes
 #0004: GR7:      0 = #0000 = 0000000000000000
 #0004: SP:       8 = #0008 = 0000000000001000
 #0004: PR:       4 = #0004 = 0000000000000100
-#0004: FR (OF SF ZF): 100
+#0004: FR (OF SF ZF): 000
 #0004: Memory::::
 #0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007
 #0004: 0000: 1010 0005 2310 0006 8100 0003 0001 0000 

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr/cmd b/test/system/comet2_cmd/cmd_subl_r_adr/cmd
index 588518d1f742c04bf546279e25c1a77b9e36ad60..90c0d06bd9b750f01f309a8bd853cd943f649055 100755 (executable)
--- a/test/system/comet2_cmd/cmd_subl_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r_adr/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__ao/0.txt b/test/system/comet2_cmd/cmd_subl_r_adr__ao/0.txt
index fe90c6d6e58b89b6095f8ee7bd431957f1bbc430..660718fa8b8b404654be6a7f885a0ac69a0b33c7 100644 (file)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__ao/0.txt
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__ao/0.txt
@@ -32,7 +32,7 @@ Executing machine codes
 #0002: 0000: 1010 0005 2310 0006 8100 7FFE FFF6 0000 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1: -32760 = #8008 = 1000000000001000
+#0004: GR1:  32776 = #8008 = 1000000000001000
 #0004: GR2:      0 = #0000 = 0000000000000000
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000
@@ -41,7 +41,7 @@ Executing machine codes
 #0004: GR7:      0 = #0000 = 0000000000000000
 #0004: SP:       8 = #0008 = 0000000000001000
 #0004: PR:       4 = #0004 = 0000000000000100
-#0004: FR (OF SF ZF): 010
+#0004: FR (OF SF ZF): 110
 #0004: Memory::::
 #0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007
 #0004: 0000: 1010 0005 2310 0006 8100 7FFE FFF6 0000 

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__ao/cmd b/test/system/comet2_cmd/cmd_subl_r_adr__ao/cmd
index bcff9de9f1fbc5cb80e978d755c9e7cb5c80c50d..4be56e7c300e7db6c925042fc94ec6825d86ccc6 100755 (executable)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__ao/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__ao/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__ao.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__as0/0.txt b/test/system/comet2_cmd/cmd_subl_r_adr__as0/0.txt
index fc14882a4537aa5002144019325590a3b2b28e01..c324fc45bed888341ec59a3f335781e3c05962de 100644 (file)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__as0/0.txt
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__as0/0.txt
@@ -32,7 +32,7 @@ Executing machine codes
 #0002: 0000: 1010 0005 2310 0006 8100 000A 0014 0000 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1:    -10 = #FFF6 = 1111111111110110
+#0004: GR1:  65526 = #FFF6 = 1111111111110110
 #0004: GR2:      0 = #0000 = 0000000000000000
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000
@@ -41,7 +41,7 @@ Executing machine codes
 #0004: GR7:      0 = #0000 = 0000000000000000
 #0004: SP:       8 = #0008 = 0000000000001000
 #0004: PR:       4 = #0004 = 0000000000000100
-#0004: FR (OF SF ZF): 010
+#0004: FR (OF SF ZF): 110
 #0004: Memory::::
 #0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007
 #0004: 0000: 1010 0005 2310 0006 8100 000A 0014 0000 

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__as0/cmd b/test/system/comet2_cmd/cmd_subl_r_adr__as0/cmd
index 7b903f2deffe8c5c1f969e790dc0a3a4b676eed0..cd6a154891c01ef5ca401c0daed7162d939e3e0f 100755 (executable)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__as0/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__as0/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__as0.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__as1/0.txt b/test/system/comet2_cmd/cmd_subl_r_adr__as1/0.txt
index 60d4fd848f9c2d7c5299b7a6ca8144104087b8f2..461d24001755fbff8012e075e7921a8c2c51ace2 100644 (file)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__as1/0.txt
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__as1/0.txt
@@ -17,7 +17,7 @@ Executing machine codes
 #0000: 0000: 1010 0005 2310 0006 8100 FFEC FFF6 0000 
 #0002: Register::::
 #0002: GR0:      0 = #0000 = 0000000000000000
-#0002: GR1:    -20 = #FFEC = 1111111111101100
+#0002: GR1:  65516 = #FFEC = 1111111111101100
 #0002: GR2:      0 = #0000 = 0000000000000000
 #0002: GR3:      0 = #0000 = 0000000000000000
 #0002: GR4:      0 = #0000 = 0000000000000000
@@ -32,7 +32,7 @@ Executing machine codes
 #0002: 0000: 1010 0005 2310 0006 8100 FFEC FFF6 0000 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1:    -10 = #FFF6 = 1111111111110110
+#0004: GR1:  65526 = #FFF6 = 1111111111110110
 #0004: GR2:      0 = #0000 = 0000000000000000
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000
@@ -41,7 +41,7 @@ Executing machine codes
 #0004: GR7:      0 = #0000 = 0000000000000000
 #0004: SP:       8 = #0008 = 0000000000001000
 #0004: PR:       4 = #0004 = 0000000000000100
-#0004: FR (OF SF ZF): 010
+#0004: FR (OF SF ZF): 110
 #0004: Memory::::
 #0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007
 #0004: 0000: 1010 0005 2310 0006 8100 FFEC FFF6 0000 

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__as1/cmd b/test/system/comet2_cmd/cmd_subl_r_adr__as1/cmd
index 0ebcb9e41ba7e69626075fb73150bc7db23c2ee3..a7a92a70ad045840c6007d013eaa51b34e4a8bf7 100755 (executable)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__as1/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__as1/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__as1.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__lo/0.txt b/test/system/comet2_cmd/cmd_subl_r_adr__lo/0.txt
index 1cdb5b1e69d9854e3992f036b14820a682a378ff..a13a891eb6b3548d9c92a411e9b453da636a4ca8 100644 (file)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__lo/0.txt
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__lo/0.txt
@@ -32,7 +32,7 @@ Executing machine codes
 #0002: 0000: 1010 0005 2310 0006 8100 0002 000F 0000 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1:    -13 = #FFF3 = 1111111111110011
+#0004: GR1:  65523 = #FFF3 = 1111111111110011
 #0004: GR2:      0 = #0000 = 0000000000000000
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000
@@ -41,7 +41,7 @@ Executing machine codes
 #0004: GR7:      0 = #0000 = 0000000000000000
 #0004: SP:       8 = #0008 = 0000000000001000
 #0004: PR:       4 = #0004 = 0000000000000100
-#0004: FR (OF SF ZF): 010
+#0004: FR (OF SF ZF): 110
 #0004: Memory::::
 #0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007
 #0004: 0000: 1010 0005 2310 0006 8100 0002 000F 0000 

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__lo/cmd b/test/system/comet2_cmd/cmd_subl_r_adr__lo/cmd
index 6cfcc87e40ad4bab31335a82a32d5524b52a79d5..8388b98f96c876819a704042a17032e099fea54b 100755 (executable)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__lo/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__lo/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__lo.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__o/0.txt b/test/system/comet2_cmd/cmd_subl_r_adr__o/0.txt
index 41623f5ef4519b62f36841101e67ace32bafb70b..5e19e02851961759e6c32b5d01351cc94fa1bf32 100644 (file)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__o/0.txt
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__o/0.txt
@@ -17,7 +17,7 @@ Executing machine codes
 #0000: 0000: 1010 0005 2310 0006 8100 8002 7FFF 0000 
 #0002: Register::::
 #0002: GR0:      0 = #0000 = 0000000000000000
-#0002: GR1: -32766 = #8002 = 1000000000000010
+#0002: GR1:  32770 = #8002 = 1000000000000010
 #0002: GR2:      0 = #0000 = 0000000000000000
 #0002: GR3:      0 = #0000 = 0000000000000000
 #0002: GR4:      0 = #0000 = 0000000000000000
@@ -41,7 +41,7 @@ Executing machine codes
 #0004: GR7:      0 = #0000 = 0000000000000000
 #0004: SP:       8 = #0008 = 0000000000001000
 #0004: PR:       4 = #0004 = 0000000000000100
-#0004: FR (OF SF ZF): 100
+#0004: FR (OF SF ZF): 000
 #0004: Memory::::
 #0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007
 #0004: 0000: 1010 0005 2310 0006 8100 8002 7FFF 0000 

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__o/cmd b/test/system/comet2_cmd/cmd_subl_r_adr__o/cmd
index 8b7774650ff762123a848cee526e2ff16c7acdfa..f3e8ade3e56686b7e112abc840dad244b59eb01a 100755 (executable)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__o/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__o/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__o.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__z/0.txt b/test/system/comet2_cmd/cmd_subl_r_adr__z/0.txt
index f1aab164e1c69ab54ff3f400136db42ebc2efa93..9b05a684ba359717122ea1ad4f32b8c3ac1b21ea 100644 (file)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__z/0.txt
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__z/0.txt
@@ -17,7 +17,7 @@ Executing machine codes
 #0000: 0000: 1010 0005 2310 0006 8100 FFF6 FFF6 0000 
 #0002: Register::::
 #0002: GR0:      0 = #0000 = 0000000000000000
-#0002: GR1:    -10 = #FFF6 = 1111111111110110
+#0002: GR1:  65526 = #FFF6 = 1111111111110110
 #0002: GR2:      0 = #0000 = 0000000000000000
 #0002: GR3:      0 = #0000 = 0000000000000000
 #0002: GR4:      0 = #0000 = 0000000000000000
@@ -41,7 +41,7 @@ Executing machine codes
 #0004: GR7:      0 = #0000 = 0000000000000000
 #0004: SP:       8 = #0008 = 0000000000001000
 #0004: PR:       4 = #0004 = 0000000000000100
-#0004: FR (OF SF ZF): 101
+#0004: FR (OF SF ZF): 001
 #0004: Memory::::
 #0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007
 #0004: 0000: 1010 0005 2310 0006 8100 FFF6 FFF6 0000 

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__z/cmd b/test/system/comet2_cmd/cmd_subl_r_adr__z/cmd
index 08676813f05630c03245a66914a1b5ee31f5ce43..7aaa0af88acce255168f5f3f76ca11fca2c89299 100755 (executable)
--- a/test/system/comet2_cmd/cmd_subl_r_adr__z/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__z/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__z.casl
-../../../../comet2 -td -M8 a.o
+../../../../comet2 -Td -M8 a.o
 rm -f a.o

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr_x/0.txt b/test/system/comet2_cmd/cmd_subl_r_adr_x/0.txt
index ce21dc9ea4dab71b0b10217c0436cd97c8a7a9c1..e125d555aef3d6003ac141a37b9b0ba7f48d4cb2 100644 (file)
--- a/test/system/comet2_cmd/cmd_subl_r_adr_x/0.txt
+++ b/test/system/comet2_cmd/cmd_subl_r_adr_x/0.txt
@@ -14,11 +14,11 @@ Executing machine codes
 #0000: FR (OF SF ZF): 000
 #0000: Memory::::
 #0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-#0000: 0000: 1010 0007 1220 0001 2312 0007 8100 0003 0001 0000 0000 0000 0000 0000 0000 0000
+#0000: 0000: 1010 0007 1220 0001 2312 0007 8100 0005 0002 0000 0000 0000 0000 0000 0000 0000
 
 #0002: Register::::
 #0002: GR0:      0 = #0000 = 0000000000000000
-#0002: GR1:      3 = #0003 = 0000000000000011
+#0002: GR1:      5 = #0005 = 0000000000000101
 #0002: GR2:      0 = #0000 = 0000000000000000
 #0002: GR3:      0 = #0000 = 0000000000000000
 #0002: GR4:      0 = #0000 = 0000000000000000
@@ -30,11 +30,11 @@ Executing machine codes
 #0002: FR (OF SF ZF): 000
 #0002: Memory::::
 #0002: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-#0002: 0000: 1010 0007 1220 0001 2312 0007 8100 0003 0001 0000 0000 0000 0000 0000 0000 0000
+#0002: 0000: 1010 0007 1220 0001 2312 0007 8100 0005 0002 0000 0000 0000 0000 0000 0000 0000
 
 #0004: Register::::
 #0004: GR0:      0 = #0000 = 0000000000000000
-#0004: GR1:      3 = #0003 = 0000000000000011
+#0004: GR1:      5 = #0005 = 0000000000000101
 #0004: GR2:      1 = #0001 = 0000000000000001
 #0004: GR3:      0 = #0000 = 0000000000000000
 #0004: GR4:      0 = #0000 = 0000000000000000
@@ -46,11 +46,11 @@ Executing machine codes
 #0004: FR (OF SF ZF): 000
 #0004: Memory::::
 #0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-#0004: 0000: 1010 0007 1220 0001 2312 0007 8100 0003 0001 0000 0000 0000 0000 0000 0000 0000
+#0004: 0000: 1010 0007 1220 0001 2312 0007 8100 0005 0002 0000 0000 0000 0000 0000 0000 0000
 
 #0006: Register::::
 #0006: GR0:      0 = #0000 = 0000000000000000
-#0006: GR1:      2 = #0002 = 0000000000000010
+#0006: GR1:      3 = #0003 = 0000000000000011
 #0006: GR2:      1 = #0001 = 0000000000000001
 #0006: GR3:      0 = #0000 = 0000000000000000
 #0006: GR4:      0 = #0000 = 0000000000000000
@@ -59,8 +59,8 @@ Executing machine codes
 #0006: GR7:      0 = #0000 = 0000000000000000
 #0006: SP:      16 = #0010 = 0000000000010000
 #0006: PR:       6 = #0006 = 0000000000000110
-#0006: FR (OF SF ZF): 100
+#0006: FR (OF SF ZF): 000
 #0006: Memory::::
 #0006: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-#0006: 0000: 1010 0007 1220 0001 2312 0007 8100 0003 0001 0000 0000 0000 0000 0000 0000 0000
+#0006: 0000: 1010 0007 1220 0001 2312 0007 8100 0005 0002 0000 0000 0000 0000 0000 0000 0000
 

diff --git a/test/system/comet2_cmd/cmd_subl_r_adr_x/cmd b/test/system/comet2_cmd/cmd_subl_r_adr_x/cmd
index 9b57761f7cf89969c6955d516fc75d0282b90730..bbd1e215882b81583d702fda2cb7f1f26fe30192 100755 (executable)
--- a/test/system/comet2_cmd/cmd_subl_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r_adr_x/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr_x.casl
-../../../../comet2 -td -M16 a.o
+../../../../comet2 -Td -M16 a.o
 rm -f a.o