From: j8takagi <j8takagi@nifty.com>
Date: Thu, 21 Feb 2019 15:25:22 +0000 (+0900)
Subject: make valgrind対応のため、テストを更新
X-Git-Tag: v0.5p9~10
X-Git-Url: http://www.j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce897094478335caf357601548af1b06cbad1188;p=YACASL2.git
make valgrind対応のため、テストを更新
---
diff --git a/monitor/break.monitor b/monitor/break.monitor
index 353a5d9..2de446d 100644
--- a/monitor/break.monitor
+++ b/monitor/break.monitor
@@ -1,4 +1,4 @@
-l as/sample/sum_10.o
+l sum_10.o
d a 0 #18
t a
b a #7
diff --git a/monitor/continue_hello.monitor b/monitor/continue_hello.monitor
index 72e1aa1..0792917 100644
--- a/monitor/continue_hello.monitor
+++ b/monitor/continue_hello.monitor
@@ -1,4 +1,4 @@
-l as/sample/hello.o
+l hello.o
d a 0 #22
t a
c
diff --git a/monitor/continue_sum10.monitor b/monitor/continue_sum10.monitor
index 7d5ea6e..1105666 100644
--- a/monitor/continue_sum10.monitor
+++ b/monitor/continue_sum10.monitor
@@ -1,4 +1,4 @@
-l as/sample/sum_10.o
+l sum_10.o
d a 0 #18
t a
c
diff --git a/monitor/dump_0.monitor b/monitor/dump_0.monitor
index 656211a..cabb5cb 100644
--- a/monitor/dump_0.monitor
+++ b/monitor/dump_0.monitor
@@ -1,2 +1,2 @@
-l as/sample/sum_10.o
+l sum_10.o
d
diff --git a/monitor/dump_1.monitor b/monitor/dump_1.monitor
index 8fb1c85..5913072 100644
--- a/monitor/dump_1.monitor
+++ b/monitor/dump_1.monitor
@@ -1,2 +1,2 @@
-l as/sample/sum_10.o
+l sum_10.o
d 0
diff --git a/monitor/dump_2.monitor b/monitor/dump_2.monitor
index 2b0239e..98c066d 100644
--- a/monitor/dump_2.monitor
+++ b/monitor/dump_2.monitor
@@ -1,2 +1,2 @@
-l as/sample/sum_10.o
+l sum_10.o
d 0 #20
diff --git a/monitor/dump_3.monitor b/monitor/dump_3.monitor
index 74fa8a4..cdcb4fe 100644
--- a/monitor/dump_3.monitor
+++ b/monitor/dump_3.monitor
@@ -1,2 +1,2 @@
-l as/sample/sum_10.o
+l sum_10.o
d 0 #20 #40
diff --git a/monitor/dump_plus.monitor b/monitor/dump_plus.monitor
index afbca65..77d4f87 100644
--- a/monitor/dump_plus.monitor
+++ b/monitor/dump_plus.monitor
@@ -1,2 +1,2 @@
-l as/sample/sum_10.o
+l sum_10.o
d 0 +#20
diff --git a/monitor/load.monitor b/monitor/load.monitor
index 656211a..cabb5cb 100644
--- a/monitor/load.monitor
+++ b/monitor/load.monitor
@@ -1,2 +1,2 @@
-l as/sample/sum_10.o
+l sum_10.o
d
diff --git a/monitor/revert_hello.monitor b/monitor/revert_hello.monitor
index f3060e1..0065690 100644
--- a/monitor/revert_hello.monitor
+++ b/monitor/revert_hello.monitor
@@ -1,3 +1,3 @@
-l as/sample/hello.o
+l hello.o
d a 0 #22
r 0 #22
diff --git a/test/system/casl2_cmd/cmd_adda_r1_r2/0.txt b/test/system/casl2_cmd/cmd_adda_r1_r2/0.txt
index 55e674c..28b397f 100644
--- a/test/system/casl2_cmd/cmd_adda_r1_r2/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r1_r2/0.txt
@@ -1,86 +1,3 @@
-;;; ADDA r1,r2
-MAIN START
-BEGIN LAD GR1,1
- LAD GR2,1
- LAD GR3,1
- LAD GR4,1
- LAD GR5,1
- LAD GR6,1
- LAD GR7,1
- LAD GR0,1
- ADDA GR1,GR1
- ADDA GR1,GR2
- ADDA GR1,GR3
- ADDA GR1,GR4
- ADDA GR1,GR5
- ADDA GR1,GR6
- ADDA GR1,GR7
- LAD GR1,1
- ADDA GR2,GR0
- ADDA GR2,GR1
- ADDA GR2,GR2
- ADDA GR2,GR3
- ADDA GR2,GR4
- ADDA GR2,GR5
- ADDA GR2,GR6
- ADDA GR2,GR7
- ADDA GR2,GR0
- LAD GR2,1
- ADDA GR3,GR1
- ADDA GR3,GR2
- ADDA GR3,GR3
- ADDA GR3,GR4
- ADDA GR3,GR5
- ADDA GR3,GR6
- ADDA GR3,GR7
- ADDA GR3,GR0
- LAD GR3,1
- ADDA GR4,GR1
- ADDA GR4,GR2
- ADDA GR4,GR3
- ADDA GR4,GR4
- ADDA GR4,GR5
- ADDA GR4,GR6
- ADDA GR4,GR7
- ADDA GR4,GR0
- LAD GR4,1
- ADDA GR5,GR1
- ADDA GR5,GR2
- ADDA GR5,GR3
- ADDA GR5,GR4
- ADDA GR5,GR5
- ADDA GR5,GR6
- ADDA GR5,GR7
- ADDA GR5,GR0
- LAD GR5,1
- ADDA GR6,GR1
- ADDA GR6,GR2
- ADDA GR6,GR3
- ADDA GR6,GR4
- ADDA GR6,GR5
- ADDA GR6,GR6
- ADDA GR6,GR7
- ADDA GR6,GR0
- LAD GR6,1
- ADDA GR7,GR1
- ADDA GR7,GR2
- ADDA GR7,GR3
- ADDA GR7,GR4
- ADDA GR7,GR5
- ADDA GR7,GR6
- ADDA GR7,GR7
- ADDA GR7,GR0
- LAD GR7,1
- ADDA GR0,GR1
- ADDA GR0,GR2
- ADDA GR0,GR3
- ADDA GR0,GR4
- ADDA GR0,GR5
- ADDA GR0,GR6
- ADDA GR0,GR7
- ADDA GR0,GR0
- RET
- END
Assemble ../../../../as/cmd/ADDA/adda_r1_r2.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r1_r2/cmd b/test/system/casl2_cmd/cmd_adda_r1_r2/cmd
index 2f72152..e7bef90 100755
--- a/test/system/casl2_cmd/cmd_adda_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r1_r2/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r1_r2.casl
../../../../casl2 -atd -M128 ../../../../as/cmd/ADDA/adda_r1_r2.casl
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr/0.txt
index 819eb57..0912dc9 100644
--- a/test/system/casl2_cmd/cmd_adda_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; ADDA r,adr
-MAIN START
-BEGIN LD GR1,A
- ADDA GR1,B
- RET
-A DC 3
-B DC 1
- END
Assemble ../../../../as/cmd/ADDA/adda_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr/cmd b/test/system/casl2_cmd/cmd_adda_r_adr/cmd
index 51eac5e..caaa4b9 100755
--- a/test/system/casl2_cmd/cmd_adda_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r_adr.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt
index 9933e02..ae57ee6 100644
--- a/test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt
@@ -1,11 +1,3 @@
-;;; ADDA r,adr ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- ADDA GR1,B
- RET
-A DC #8002 ; -32766
-B DC #8001 ; -32767
- END
Assemble ../../../../as/cmd/ADDA/adda_r_adr__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr___o/cmd b/test/system/casl2_cmd/cmd_adda_r_adr___o/cmd
index d6cc17f..bfbf8bc 100755
--- a/test/system/casl2_cmd/cmd_adda_r_adr___o/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r_adr___o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r_adr__o.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda_r_adr__o.casl
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt
index dfb692e..10a1de2 100644
--- a/test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt
@@ -1,11 +1,3 @@
-;;; ADDA r,adr æ¼ç®çµæãé¶
-MAIN START
- LD GR1,A
- ADDA GR1,B
- RET
-A DC 0
-B DC 0
- END
Assemble ../../../../as/cmd/ADDA/adda_r_adr__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr___z/cmd b/test/system/casl2_cmd/cmd_adda_r_adr___z/cmd
index 073c997..fda5f32 100755
--- a/test/system/casl2_cmd/cmd_adda_r_adr___z/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r_adr___z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r_adr__z.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda_r_adr__z.casl
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt
index 8d271b6..2ea2abb 100644
--- a/test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt
@@ -1,11 +1,3 @@
-;;; ADDA r,adr æ£æ°ã§ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- ADDA GR1,B
- RET
-A DC #7FFE ; 32766
-B DC #000A ; 10
- END
Assemble ../../../../as/cmd/ADDA/adda_r_adr__ao.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__ao/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__ao/cmd
index e45a270..f443bfc 100755
--- a/test/system/casl2_cmd/cmd_adda_r_adr__ao/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__ao/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r_adr__ao.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda_r_adr__ao.casl
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt
index 8c16e2e..8a76a22 100644
--- a/test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt
@@ -1,11 +1,3 @@
-;;; ADDA r,adr æ¼ç®çµæãè² æ°(r > adr)
-MAIN START
- LD GR1,A
- ADDA GR1,B
- RET
-A DC #000A ; 10
-B DC #FFEC ; -20
- END
Assemble ../../../../as/cmd/ADDA/adda_r_adr__as0.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__as0/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__as0/cmd
index 0640f56..a2a215a 100755
--- a/test/system/casl2_cmd/cmd_adda_r_adr__as0/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__as0/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r_adr__as0.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda_r_adr__as0.casl
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt
index 45dceb6..8378443 100644
--- a/test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt
@@ -1,11 +1,3 @@
-;;; ADDA r,adr æ¼ç®çµæãè² æ°(r < adr)
-MAIN START
- LD GR1,A
- ADDA GR1,B
- RET
-A DC #FFEC ; -20
-B DC #000A ; 10
- END
Assemble ../../../../as/cmd/ADDA/adda_r_adr__as1.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__as1/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__as1/cmd
index d7824b9..3b867cd 100755
--- a/test/system/casl2_cmd/cmd_adda_r_adr__as1/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__as1/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r_adr__as1.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda_r_adr__as1.casl
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt
index 6d85054..3fb7811 100644
--- a/test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt
@@ -1,11 +1,3 @@
-;;; ADDA r,adr æ¼ç®çµæãé¶
-MAIN START
- LD GR1,A
- ADDA GR1,B
- RET
-A DC #FFF6 ; -10
-B DC 10
- END
Assemble ../../../../as/cmd/ADDA/adda_r_adr__az.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__az/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__az/cmd
index 1e22480..cbf820b 100755
--- a/test/system/casl2_cmd/cmd_adda_r_adr__az/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__az/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r_adr__az.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda_r_adr__az.casl
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt
index 81710a7..dc96ca8 100644
--- a/test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt
@@ -1,11 +1,3 @@
-;;; ADDA r,adr ADDLã§ã¯ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- ADDA GR1,B
- RET
-A DC #FFFE ; -2
-B DC #000F ; 15
- END
Assemble ../../../../as/cmd/ADDA/adda_r_adr__lo.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__lo/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__lo/cmd
index 7a12e57..4702794 100755
--- a/test/system/casl2_cmd/cmd_adda_r_adr__lo/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r_adr__lo/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r_adr__lo.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda_r_adr__lo.casl
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt
index ee5cc88..94b0a33 100644
--- a/test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt
@@ -1,12 +1,3 @@
-;;; ADDA r,adr,x
-MAIN START
-BEGIN LD GR1,A
- LAD GR2,1
- ADDA GR1,A,GR2
- RET
-A DC 3
- DC 1
- END
Assemble ../../../../as/cmd/ADDA/adda_r_adr_x.casl (0)
diff --git a/test/system/casl2_cmd/cmd_adda_r_adr_x/cmd b/test/system/casl2_cmd/cmd_adda_r_adr_x/cmd
index 5e469c3..d45a59f 100755
--- a/test/system/casl2_cmd/cmd_adda_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_adda_r_adr_x/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDA/adda_r_adr_x.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/ADDA/adda_r_adr_x.casl
diff --git a/test/system/casl2_cmd/cmd_addl_r1_r2/0.txt b/test/system/casl2_cmd/cmd_addl_r1_r2/0.txt
index 5680ef3..6157553 100644
--- a/test/system/casl2_cmd/cmd_addl_r1_r2/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r1_r2/0.txt
@@ -1,12 +1,3 @@
-;;; ADDL r1,r2
-MAIN START
-BEGIN LD GR1,A
- LD GR2,B
- ADDL GR1,GR2
- RET
-A DC 3
-B DC 1
- END
Assemble ../../../../as/cmd/ADDL/addl_r1_r2.casl (0)
diff --git a/test/system/casl2_cmd/cmd_addl_r1_r2/cmd b/test/system/casl2_cmd/cmd_addl_r1_r2/cmd
index 320bd6b..77be9d3 100755
--- a/test/system/casl2_cmd/cmd_addl_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r1_r2/cmd
@@ -1,2 +1 @@
-cat ../../../../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/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr/0.txt
index b663af8..e801f29 100644
--- a/test/system/casl2_cmd/cmd_addl_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; ADDL r,adr
-MAIN START
- LD GR1,A
- ADDL GR1,B
- RET
-A DC 3
-B DC 1
- END
Assemble ../../../../as/cmd/ADDL/addl_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr/cmd b/test/system/casl2_cmd/cmd_addl_r_adr/cmd
index 09953f1..7610fa7 100755
--- a/test/system/casl2_cmd/cmd_addl_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../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__ao/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__ao/0.txt
index 8577e2e..6b4e2bb 100644
--- a/test/system/casl2_cmd/cmd_addl_r_adr__ao/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__ao/0.txt
@@ -1,11 +1,3 @@
-;;; ADDL r,adr ADDAã§ã¯æ£æ°ã§ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- ADDL GR1,B
- RET
-A DC #7FFE ; 32766
-B DC #000A ; 10
- END
Assemble ../../../../as/cmd/ADDL/addl_r_adr__ao.casl (0)
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__ao/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__ao/cmd
index 900239e..2cc7cf9 100755
--- a/test/system/casl2_cmd/cmd_addl_r_adr__ao/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__ao/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDL/addl_r_adr__ao.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/ADDL/addl_r_adr__ao.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 9ee1007..4dabe78 100644
--- a/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt
@@ -1,11 +1,3 @@
-;;; ADDL r,adr æ¼ç®çµæãè² æ°(r > adr)
-MAIN START
- LD GR1,A
- ADDL GR1,B
- RET
-A DC #000A ; 10
-B DC #FFEC ; -20
- END
Assemble ../../../../as/cmd/ADDL/addl_r_adr__as0.casl (0)
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 c1b39be..e315271 100755
--- 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 @@
-cat ../../../../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__as1/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__as1/0.txt
index 48a2f57..6c7758e 100644
--- a/test/system/casl2_cmd/cmd_addl_r_adr__as1/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__as1/0.txt
@@ -1,11 +1,3 @@
-;;; ADDL r,adr
-MAIN START
- LD GR1,A
- ADDL GR1,B
- RET
-A DC #FFEC ; 65516
-B DC #000A ; 10
- END
Assemble ../../../../as/cmd/ADDL/addl_r_adr__as1.casl (0)
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__as1/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__as1/cmd
index d41bc25..a731b98 100755
--- a/test/system/casl2_cmd/cmd_addl_r_adr__as1/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__as1/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDL/addl_r_adr__as1.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/ADDL/addl_r_adr__as1.casl
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt
index 3c2e33a..fb4d0a3 100644
--- a/test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt
@@ -1,11 +1,3 @@
-;;; ADDL r,adr ADDAã§ã¯æ¼ç®çµæãé¶
-MAIN START
- LD GR1,A
- ADDL GR1,B
- RET
-A DC #FFF6 ; 65526
-B DC 10
- END
Assemble ../../../../as/cmd/ADDL/addl_r_adr__az.casl (0)
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__az/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__az/cmd
index d71d6a2..df6edd8 100755
--- a/test/system/casl2_cmd/cmd_addl_r_adr__az/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__az/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDL/addl_r_adr__az.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/ADDL/addl_r_adr__az.casl
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt
index 2682f60..45f645f 100644
--- a/test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt
@@ -1,11 +1,3 @@
-;;; ADDL r,adr ADDLã§ã¯ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- ADDL GR1,B
- RET
-A DC #FFFE ; -2
-B DC #000F ; 15
- END
Assemble ../../../../as/cmd/ADDL/addl_r_adr__lo.casl (0)
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__lo/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__lo/cmd
index 28ec839..56cadce 100755
--- a/test/system/casl2_cmd/cmd_addl_r_adr__lo/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__lo/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDL/addl_r_adr__lo.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/ADDL/addl_r_adr__lo.casl
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt
index 42ee492..30249a6 100644
--- a/test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt
@@ -1,11 +1,3 @@
-;;; ADDL r,adr ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- ADDL GR1,B
- RET
-A DC #8002 ; 32770
-B DC #8001 ; 32769
- END
Assemble ../../../../as/cmd/ADDL/addl_r_adr__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__o/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__o/cmd
index 6b6c5a9..e570a9a 100755
--- a/test/system/casl2_cmd/cmd_addl_r_adr__o/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r_adr__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDL/addl_r_adr__o.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/ADDL/addl_r_adr__o.casl
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt
index f6747c9..691c3e2 100644
--- a/test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt
@@ -1,11 +1,3 @@
-;;; ADDL r,adr æ¼ç®çµæãé¶
-MAIN START
- LD GR1,A
- ADDL GR1,B
- RET
-A DC 0
-B DC 0
- END
Assemble ../../../../as/cmd/ADDL/addl_r_adr__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd b/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd
index a75c0e6..e7278ac 100755
--- a/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ADDL/addl_r_adr__z.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/ADDL/addl_r_adr__z.casl
diff --git a/test/system/casl2_cmd/cmd_and_r1_r2/0.txt b/test/system/casl2_cmd/cmd_and_r1_r2/0.txt
index 40bcc80..dd2a889 100644
--- a/test/system/casl2_cmd/cmd_and_r1_r2/0.txt
+++ b/test/system/casl2_cmd/cmd_and_r1_r2/0.txt
@@ -1,12 +1,3 @@
-;;; AND r1,r2
-MAIN START
- LD GR1,A
- LD GR2,B
- AND GR1,GR2
- RET
-A DC #3000
-B DC #4FFF
- END
Assemble ../../../../as/cmd/AND/and_r1_r2.casl (0)
diff --git a/test/system/casl2_cmd/cmd_and_r1_r2/cmd b/test/system/casl2_cmd/cmd_and_r1_r2/cmd
index 5e43309..630091f 100755
--- a/test/system/casl2_cmd/cmd_and_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_and_r1_r2/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/AND/and_r1_r2.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/AND/and_r1_r2.casl
diff --git a/test/system/casl2_cmd/cmd_and_r_adr/0.txt b/test/system/casl2_cmd/cmd_and_r_adr/0.txt
index f7fea29..f4c2e1e 100644
--- a/test/system/casl2_cmd/cmd_and_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_and_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; AND r,adr
-MAIN START
- LD GR1,A
- AND GR1,B
- RET
-A DC #3000
-B DC #4FFF
- END
Assemble ../../../../as/cmd/AND/and_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_and_r_adr/cmd b/test/system/casl2_cmd/cmd_and_r_adr/cmd
index a964875..97030b7 100755
--- a/test/system/casl2_cmd/cmd_and_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_and_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/AND/and_r_adr.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/AND/and_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_and_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_and_r_adr__s/0.txt
index 779d4f0..e02c198 100644
--- a/test/system/casl2_cmd/cmd_and_r_adr__s/0.txt
+++ b/test/system/casl2_cmd/cmd_and_r_adr__s/0.txt
@@ -1,11 +1,3 @@
-;;; AND r,adr æ¼ç®çµæã®ç¬¦å·ãè²
-MAIN START
- LD GR1,A
- AND GR1,B
- RET
-A DC #8000
-B DC #FFFF
- END
Assemble ../../../../as/cmd/AND/and_r_adr__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_and_r_adr__s/cmd b/test/system/casl2_cmd/cmd_and_r_adr__s/cmd
index 2039852..fd50beb 100755
--- a/test/system/casl2_cmd/cmd_and_r_adr__s/cmd
+++ b/test/system/casl2_cmd/cmd_and_r_adr__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/AND/and_r_adr__s.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/AND/and_r_adr__s.casl
diff --git a/test/system/casl2_cmd/cmd_and_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_and_r_adr__z/0.txt
index 6ac7746..90661b1 100644
--- a/test/system/casl2_cmd/cmd_and_r_adr__z/0.txt
+++ b/test/system/casl2_cmd/cmd_and_r_adr__z/0.txt
@@ -1,11 +1,3 @@
-;;; AND r,adr æ¼ç®çµæãé¶
-MAIN START
- LD GR1,A
- AND GR1,B
- RET
-A DC #0001
-B DC #FFFE
- END
Assemble ../../../../as/cmd/AND/and_r_adr__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_and_r_adr__z/cmd b/test/system/casl2_cmd/cmd_and_r_adr__z/cmd
index dbce555..02e4c93 100755
--- a/test/system/casl2_cmd/cmd_and_r_adr__z/cmd
+++ b/test/system/casl2_cmd/cmd_and_r_adr__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/AND/and_r_adr__z.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/AND/and_r_adr__z.casl
diff --git a/test/system/casl2_cmd/cmd_and_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_and_r_adr_x/0.txt
index e22a0b9..2a61e00 100644
--- a/test/system/casl2_cmd/cmd_and_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_and_r_adr_x/0.txt
@@ -1,12 +1,3 @@
-;;; AND r,adr,x
-MAIN START
- LD GR1,A
- LAD GR2,1
- AND GR1,A,GR2
- RET
-A DC #3000
- DC #4FFF
- END
Assemble ../../../../as/cmd/AND/and_r_adr_x.casl (0)
diff --git a/test/system/casl2_cmd/cmd_and_r_adr_x/cmd b/test/system/casl2_cmd/cmd_and_r_adr_x/cmd
index c02b72f..c667377 100755
--- a/test/system/casl2_cmd/cmd_and_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_and_r_adr_x/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/AND/and_r_adr_x.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/AND/and_r_adr_x.casl
diff --git a/test/system/casl2_cmd/cmd_call__both/0.txt b/test/system/casl2_cmd/cmd_call__both/0.txt
index c0f0a71..2477381 100644
--- a/test/system/casl2_cmd/cmd_call__both/0.txt
+++ b/test/system/casl2_cmd/cmd_call__both/0.txt
@@ -1,17 +1,3 @@
-;;; CALL
-;;; åãããã°ã©ã ã®ä¸ã¨ã»ãã®ããã°ã©ã ã®å
¥å£åã®ä¸¡æ¹ã§å®ç¾©ãããã©ãã«ãæå®
-;;; YACASL2ã§ã¯ãã»ãã®ããã°ã©ã ã®å
¥å£åãåªå
-MAIN START BEGIN
-BEGIN LAD GR1,29
- CALL COPY
- RET
-COPY LD GR2,GR1
- RET
- END
-COPY START
- LD GR2,GR1
- RET
- END
Assemble ../../../../as/cmd/CALL/call__both.casl (0)
diff --git a/test/system/casl2_cmd/cmd_call__both/cmd b/test/system/casl2_cmd/cmd_call__both/cmd
index 7211a48..7ee0af2 100755
--- a/test/system/casl2_cmd/cmd_call__both/cmd
+++ b/test/system/casl2_cmd/cmd_call__both/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CALL/call__both.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/CALL/call__both.casl
diff --git a/test/system/casl2_cmd/cmd_call__inner/0.txt b/test/system/casl2_cmd/cmd_call__inner/0.txt
index 50ff91d..cbbef61 100644
--- a/test/system/casl2_cmd/cmd_call__inner/0.txt
+++ b/test/system/casl2_cmd/cmd_call__inner/0.txt
@@ -1,11 +1,3 @@
-;;; CALL åãããã°ã©ã ã®ä¸ã«ããã©ãã«ãæå®
-MAIN START BEGIN
-BEGIN LAD GR1,29
- CALL COPY
- RET
-COPY LD GR2,GR1
- RET
- END
Assemble ../../../../as/cmd/CALL/call__inner.casl (0)
diff --git a/test/system/casl2_cmd/cmd_call__inner/cmd b/test/system/casl2_cmd/cmd_call__inner/cmd
index a92d5b3..8525b63 100755
--- a/test/system/casl2_cmd/cmd_call__inner/cmd
+++ b/test/system/casl2_cmd/cmd_call__inner/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CALL/call__inner.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/CALL/call__inner.casl
diff --git a/test/system/casl2_cmd/cmd_call__outer/0.txt b/test/system/casl2_cmd/cmd_call__outer/0.txt
index c9811ce..dc0ae95 100644
--- a/test/system/casl2_cmd/cmd_call__outer/0.txt
+++ b/test/system/casl2_cmd/cmd_call__outer/0.txt
@@ -1,13 +1,3 @@
-;;; CALL ã»ãã®ããã°ã©ã ã®å
¥å£åãæå®
-MAIN START
- LAD GR1,29
- CALL COPY
- RET
- END
-COPY START
- LD GR2,GR1
- RET
- END
Assemble ../../../../as/cmd/CALL/call__outer.casl (0)
diff --git a/test/system/casl2_cmd/cmd_call__outer/cmd b/test/system/casl2_cmd/cmd_call__outer/cmd
index d91494f..a0c81f7 100755
--- a/test/system/casl2_cmd/cmd_call__outer/cmd
+++ b/test/system/casl2_cmd/cmd_call__outer/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CALL/call__outer.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/CALL/call__outer.casl
diff --git a/test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt b/test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt
index 48572c6..1d48183 100644
--- a/test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt
+++ b/test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt
@@ -1,12 +1,3 @@
-;;; CPA r1,r2 SF:1
-MAIN START BEGIN
-BEGIN LD GR1,A
- LD GR2,B
- CPA GR1,GR2
- RET
-A DC #5000
-B DC #7000
- END
Assemble ../../../../as/cmd/CPA/cpa_r1_r2__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpa_r1_r2__s/cmd b/test/system/casl2_cmd/cmd_cpa_r1_r2__s/cmd
index 5a1589a..0c96ee2 100755
--- a/test/system/casl2_cmd/cmd_cpa_r1_r2__s/cmd
+++ b/test/system/casl2_cmd/cmd_cpa_r1_r2__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPA/cpa_r1_r2__s.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/CPA/cpa_r1_r2__s.casl
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr/0.txt
index 3463f43..c31177e 100644
--- a/test/system/casl2_cmd/cmd_cpa_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; CPA r,adr
-MAIN START BEGIN
-BEGIN LD GR1,A
- CPA GR1,B
- RET
-A DC #5000
-B DC #3000
- END
Assemble ../../../../as/cmd/CPA/cpa_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr/cmd
index 46248a6..c6b9ad8 100755
--- a/test/system/casl2_cmd/cmd_cpa_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPA/cpa_r_adr.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/CPA/cpa_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt
index 5386445..3ad64e9 100644
--- a/test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt
@@ -1,11 +1,3 @@
-;;; CPA r,adr
-MAIN START BEGIN
-BEGIN LD GR1,A
- CPA GR1,B
- RET
-A DC #5000
-B DC #8000
- END
Assemble ../../../../as/cmd/CPA/cpa_r_adr__ls.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr__ls/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr__ls/cmd
index f567266..9907449 100755
--- a/test/system/casl2_cmd/cmd_cpa_r_adr__ls/cmd
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr__ls/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPA/cpa_r_adr__ls.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/CPA/cpa_r_adr__ls.casl
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt
index dfd507f..f79191b 100644
--- a/test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt
@@ -1,11 +1,3 @@
-;;; CPA r,adr SF:1
-MAIN START BEGIN
-BEGIN LD GR1,A
- CPA GR1,B
- RET
-A DC #5000
-B DC #7000
- END
Assemble ../../../../as/cmd/CPA/cpa_r_adr__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr__s/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr__s/cmd
index f217813..fc79b21 100755
--- a/test/system/casl2_cmd/cmd_cpa_r_adr__s/cmd
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPA/cpa_r_adr__s.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/CPA/cpa_r_adr__s.casl
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt
index 073f012..a4b2173 100644
--- a/test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt
@@ -1,11 +1,3 @@
-;;; CPA r,adr ZF:0
-MAIN START BEGIN
-BEGIN LD GR1,A
- CPA GR1,B
- RET
-A DC #5000
-B DC #5000
- END
Assemble ../../../../as/cmd/CPA/cpa_r_adr__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr__z/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr__z/cmd
index f55ca17..db626d4 100755
--- a/test/system/casl2_cmd/cmd_cpa_r_adr__z/cmd
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPA/cpa_r_adr__z.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/CPA/cpa_r_adr__z.casl
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt
index 66dd4a2..1576ae3 100644
--- a/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt
@@ -1,12 +1,3 @@
-;;; CPA r,adr,x SF:1
-MAIN START BEGIN
-BEGIN LD GR1,A
- LAD GR2,1
- CPA GR1,A,GR2
- RET
-A DC #5000
- DC #7000
- END
Assemble ../../../../as/cmd/CPA/cpa_r_adr_x__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/cmd
index 500dd43..933d35b 100755
--- a/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/cmd
+++ b/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPA/cpa_r_adr_x__s.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/CPA/cpa_r_adr_x__s.casl
diff --git a/test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt b/test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt
index 42b06ba..b740e2a 100644
--- a/test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt
+++ b/test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt
@@ -1,12 +1,3 @@
-;;; CPL r1,r2 SF:1
-MAIN START BEGIN
-BEGIN LD GR1,A
- LD GR2,B
- CPL GR1,GR2
- RET
-A DC #5000
-B DC #7000
- END
Assemble ../../../../as/cmd/CPL/cpl_r1_r2__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpl_r1_r2__s/cmd b/test/system/casl2_cmd/cmd_cpl_r1_r2__s/cmd
index 32d7520..373f013 100755
--- a/test/system/casl2_cmd/cmd_cpl_r1_r2__s/cmd
+++ b/test/system/casl2_cmd/cmd_cpl_r1_r2__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPL/cpl_r1_r2__s.casl
../../../../casl2 -aTd -M16 ../../../../as/cmd/CPL/cpl_r1_r2__s.casl
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr/0.txt
index 23c9936..5a50150 100644
--- a/test/system/casl2_cmd/cmd_cpl_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; CPL r,adr
-MAIN START BEGIN
-BEGIN LD GR1,A
- CPL GR1,B
- RET
-A DC #5000
-B DC #3000
- END
Assemble ../../../../as/cmd/CPL/cpl_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr/cmd
index af4857b..c164e68 100755
--- a/test/system/casl2_cmd/cmd_cpl_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPL/cpl_r_adr.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/CPL/cpl_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt
index bad3e61..3d895d0 100644
--- a/test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt
@@ -1,11 +1,3 @@
-;;; CPL r,adr
-MAIN START BEGIN
-BEGIN LD GR1,A
- CPL GR1,B
- RET
-A DC #5000
-B DC #8000
- END
Assemble ../../../../as/cmd/CPL/cpl_r_adr__ls.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr__ls/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr__ls/cmd
index 7a7370b..7798f44 100755
--- a/test/system/casl2_cmd/cmd_cpl_r_adr__ls/cmd
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr__ls/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPL/cpl_r_adr__ls.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/CPL/cpl_r_adr__ls.casl
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt
index e583214..cf088eb 100644
--- a/test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt
@@ -1,11 +1,3 @@
-;;; CPL r,adr SF:1
-MAIN START BEGIN
-BEGIN LD GR1,A
- CPL GR1,B
- RET
-A DC #5000
-B DC #7000
- END
Assemble ../../../../as/cmd/CPL/cpl_r_adr__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr__s/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr__s/cmd
index 2c05bd4..11dddcc 100755
--- a/test/system/casl2_cmd/cmd_cpl_r_adr__s/cmd
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPL/cpl_r_adr__s.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/CPL/cpl_r_adr__s.casl
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt
index 527a64f..7ba9aa4 100644
--- a/test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt
@@ -1,11 +1,3 @@
-;;; CPL r,adr ZF:0
-MAIN START BEGIN
-BEGIN LD GR1,A
- CPL GR1,B
- RET
-A DC #5000
-B DC #5000
- END
Assemble ../../../../as/cmd/CPL/cpl_r_adr__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr__z/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr__z/cmd
index 509a654..301d8a1 100755
--- a/test/system/casl2_cmd/cmd_cpl_r_adr__z/cmd
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPL/cpl_r_adr__z.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/CPL/cpl_r_adr__z.casl
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt
index 92f2a6a..b9642c4 100644
--- a/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt
@@ -1,12 +1,3 @@
-;;; CPL r,adr,x SF:1
-MAIN START BEGIN
-BEGIN LD GR1,A
- LAD GR2,1
- CPL GR1,A,GR2
- RET
-A DC #5000
- DC #7000
- END
Assemble ../../../../as/cmd/CPL/cpl_r_adr_x__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/cmd
index 682cbf2..692c4ad 100755
--- a/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/cmd
+++ b/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/CPL/cpl_r_adr_x__s.casl
../../../../casl2 -aTd -M16 ../../../../as/cmd/CPL/cpl_r_adr_x__s.casl
diff --git a/test/system/casl2_cmd/cmd_dc__c0/0.txt b/test/system/casl2_cmd/cmd_dc__c0/0.txt
index 8305ec2..e39ef05 100644
--- a/test/system/casl2_cmd/cmd_dc__c0/0.txt
+++ b/test/system/casl2_cmd/cmd_dc__c0/0.txt
@@ -1,101 +1,3 @@
-;; DC æåå®æ°
-MAIN START
- RET
- DC ' '
- DC '!'
- DC '"'
- DC '#'
- DC '$'
- DC '%'
- DC '&'
- DC ''''
- DC '('
- DC ')'
- DC '*'
- DC '+'
- DC ','
- DC '-'
- DC '.'
- DC '/'
- DC '0'
- DC '1'
- DC '2'
- DC '3'
- DC '4'
- DC '5'
- DC '6'
- DC '7'
- DC '8'
- DC '9'
- DC ':'
- DC ';'
- DC '<'
- DC '='
- DC '>'
- DC '?'
- DC '@'
- DC 'A'
- DC 'B'
- DC 'C'
- DC 'D'
- DC 'E'
- DC 'F'
- DC 'G'
- DC 'H'
- DC 'I'
- DC 'J'
- DC 'K'
- DC 'L'
- DC 'M'
- DC 'N'
- DC 'O'
- DC 'P'
- DC 'Q'
- DC 'R'
- DC 'S'
- DC 'T'
- DC 'U'
- DC 'V'
- DC 'W'
- DC 'X'
- DC 'Y'
- DC 'Z'
- DC '['
- DC '\'
- DC ']'
- DC '^'
- DC '_'
- DC 'a'
- DC 'b'
- DC 'c'
- DC 'd'
- DC 'e'
- DC 'f'
- DC 'g'
- DC 'h'
- DC 'i'
- DC 'j'
- DC 'k'
- DC 'l'
- DC 'm'
- DC 'n'
- DC 'o'
- DC 'p'
- DC 'q'
- DC 'r'
- DC 's'
- DC 't'
- DC 'u'
- DC 'v'
- DC 'w'
- DC 'x'
- DC 'y'
- DC 'z'
- DC '{'
- DC '|'
- DC '}'
- DC '~'
- END
Assemble ../../../../as/cmd/DC/dc__c0.casl (0)
diff --git a/test/system/casl2_cmd/cmd_dc__c0/cmd b/test/system/casl2_cmd/cmd_dc__c0/cmd
index b12dbce..14b0d62 100755
--- a/test/system/casl2_cmd/cmd_dc__c0/cmd
+++ b/test/system/casl2_cmd/cmd_dc__c0/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/DC/dc__c0.casl
../../../../casl2 -atd -M128 ../../../../as/cmd/DC/dc__c0.casl
diff --git a/test/system/casl2_cmd/cmd_dc__c1/0.txt b/test/system/casl2_cmd/cmd_dc__c1/0.txt
index 921faa8..717764e 100644
--- a/test/system/casl2_cmd/cmd_dc__c1/0.txt
+++ b/test/system/casl2_cmd/cmd_dc__c1/0.txt
@@ -1,10 +1,3 @@
-;; DC æåå®æ°
-MAIN START
- RET
- DC ' !"#$%&''()*+,-./0123456789:;<=>?@ABCDEFG'
- DC 'GHIJKLMNOPQRSTUVWXYZ[\]^_abcdefghijklmno'
- DC 'pqrstuvwxyz{|}~'
- END
Assemble ../../../../as/cmd/DC/dc__c1.casl (0)
diff --git a/test/system/casl2_cmd/cmd_dc__c1/cmd b/test/system/casl2_cmd/cmd_dc__c1/cmd
index 34e6875..6d07c01 100755
--- a/test/system/casl2_cmd/cmd_dc__c1/cmd
+++ b/test/system/casl2_cmd/cmd_dc__c1/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/DC/dc__c1.casl
../../../../casl2 -atd -M128 ../../../../as/cmd/DC/dc__c1.casl
diff --git a/test/system/casl2_cmd/cmd_dc__i0/0.txt b/test/system/casl2_cmd/cmd_dc__i0/0.txt
index 1bb7d73..7a415ad 100644
--- a/test/system/casl2_cmd/cmd_dc__i0/0.txt
+++ b/test/system/casl2_cmd/cmd_dc__i0/0.txt
@@ -1,30 +1,3 @@
-;; DC 10é²å®æ°ï¼16é²å®æ°
-MAIN START
- RET
- DC 0
- DC 1
- DC 10
- DC 32767
- DC 32768
- DC 65535
- DC 65536
- DC 65537
- DC -1
- DC -10
- DC -32767
- DC -32768
- DC -32769
- DC #0
- DC #1
- DC #01
- DC #001
- DC #0001
- DC #10
- DC #11
- DC #F
- DC #000F
- DC #FFFF
- END
Assemble ../../../../as/cmd/DC/dc__i0.casl (0)
diff --git a/test/system/casl2_cmd/cmd_dc__i0/cmd b/test/system/casl2_cmd/cmd_dc__i0/cmd
index cc3fa3e..d2ab603 100755
--- a/test/system/casl2_cmd/cmd_dc__i0/cmd
+++ b/test/system/casl2_cmd/cmd_dc__i0/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/DC/dc__i0.casl
../../../../casl2 -atd -M32 ../../../../as/cmd/DC/dc__i0.casl
diff --git a/test/system/casl2_cmd/cmd_dc__i1/0.txt b/test/system/casl2_cmd/cmd_dc__i1/0.txt
index a0a4855..ff122e1 100644
--- a/test/system/casl2_cmd/cmd_dc__i1/0.txt
+++ b/test/system/casl2_cmd/cmd_dc__i1/0.txt
@@ -1,8 +1,3 @@
-;; DC 10é²å®æ°ï¼16é²å®æ°
-MAIN START
- RET
- DC 1,10,32767,32768,65535,65536,65537,-1,-10,-32767,-32768,-32769,#0,#1,#01,#001,#0001,#10,#11,#F,#000F,#FFFF
- END
Assemble ../../../../as/cmd/DC/dc__i1.casl (0)
diff --git a/test/system/casl2_cmd/cmd_dc__i1/cmd b/test/system/casl2_cmd/cmd_dc__i1/cmd
index 5a2c640..e997df0 100755
--- a/test/system/casl2_cmd/cmd_dc__i1/cmd
+++ b/test/system/casl2_cmd/cmd_dc__i1/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/DC/dc__i1.casl
../../../../casl2 -atd -M32 ../../../../as/cmd/DC/dc__i1.casl
diff --git a/test/system/casl2_cmd/cmd_dc__io/0.txt b/test/system/casl2_cmd/cmd_dc__io/0.txt
index a8759d8..4ca8c51 100644
--- a/test/system/casl2_cmd/cmd_dc__io/0.txt
+++ b/test/system/casl2_cmd/cmd_dc__io/0.txt
@@ -1,17 +1,3 @@
-;; DC -32768ã32768ã®ç¯å²ã«ãªã10é²æ°å¤
-MAIN START
- RET
- DC 32767
- DC 32768
- DC 65535
- DC 65536
- DC 131073 ; 65536 * 2 + 1
- DC -32768
- DC -32769
- DC -65535
- DC -65536
- DC -131073 ; -65536 * 2 - 1
- END
Assemble ../../../../as/cmd/DC/dc__io.casl (0)
diff --git a/test/system/casl2_cmd/cmd_dc__io/cmd b/test/system/casl2_cmd/cmd_dc__io/cmd
index a8fa298..5987439 100755
--- a/test/system/casl2_cmd/cmd_dc__io/cmd
+++ b/test/system/casl2_cmd/cmd_dc__io/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/DC/dc__io.casl
../../../../casl2 -atd -M32 ../../../../as/cmd/DC/dc__io.casl
diff --git a/test/system/casl2_cmd/cmd_ds/0.txt b/test/system/casl2_cmd/cmd_ds/0.txt
index 90bfa20..01d1c58 100644
--- a/test/system/casl2_cmd/cmd_ds/0.txt
+++ b/test/system/casl2_cmd/cmd_ds/0.txt
@@ -1,17 +1,3 @@
-;;; DS
-MAIN START
- LAD GR1,A
- LAD GR1,B
- LAD GR1,C
- LAD GR1,D
- LAD GR1,E
- RET
-A DS 1
-B DS 2
-C DS 4
-D DS 0
-E DC #FFFF
- END
Assemble ../../../../as/cmd/DS/ds.casl (0)
diff --git a/test/system/casl2_cmd/cmd_ds/cmd b/test/system/casl2_cmd/cmd_ds/cmd
index c96bc3b..115dcb5 100755
--- a/test/system/casl2_cmd/cmd_ds/cmd
+++ b/test/system/casl2_cmd/cmd_ds/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/DS/ds.casl
../../../../casl2 -atd -M32 ../../../../as/cmd/DS/ds.casl
diff --git a/test/system/casl2_cmd/cmd_ds__0/0.txt b/test/system/casl2_cmd/cmd_ds__0/0.txt
index d62547a..f997700 100644
--- a/test/system/casl2_cmd/cmd_ds__0/0.txt
+++ b/test/system/casl2_cmd/cmd_ds__0/0.txt
@@ -1,11 +1,3 @@
-;; ãDS 0ããæå®ããããã°ã©ã ä¾
-MAIN START
- LD GR1,A
- LD GR2,B
- RET
-A DS 0
-B DC 15
- END
Assemble ../../../../as/cmd/DS/ds__0.casl (0)
diff --git a/test/system/casl2_cmd/cmd_ds__0/cmd b/test/system/casl2_cmd/cmd_ds__0/cmd
index 9d11acb..7d668e7 100755
--- a/test/system/casl2_cmd/cmd_ds__0/cmd
+++ b/test/system/casl2_cmd/cmd_ds__0/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/DS/ds__0.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/DS/ds__0.casl
diff --git a/test/system/casl2_cmd/cmd_in/0.txt b/test/system/casl2_cmd/cmd_in/0.txt
index 6cd1adb..1d27dda 100644
--- a/test/system/casl2_cmd/cmd_in/0.txt
+++ b/test/system/casl2_cmd/cmd_in/0.txt
@@ -1,11 +1,3 @@
-;;; IN IBUF,ILEN
-MAIN START
-LOOP IN IBUF,ILEN
-FIN RET
-IBUF DS 20
-ILEN DS 1
- END
-aaa
Assemble ../../../../as/cmd/IN/in.casl (0)
diff --git a/test/system/casl2_cmd/cmd_in/cmd b/test/system/casl2_cmd/cmd_in/cmd
index 975ff8b..5f6f8af 100755
--- a/test/system/casl2_cmd/cmd_in/cmd
+++ b/test/system/casl2_cmd/cmd_in/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/IN/in.casl teststr.txt
../../../../casl2 -atd -M64 ../../../../as/cmd/IN/in.casl <teststr.txt
diff --git a/test/system/casl2_cmd/cmd_jmi__m/0.txt b/test/system/casl2_cmd/cmd_jmi__m/0.txt
index 2600969..f09d4a7 100644
--- a/test/system/casl2_cmd/cmd_jmi__m/0.txt
+++ b/test/system/casl2_cmd/cmd_jmi__m/0.txt
@@ -1,14 +1,3 @@
-;;; JMI adr OF:0/SF:1/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JMI TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC -1
- END
Assemble ../../../../as/cmd/JMI/jmi__m.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jmi__m/cmd b/test/system/casl2_cmd/cmd_jmi__m/cmd
index e61f5bc..04d9a80 100755
--- a/test/system/casl2_cmd/cmd_jmi__m/cmd
+++ b/test/system/casl2_cmd/cmd_jmi__m/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JMI/jmi__m.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JMI/jmi__m.casl
diff --git a/test/system/casl2_cmd/cmd_jmi__o/0.txt b/test/system/casl2_cmd/cmd_jmi__o/0.txt
index b97516f..4c4f862 100644
--- a/test/system/casl2_cmd/cmd_jmi__o/0.txt
+++ b/test/system/casl2_cmd/cmd_jmi__o/0.txt
@@ -1,14 +1,3 @@
-;;; JMI adr OF:1/SF:0/ZF:0
-MAIN START
- LD GR1,A
- SRL GR1,1
- JMI TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC #0003
- END
Assemble ../../../../as/cmd/JMI/jmi__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jmi__o/cmd b/test/system/casl2_cmd/cmd_jmi__o/cmd
index 9b99ad6..d0c55ea 100755
--- a/test/system/casl2_cmd/cmd_jmi__o/cmd
+++ b/test/system/casl2_cmd/cmd_jmi__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JMI/jmi__o.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JMI/jmi__o.casl
diff --git a/test/system/casl2_cmd/cmd_jmi__p/0.txt b/test/system/casl2_cmd/cmd_jmi__p/0.txt
index e1ca37a..72984ae 100644
--- a/test/system/casl2_cmd/cmd_jmi__p/0.txt
+++ b/test/system/casl2_cmd/cmd_jmi__p/0.txt
@@ -1,14 +1,3 @@
-;;; JMI adr OF:0/SF:1/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JMI TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 1
- END
Assemble ../../../../as/cmd/JMI/jmi__p.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jmi__p/cmd b/test/system/casl2_cmd/cmd_jmi__p/cmd
index 063edf1..8bfe1e0 100755
--- a/test/system/casl2_cmd/cmd_jmi__p/cmd
+++ b/test/system/casl2_cmd/cmd_jmi__p/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JMI/jmi__p.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JMI/jmi__p.casl
diff --git a/test/system/casl2_cmd/cmd_jmi__z/0.txt b/test/system/casl2_cmd/cmd_jmi__z/0.txt
index 3ec4c89..183ecd5 100644
--- a/test/system/casl2_cmd/cmd_jmi__z/0.txt
+++ b/test/system/casl2_cmd/cmd_jmi__z/0.txt
@@ -1,14 +1,3 @@
-;;; JMI OF:0/SF:0/ZF:1
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JMI TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 0
- END
Assemble ../../../../as/cmd/JMI/jmi__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jmi__z/cmd b/test/system/casl2_cmd/cmd_jmi__z/cmd
index 9352ad4..9fc994c 100755
--- a/test/system/casl2_cmd/cmd_jmi__z/cmd
+++ b/test/system/casl2_cmd/cmd_jmi__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JMI/jmi__z.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JMI/jmi__z.casl
diff --git a/test/system/casl2_cmd/cmd_jnz__m/0.txt b/test/system/casl2_cmd/cmd_jnz__m/0.txt
index f5a317d..3d56e46 100644
--- a/test/system/casl2_cmd/cmd_jnz__m/0.txt
+++ b/test/system/casl2_cmd/cmd_jnz__m/0.txt
@@ -1,14 +1,3 @@
-;;; JNZ adr OF:0/SF:1/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JNZ TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC -1
- END
Assemble ../../../../as/cmd/JNZ/jnz__m.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jnz__m/cmd b/test/system/casl2_cmd/cmd_jnz__m/cmd
index 07a7406..126e615 100755
--- a/test/system/casl2_cmd/cmd_jnz__m/cmd
+++ b/test/system/casl2_cmd/cmd_jnz__m/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JNZ/jnz__m.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JNZ/jnz__m.casl
diff --git a/test/system/casl2_cmd/cmd_jnz__o/0.txt b/test/system/casl2_cmd/cmd_jnz__o/0.txt
index 4ff964c..3103390 100644
--- a/test/system/casl2_cmd/cmd_jnz__o/0.txt
+++ b/test/system/casl2_cmd/cmd_jnz__o/0.txt
@@ -1,14 +1,3 @@
-;;; JNZ adr OF:1/SF:0/ZF:0
-MAIN START
- LD GR1,A
- SRL GR1,1
- JNZ TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC #0003
- END
Assemble ../../../../as/cmd/JNZ/jnz__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jnz__o/cmd b/test/system/casl2_cmd/cmd_jnz__o/cmd
index ae8fd5f..a2e345e 100755
--- a/test/system/casl2_cmd/cmd_jnz__o/cmd
+++ b/test/system/casl2_cmd/cmd_jnz__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JNZ/jnz__o.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JNZ/jnz__o.casl
diff --git a/test/system/casl2_cmd/cmd_jnz__p/0.txt b/test/system/casl2_cmd/cmd_jnz__p/0.txt
index 52d8725..12f1740 100644
--- a/test/system/casl2_cmd/cmd_jnz__p/0.txt
+++ b/test/system/casl2_cmd/cmd_jnz__p/0.txt
@@ -1,14 +1,3 @@
-;;; JNZ adr OF:0/SF:0/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JNZ TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 1
- END
Assemble ../../../../as/cmd/JNZ/jnz__p.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jnz__p/cmd b/test/system/casl2_cmd/cmd_jnz__p/cmd
index b796347..1e3b8d9 100755
--- a/test/system/casl2_cmd/cmd_jnz__p/cmd
+++ b/test/system/casl2_cmd/cmd_jnz__p/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JNZ/jnz__p.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JNZ/jnz__p.casl
diff --git a/test/system/casl2_cmd/cmd_jnz__z/0.txt b/test/system/casl2_cmd/cmd_jnz__z/0.txt
index dd0db35..f234fb3 100644
--- a/test/system/casl2_cmd/cmd_jnz__z/0.txt
+++ b/test/system/casl2_cmd/cmd_jnz__z/0.txt
@@ -1,14 +1,3 @@
-;;; JNZ adr OF:0/SF:0/ZF:1
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JNZ TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 0
- END
Assemble ../../../../as/cmd/JNZ/jnz__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jnz__z/cmd b/test/system/casl2_cmd/cmd_jnz__z/cmd
index 8aa9bc3..959dd63 100755
--- a/test/system/casl2_cmd/cmd_jnz__z/cmd
+++ b/test/system/casl2_cmd/cmd_jnz__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JNZ/jnz__z.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JNZ/jnz__z.casl
diff --git a/test/system/casl2_cmd/cmd_jov__m/0.txt b/test/system/casl2_cmd/cmd_jov__m/0.txt
index bb752b7..f6e6568 100644
--- a/test/system/casl2_cmd/cmd_jov__m/0.txt
+++ b/test/system/casl2_cmd/cmd_jov__m/0.txt
@@ -1,14 +1,3 @@
-;;; JOV OF:0/SF:1/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JOV TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC -1
- END
Assemble ../../../../as/cmd/JOV/jov__m.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jov__m/cmd b/test/system/casl2_cmd/cmd_jov__m/cmd
index 71d8904..3a3d5ed 100755
--- a/test/system/casl2_cmd/cmd_jov__m/cmd
+++ b/test/system/casl2_cmd/cmd_jov__m/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JOV/jov__m.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JOV/jov__m.casl
diff --git a/test/system/casl2_cmd/cmd_jov__o/0.txt b/test/system/casl2_cmd/cmd_jov__o/0.txt
index 4bb2982..78fe192 100644
--- a/test/system/casl2_cmd/cmd_jov__o/0.txt
+++ b/test/system/casl2_cmd/cmd_jov__o/0.txt
@@ -1,14 +1,3 @@
-;;; JOV OF:0/SF:1/ZF:1
-MAIN START
- LD GR1,A
- SRL GR1,1
- JOV TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC #0003
- END
Assemble ../../../../as/cmd/JOV/jov__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jov__o/cmd b/test/system/casl2_cmd/cmd_jov__o/cmd
index 1f9aee1..347364d 100755
--- a/test/system/casl2_cmd/cmd_jov__o/cmd
+++ b/test/system/casl2_cmd/cmd_jov__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JOV/jov__o.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JOV/jov__o.casl
diff --git a/test/system/casl2_cmd/cmd_jov__p/0.txt b/test/system/casl2_cmd/cmd_jov__p/0.txt
index 03ca467..7037219 100644
--- a/test/system/casl2_cmd/cmd_jov__p/0.txt
+++ b/test/system/casl2_cmd/cmd_jov__p/0.txt
@@ -1,14 +1,3 @@
-;;; JOV OF:0/SF:0/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JOV TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 1
- END
Assemble ../../../../as/cmd/JOV/jov__p.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jov__p/cmd b/test/system/casl2_cmd/cmd_jov__p/cmd
index 92c669e..91a0506 100755
--- a/test/system/casl2_cmd/cmd_jov__p/cmd
+++ b/test/system/casl2_cmd/cmd_jov__p/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JOV/jov__p.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JOV/jov__p.casl
diff --git a/test/system/casl2_cmd/cmd_jov__z/0.txt b/test/system/casl2_cmd/cmd_jov__z/0.txt
index 38dc045..406760d 100644
--- a/test/system/casl2_cmd/cmd_jov__z/0.txt
+++ b/test/system/casl2_cmd/cmd_jov__z/0.txt
@@ -1,14 +1,3 @@
-;;; JOV OF:0/SF:0/ZF:1
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JOV TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 0
- END
Assemble ../../../../as/cmd/JOV/jov__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jov__z/cmd b/test/system/casl2_cmd/cmd_jov__z/cmd
index 3973697..39d039c 100755
--- a/test/system/casl2_cmd/cmd_jov__z/cmd
+++ b/test/system/casl2_cmd/cmd_jov__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JOV/jov__z.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JOV/jov__z.casl
diff --git a/test/system/casl2_cmd/cmd_jpl__m/0.txt b/test/system/casl2_cmd/cmd_jpl__m/0.txt
index 738be95..c6950ce 100644
--- a/test/system/casl2_cmd/cmd_jpl__m/0.txt
+++ b/test/system/casl2_cmd/cmd_jpl__m/0.txt
@@ -1,14 +1,3 @@
-;;;JPL adr OF:0/SF:1/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JPL TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC -1
- END
Assemble ../../../../as/cmd/JPL/jpl__m.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jpl__m/cmd b/test/system/casl2_cmd/cmd_jpl__m/cmd
index 64d33a9..72dfa65 100755
--- a/test/system/casl2_cmd/cmd_jpl__m/cmd
+++ b/test/system/casl2_cmd/cmd_jpl__m/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JPL/jpl__m.casl
../../../../casl2 -aTd -M16 ../../../../as/cmd/JPL/jpl__m.casl
diff --git a/test/system/casl2_cmd/cmd_jpl__o/0.txt b/test/system/casl2_cmd/cmd_jpl__o/0.txt
index 8995baa..fe6d868 100644
--- a/test/system/casl2_cmd/cmd_jpl__o/0.txt
+++ b/test/system/casl2_cmd/cmd_jpl__o/0.txt
@@ -1,14 +1,3 @@
-;;;JPL adr OF:1/SF:0/ZF:0
-MAIN START
- LD GR1,A
- SRL GR1,1
- JPL TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC #0003
- END
Assemble ../../../../as/cmd/JPL/jpl__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jpl__o/cmd b/test/system/casl2_cmd/cmd_jpl__o/cmd
index d7a0cfe..a73421f 100755
--- a/test/system/casl2_cmd/cmd_jpl__o/cmd
+++ b/test/system/casl2_cmd/cmd_jpl__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JPL/jpl__o.casl
../../../../casl2 -aTd -M16 ../../../../as/cmd/JPL/jpl__o.casl
diff --git a/test/system/casl2_cmd/cmd_jpl__p/0.txt b/test/system/casl2_cmd/cmd_jpl__p/0.txt
index 2088db4..9e01ffe 100644
--- a/test/system/casl2_cmd/cmd_jpl__p/0.txt
+++ b/test/system/casl2_cmd/cmd_jpl__p/0.txt
@@ -1,14 +1,3 @@
-;;;JPL adr OF:0/SF:0/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JPL TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 1
- END
Assemble ../../../../as/cmd/JPL/jpl__p.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jpl__p/cmd b/test/system/casl2_cmd/cmd_jpl__p/cmd
index 9ae2c1e..34af74f 100755
--- a/test/system/casl2_cmd/cmd_jpl__p/cmd
+++ b/test/system/casl2_cmd/cmd_jpl__p/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JPL/jpl__p.casl
../../../../casl2 -aTd -M16 ../../../../as/cmd/JPL/jpl__p.casl
diff --git a/test/system/casl2_cmd/cmd_jpl__z/0.txt b/test/system/casl2_cmd/cmd_jpl__z/0.txt
index abd8ee9..6f29321 100644
--- a/test/system/casl2_cmd/cmd_jpl__z/0.txt
+++ b/test/system/casl2_cmd/cmd_jpl__z/0.txt
@@ -1,14 +1,3 @@
-;;;JPL adr OF:0/SF:0/ZF:1
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JPL TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 0
- END
Assemble ../../../../as/cmd/JPL/jpl__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jpl__z/cmd b/test/system/casl2_cmd/cmd_jpl__z/cmd
index 2eb4b19..b7fcc84 100755
--- a/test/system/casl2_cmd/cmd_jpl__z/cmd
+++ b/test/system/casl2_cmd/cmd_jpl__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JPL/jpl__z.casl
../../../../casl2 -aTd -M16 ../../../../as/cmd/JPL/jpl__z.casl
diff --git a/test/system/casl2_cmd/cmd_jump__m/0.txt b/test/system/casl2_cmd/cmd_jump__m/0.txt
index 5bcf12a..1b80adb 100644
--- a/test/system/casl2_cmd/cmd_jump__m/0.txt
+++ b/test/system/casl2_cmd/cmd_jump__m/0.txt
@@ -1,14 +1,3 @@
-;;; JUMP adr OF:0/SF:1/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JUMP TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC -1
- END
Assemble ../../../../as/cmd/JUMP/jump__m.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jump__m/cmd b/test/system/casl2_cmd/cmd_jump__m/cmd
index 2887731..6e659e1 100755
--- a/test/system/casl2_cmd/cmd_jump__m/cmd
+++ b/test/system/casl2_cmd/cmd_jump__m/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JUMP/jump__m.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JUMP/jump__m.casl
diff --git a/test/system/casl2_cmd/cmd_jump__o/0.txt b/test/system/casl2_cmd/cmd_jump__o/0.txt
index 0028441..a93a64e 100644
--- a/test/system/casl2_cmd/cmd_jump__o/0.txt
+++ b/test/system/casl2_cmd/cmd_jump__o/0.txt
@@ -1,14 +1,3 @@
-;;; JUMP adr OF:0/SF:0/ZF:1
-MAIN START
- LD GR1,A
- SRL GR1,1
- JUMP TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC #0003
- END
Assemble ../../../../as/cmd/JUMP/jump__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jump__o/cmd b/test/system/casl2_cmd/cmd_jump__o/cmd
index ddd39d1..40e954e 100755
--- a/test/system/casl2_cmd/cmd_jump__o/cmd
+++ b/test/system/casl2_cmd/cmd_jump__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JUMP/jump__o.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JUMP/jump__o.casl
diff --git a/test/system/casl2_cmd/cmd_jump__p/0.txt b/test/system/casl2_cmd/cmd_jump__p/0.txt
index dc1c8c9..0df1480 100644
--- a/test/system/casl2_cmd/cmd_jump__p/0.txt
+++ b/test/system/casl2_cmd/cmd_jump__p/0.txt
@@ -1,14 +1,3 @@
-;;;JUMP adr OF:0/SF:0/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JUMP TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 1
- END
Assemble ../../../../as/cmd/JUMP/jump__p.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jump__p/cmd b/test/system/casl2_cmd/cmd_jump__p/cmd
index 3b431c7..37a646f 100755
--- a/test/system/casl2_cmd/cmd_jump__p/cmd
+++ b/test/system/casl2_cmd/cmd_jump__p/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JUMP/jump__p.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JUMP/jump__p.casl
diff --git a/test/system/casl2_cmd/cmd_jump__z/0.txt b/test/system/casl2_cmd/cmd_jump__z/0.txt
index 9e9927d..7bbe470 100644
--- a/test/system/casl2_cmd/cmd_jump__z/0.txt
+++ b/test/system/casl2_cmd/cmd_jump__z/0.txt
@@ -1,14 +1,3 @@
-;;;JUMP adr OF:0/SF:0/ZF:1
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JUMP TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 0
- END
Assemble ../../../../as/cmd/JUMP/jump__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jump__z/cmd b/test/system/casl2_cmd/cmd_jump__z/cmd
index 8991fcf..a23d158 100755
--- a/test/system/casl2_cmd/cmd_jump__z/cmd
+++ b/test/system/casl2_cmd/cmd_jump__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JUMP/jump__z.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JUMP/jump__z.casl
diff --git a/test/system/casl2_cmd/cmd_jze__m/0.txt b/test/system/casl2_cmd/cmd_jze__m/0.txt
index f2c8d3d..4397866 100644
--- a/test/system/casl2_cmd/cmd_jze__m/0.txt
+++ b/test/system/casl2_cmd/cmd_jze__m/0.txt
@@ -1,14 +1,3 @@
-;;; JZE adr OF:0/SF:1/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JZE TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC -1
- END
Assemble ../../../../as/cmd/JZE/jze__m.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jze__m/cmd b/test/system/casl2_cmd/cmd_jze__m/cmd
index 71a8af2..58a7d1a 100755
--- a/test/system/casl2_cmd/cmd_jze__m/cmd
+++ b/test/system/casl2_cmd/cmd_jze__m/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JZE/jze__m.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JZE/jze__m.casl
diff --git a/test/system/casl2_cmd/cmd_jze__o/0.txt b/test/system/casl2_cmd/cmd_jze__o/0.txt
index c9370f0..b486b33 100644
--- a/test/system/casl2_cmd/cmd_jze__o/0.txt
+++ b/test/system/casl2_cmd/cmd_jze__o/0.txt
@@ -1,14 +1,3 @@
-;;; JZE adr OF:1/SF:0/ZF:0
-MAIN START
- LD GR1,A
- SRL GR1,1
- JZE TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC #0003
- END
Assemble ../../../../as/cmd/JZE/jze__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jze__o/cmd b/test/system/casl2_cmd/cmd_jze__o/cmd
index 8652c72..1db3e42 100755
--- a/test/system/casl2_cmd/cmd_jze__o/cmd
+++ b/test/system/casl2_cmd/cmd_jze__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JZE/jze__o.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JZE/jze__o.casl
diff --git a/test/system/casl2_cmd/cmd_jze__p/0.txt b/test/system/casl2_cmd/cmd_jze__p/0.txt
index 634b349..c186fa4 100644
--- a/test/system/casl2_cmd/cmd_jze__p/0.txt
+++ b/test/system/casl2_cmd/cmd_jze__p/0.txt
@@ -1,14 +1,3 @@
-;;; JZE adr OF:0/SF:0/ZF:0
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JZE TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 1
- END
Assemble ../../../../as/cmd/JZE/jze__p.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jze__p/cmd b/test/system/casl2_cmd/cmd_jze__p/cmd
index 5883c20..49c1e46 100755
--- a/test/system/casl2_cmd/cmd_jze__p/cmd
+++ b/test/system/casl2_cmd/cmd_jze__p/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JZE/jze__p.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JZE/jze__p.casl
diff --git a/test/system/casl2_cmd/cmd_jze__z/0.txt b/test/system/casl2_cmd/cmd_jze__z/0.txt
index 293db5c..7862249 100644
--- a/test/system/casl2_cmd/cmd_jze__z/0.txt
+++ b/test/system/casl2_cmd/cmd_jze__z/0.txt
@@ -1,14 +1,3 @@
-;;; JZE adr OF:0/SF:0/ZF:1
-MAIN START
- LD GR1,A
- AND GR1,GR1
- JZE TO
- LAD GR1,0
- JUMP FIN
-TO LAD GR1,#FFFF
-FIN RET
-A DC 0
- END
Assemble ../../../../as/cmd/JZE/jze__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_jze__z/cmd b/test/system/casl2_cmd/cmd_jze__z/cmd
index 80bf28a..569e2a0 100755
--- a/test/system/casl2_cmd/cmd_jze__z/cmd
+++ b/test/system/casl2_cmd/cmd_jze__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/JZE/jze__z.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/JZE/jze__z.casl
diff --git a/test/system/casl2_cmd/cmd_lad_r_adr/0.txt b/test/system/casl2_cmd/cmd_lad_r_adr/0.txt
index b2c750f..ec13844 100644
--- a/test/system/casl2_cmd/cmd_lad_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_lad_r_adr/0.txt
@@ -1,8 +1,3 @@
-;;; LAD r,adr
-LAD START
- LAD GR1,5
- RET
- END
Assemble ../../../../as/cmd/LAD/lad_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_lad_r_adr/cmd b/test/system/casl2_cmd/cmd_lad_r_adr/cmd
index 2505e7f..ad57638 100755
--- a/test/system/casl2_cmd/cmd_lad_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_lad_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/LAD/lad_r_adr.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/LAD/lad_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_lad_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_lad_r_adr_x/0.txt
index 95f9f06..bd3ae74 100644
--- a/test/system/casl2_cmd/cmd_lad_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_lad_r_adr_x/0.txt
@@ -1,10 +1,3 @@
-;;; LAD r,adr,x
-MAIN START
- LD GR1,A
- LAD GR1,1,GR1
- RET
-A DC 3
- END
Assemble ../../../../as/cmd/LAD/lad_r_adr_x.casl (0)
diff --git a/test/system/casl2_cmd/cmd_lad_r_adr_x/cmd b/test/system/casl2_cmd/cmd_lad_r_adr_x/cmd
index 0b04106..b15aeda 100755
--- a/test/system/casl2_cmd/cmd_lad_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_lad_r_adr_x/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/LAD/lad_r_adr_x.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/LAD/lad_r_adr_x.casl
diff --git a/test/system/casl2_cmd/cmd_lad_r_adr_x__o/0.txt b/test/system/casl2_cmd/cmd_lad_r_adr_x__o/0.txt
index 1c831c2..8575f63 100644
--- a/test/system/casl2_cmd/cmd_lad_r_adr_x__o/0.txt
+++ b/test/system/casl2_cmd/cmd_lad_r_adr_x__o/0.txt
@@ -1,8 +1,3 @@
-LAD1 START
- LAD GR1,10
- LAD GR1,65534,GR1
- RET
- END
Assemble ../../../../as/cmd/LAD/lad_r_adr_x__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_lad_r_adr_x__o/cmd b/test/system/casl2_cmd/cmd_lad_r_adr_x__o/cmd
index e4d732d..50a0956 100755
--- a/test/system/casl2_cmd/cmd_lad_r_adr_x__o/cmd
+++ b/test/system/casl2_cmd/cmd_lad_r_adr_x__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/LAD/lad_r_adr_x__o.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/LAD/lad_r_adr_x__o.casl
diff --git a/test/system/casl2_cmd/cmd_lad_r_adr_x__s/0.txt b/test/system/casl2_cmd/cmd_lad_r_adr_x__s/0.txt
index ebf228b..3666d0e 100644
--- a/test/system/casl2_cmd/cmd_lad_r_adr_x__s/0.txt
+++ b/test/system/casl2_cmd/cmd_lad_r_adr_x__s/0.txt
@@ -1,10 +1,3 @@
-;;; LAD r,adr,x
-MAIN START
- LD GR1,A
- LAD GR1,-1,GR1
- RET
-A DC 3
- END
Assemble ../../../../as/cmd/LAD/lad_r_adr_x__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_lad_r_adr_x__s/cmd b/test/system/casl2_cmd/cmd_lad_r_adr_x__s/cmd
index 336c55d..c5e2971 100755
--- a/test/system/casl2_cmd/cmd_lad_r_adr_x__s/cmd
+++ b/test/system/casl2_cmd/cmd_lad_r_adr_x__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/LAD/lad_r_adr_x__s.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/LAD/lad_r_adr_x__s.casl
diff --git a/test/system/casl2_cmd/cmd_ld_r1_r2/0.txt b/test/system/casl2_cmd/cmd_ld_r1_r2/0.txt
index 8778a05..55970b7 100644
--- a/test/system/casl2_cmd/cmd_ld_r1_r2/0.txt
+++ b/test/system/casl2_cmd/cmd_ld_r1_r2/0.txt
@@ -1,16 +1,3 @@
-MAIN START
- LAD GR1,A
- LD GR0,0,GR1
- LD GR2,2,GR1
- LD GR3,3,GR1
- LD GR4,4,GR1
- LD GR5,5,GR1
- LD GR6,6,GR1
- LD GR7,7,GR1
- LD GR1,1,GR1
- RET
-A DC 2,3,5,7,11,13,17,19
- END
Assemble ../../../../as/cmd/LD/ld_r1_r2.casl (0)
diff --git a/test/system/casl2_cmd/cmd_ld_r1_r2/cmd b/test/system/casl2_cmd/cmd_ld_r1_r2/cmd
index 703b4b8..583f797 100755
--- a/test/system/casl2_cmd/cmd_ld_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_ld_r1_r2/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/LD/ld_r1_r2.casl
../../../../casl2 -atd -M32 ../../../../as/cmd/LD/ld_r1_r2.casl
diff --git a/test/system/casl2_cmd/cmd_ld_r_adr/0.txt b/test/system/casl2_cmd/cmd_ld_r_adr/0.txt
index 793e226..ae3984c 100644
--- a/test/system/casl2_cmd/cmd_ld_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_ld_r_adr/0.txt
@@ -1,12 +1,3 @@
-MAIN START
- LD GR0,A
- LD GR0,B
- LD GR0,C
- RET
-A DC 7
-B DC -7
-C DC 0
- END
Assemble ../../../../as/cmd/LD/ld_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_ld_r_adr/cmd b/test/system/casl2_cmd/cmd_ld_r_adr/cmd
index 874760b..5c6ec22 100755
--- a/test/system/casl2_cmd/cmd_ld_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_ld_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/LD/ld_r_adr.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/LD/ld_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_ld_r_adr__l/0.txt b/test/system/casl2_cmd/cmd_ld_r_adr__l/0.txt
index 3db4f3b..d0f8952 100644
--- a/test/system/casl2_cmd/cmd_ld_r_adr__l/0.txt
+++ b/test/system/casl2_cmd/cmd_ld_r_adr__l/0.txt
@@ -1,100 +1,3 @@
-;;; LD r,adr
-MAIN START
- LD GR1,='"'
- LD GR1,='#'
- LD GR1,='$'
- LD GR1,='%'
- LD GR1,='&'
- LD GR1,=''''
- LD GR1,='('
- LD GR1,=')'
- LD GR1,='*'
- LD GR1,='+'
- LD GR1,=','
- LD GR1,='-'
- LD GR1,='.'
- LD GR1,='/'
- LD GR1,='0'
- LD GR1,='1'
- LD GR1,='2'
- LD GR1,='3'
- LD GR1,='4'
- LD GR1,='5'
- LD GR1,='6'
- LD GR1,='7'
- LD GR1,='8'
- LD GR1,='9'
- LD GR1,=':'
- LD GR1,=';'
- LD GR1,='<'
- LD GR1,='='
- LD GR1,='>'
- LD GR1,='?'
- LD GR1,='@'
- LD GR1,='A'
- LD GR1,='B'
- LD GR1,='C'
- LD GR1,='D'
- LD GR1,='E'
- LD GR1,='F'
- LD GR1,='G'
- LD GR1,='H'
- LD GR1,='I'
- LD GR1,='J'
- LD GR1,='K'
- LD GR1,='L'
- LD GR1,='M'
- LD GR1,='N'
- LD GR1,='O'
- LD GR1,='P'
- LD GR1,='Q'
- LD GR1,='R'
- LD GR1,='S'
- LD GR1,='T'
- LD GR1,='U'
- LD GR1,='V'
- LD GR1,='W'
- LD GR1,='X'
- LD GR1,='Y'
- LD GR1,='Z'
- LD GR1,='['
- LD GR1,='\'
- LD GR1,=']'
- LD GR1,='^'
- LD GR1,='_'
- LD GR1,='`'
- LD GR1,='a'
- LD GR1,='b'
- LD GR1,='c'
- LD GR1,='d'
- LD GR1,='e'
- LD GR1,='f'
- LD GR1,='g'
- LD GR1,='h'
- LD GR1,='i'
- LD GR1,='j'
- LD GR1,='k'
- LD GR1,='l'
- LD GR1,='m'
- LD GR1,='n'
- LD GR1,='o'
- LD GR1,='p'
- LD GR1,='q'
- LD GR1,='r'
- LD GR1,='s'
- LD GR1,='t'
- LD GR1,='u'
- LD GR1,='v'
- LD GR1,='w'
- LD GR1,='x'
- LD GR1,='y'
- LD GR1,='z'
- LD GR1,='{'
- LD GR1,='|'
- LD GR1,='}'
- LD GR1,='~'
- RET
- END
Assemble ../../../../as/cmd/LD/ld_r_adr__l.casl (0)
diff --git a/test/system/casl2_cmd/cmd_ld_r_adr__l/cmd b/test/system/casl2_cmd/cmd_ld_r_adr__l/cmd
index 4aae62b..2fdb06b 100755
--- a/test/system/casl2_cmd/cmd_ld_r_adr__l/cmd
+++ b/test/system/casl2_cmd/cmd_ld_r_adr__l/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/LD/ld_r_adr__l.casl
../../../../casl2 -atd ../../../../as/cmd/LD/ld_r_adr__l.casl
diff --git a/test/system/casl2_cmd/cmd_ld_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_ld_r_adr_x/0.txt
index be1cf9c..db916e8 100644
--- a/test/system/casl2_cmd/cmd_ld_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_ld_r_adr_x/0.txt
@@ -1,42 +1,3 @@
-MAIN START
- LAD GR1,#FFFF
- LD GR2,GR1
- LD GR3,GR1
- LD GR4,GR1
- LD GR5,GR1
- LD GR6,GR1
- LD GR7,GR1
- LD GR0,GR1
- LD GR1,GR1
- LAD GR2,#FFFE
- LD GR2,GR2
- LD GR3,GR2
- LD GR4,GR2
- LD GR5,GR2
- LD GR6,GR2
- LD GR7,GR2
- LD GR0,GR2
- LD GR1,GR2
- LAD GR3,#FFFE
- LD GR3,GR3
- LD GR4,GR3
- LD GR5,GR3
- LD GR6,GR3
- LD GR7,GR3
- LD GR0,GR3
- LD GR1,GR3
- LD GR2,GR3
- LAD GR0,1
- LD GR1,GR0
- LD GR2,GR0
- LD GR3,GR0
- LD GR4,GR0
- LD GR5,GR0
- LD GR6,GR0
- LD GR7,GR0
- LD GR0,GR0
- RET
- END
Assemble ../../../../as/cmd/LD/ld_r_adr_x.casl (0)
diff --git a/test/system/casl2_cmd/cmd_ld_r_adr_x/cmd b/test/system/casl2_cmd/cmd_ld_r_adr_x/cmd
index 15aa343..b7de88e 100755
--- a/test/system/casl2_cmd/cmd_ld_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_ld_r_adr_x/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/LD/ld_r_adr_x.casl
../../../../casl2 -atd -M64 ../../../../as/cmd/LD/ld_r_adr_x.casl
diff --git a/test/system/casl2_cmd/cmd_nop/0.txt b/test/system/casl2_cmd/cmd_nop/0.txt
index 9d83078..f2b4589 100644
--- a/test/system/casl2_cmd/cmd_nop/0.txt
+++ b/test/system/casl2_cmd/cmd_nop/0.txt
@@ -1,16 +1,3 @@
-;;; NOP
-MAIN START
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- RET
- END
Assemble ../../../../as/cmd/NOP/nop.casl (0)
diff --git a/test/system/casl2_cmd/cmd_nop/cmd b/test/system/casl2_cmd/cmd_nop/cmd
index d711ca9..7e39f62 100755
--- a/test/system/casl2_cmd/cmd_nop/cmd
+++ b/test/system/casl2_cmd/cmd_nop/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/NOP/nop.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/NOP/nop.casl
diff --git a/test/system/casl2_cmd/cmd_or_r1_r2/0.txt b/test/system/casl2_cmd/cmd_or_r1_r2/0.txt
index 9e0326a..0b605cf 100644
--- a/test/system/casl2_cmd/cmd_or_r1_r2/0.txt
+++ b/test/system/casl2_cmd/cmd_or_r1_r2/0.txt
@@ -1,12 +1,3 @@
-;;; OR r1,r2
-MAIN START
- LD GR1,A
- LD GR2,B
- OR GR1,GR2
- RET
-A DC #3000
-B DC #4FFF
- END
Assemble ../../../../as/cmd/OR/or_r1_r2.casl (0)
diff --git a/test/system/casl2_cmd/cmd_or_r1_r2/cmd b/test/system/casl2_cmd/cmd_or_r1_r2/cmd
index 876aef9..3f2c73c 100755
--- a/test/system/casl2_cmd/cmd_or_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_or_r1_r2/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/OR/or_r1_r2.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/OR/or_r1_r2.casl
diff --git a/test/system/casl2_cmd/cmd_or_r_adr/0.txt b/test/system/casl2_cmd/cmd_or_r_adr/0.txt
index 6812ec4..a6a17ea 100644
--- a/test/system/casl2_cmd/cmd_or_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_or_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; OR r,adr
-MAIN START
- LD GR1,A
- OR GR1,B
- RET
-A DC #3000
-B DC #4FFF
- END
Assemble ../../../../as/cmd/OR/or_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_or_r_adr/cmd b/test/system/casl2_cmd/cmd_or_r_adr/cmd
index 9506731..e6c5bee 100755
--- a/test/system/casl2_cmd/cmd_or_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_or_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/OR/or_r_adr.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/OR/or_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_or_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_or_r_adr__s/0.txt
index 93b5de7..92bd7d6 100644
--- a/test/system/casl2_cmd/cmd_or_r_adr__s/0.txt
+++ b/test/system/casl2_cmd/cmd_or_r_adr__s/0.txt
@@ -1,11 +1,3 @@
-;;; OR r,adr æ¼ç®çµæã®ç¬¦å·ãè²
-MAIN START
- LD GR1,A
- OR GR1,B
- RET
-A DC #8000
-B DC #FFFF
- END
Assemble ../../../../as/cmd/OR/or_r_adr__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_or_r_adr__s/cmd b/test/system/casl2_cmd/cmd_or_r_adr__s/cmd
index 0275808..ad3f210 100755
--- a/test/system/casl2_cmd/cmd_or_r_adr__s/cmd
+++ b/test/system/casl2_cmd/cmd_or_r_adr__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/OR/or_r_adr__s.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/OR/or_r_adr__s.casl
diff --git a/test/system/casl2_cmd/cmd_or_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_or_r_adr__z/0.txt
index fa37ae2..0c07b4b 100644
--- a/test/system/casl2_cmd/cmd_or_r_adr__z/0.txt
+++ b/test/system/casl2_cmd/cmd_or_r_adr__z/0.txt
@@ -1,11 +1,3 @@
-;;; OR r,adr æ¼ç®çµæãé¶
-MAIN START
- LD GR1,A
- OR GR1,B
- RET
-A DC #0001
-B DC #FFFE
- END
Assemble ../../../../as/cmd/OR/or_r_adr__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_or_r_adr__z/cmd b/test/system/casl2_cmd/cmd_or_r_adr__z/cmd
index b165b87..488221a 100755
--- a/test/system/casl2_cmd/cmd_or_r_adr__z/cmd
+++ b/test/system/casl2_cmd/cmd_or_r_adr__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/OR/or_r_adr__z.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/OR/or_r_adr__z.casl
diff --git a/test/system/casl2_cmd/cmd_or_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_or_r_adr_x/0.txt
index b3db9d0..e9e182e 100644
--- a/test/system/casl2_cmd/cmd_or_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_or_r_adr_x/0.txt
@@ -1,12 +1,3 @@
-;;; OR r,adr,x
-MAIN START
- LD GR1,A
- LAD GR2,1
- OR GR1,A,GR2
- RET
-A DC #3000
- DC #4FFF
- END
Assemble ../../../../as/cmd/OR/or_r_adr_x.casl (0)
diff --git a/test/system/casl2_cmd/cmd_or_r_adr_x/cmd b/test/system/casl2_cmd/cmd_or_r_adr_x/cmd
index 3751f16..c6e5876 100755
--- a/test/system/casl2_cmd/cmd_or_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_or_r_adr_x/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/OR/or_r_adr_x.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/OR/or_r_adr_x.casl
diff --git a/test/system/casl2_cmd/cmd_out/0.txt b/test/system/casl2_cmd/cmd_out/0.txt
index 4886e4b..05361b3 100644
--- a/test/system/casl2_cmd/cmd_out/0.txt
+++ b/test/system/casl2_cmd/cmd_out/0.txt
@@ -1,19 +1,3 @@
-;;; OUT buf,len
-MAIN START
- OUT BUF1,L1
- OUT BUF2,L2
- OUT BUF3,L3
- OUT BUF4,L4
- RET
-BUF1 DC '0',9,'1',10 ; TABãæ¹è¡
-L1 DC 4
-BUF2 DC ' !"#$%&''()*+,-./0123456789:;<=>?'
-L2 DC 32
-BUF3 DC '@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_'
-L3 DC 32
-BUF4 DC '`abcdefghijklmnopqrstuvwxyz{|}~'
-L4 DC 31
- END
Assemble ../../../../as/cmd/OUT/out.casl (0)
diff --git a/test/system/casl2_cmd/cmd_out/cmd b/test/system/casl2_cmd/cmd_out/cmd
index 42a44b6..fca1fa4 100755
--- a/test/system/casl2_cmd/cmd_out/cmd
+++ b/test/system/casl2_cmd/cmd_out/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/OUT/out.casl
../../../../casl2 -atd -M256 ../../../../as/cmd/OUT/out.casl
diff --git a/test/system/casl2_cmd/cmd_push_pop__0/0.txt b/test/system/casl2_cmd/cmd_push_pop__0/0.txt
index 1e6eb9a..db899c0 100644
--- a/test/system/casl2_cmd/cmd_push_pop__0/0.txt
+++ b/test/system/casl2_cmd/cmd_push_pop__0/0.txt
@@ -1,30 +1,3 @@
-;;; PUSH / POP å¤ã®å¾©å
-MAIN START
- LD GR1,A
- LD GR1,0,GR7
- LD GR2,1,GR7
- LD GR3,2,GR7
- LD GR4,3,GR7
- LD GR5,4,GR7
- LD GR6,5,GR7
- LD GR7,6,GR7
- PUSH 0,GR1
- PUSH 0,GR2
- PUSH 0,GR3
- PUSH 0,GR4
- PUSH 0,GR5
- PUSH 0,GR6
- PUSH 0,GR7
- POP GR7
- POP GR6
- POP GR5
- POP GR4
- POP GR3
- POP GR2
- POP GR1
- RET
-A DC 1,2,3,4,5,6,7
- END
Assemble ../../../../as/cmd/POP/push_pop__0.casl (0)
diff --git a/test/system/casl2_cmd/cmd_push_pop__0/cmd b/test/system/casl2_cmd/cmd_push_pop__0/cmd
index ea40129..7d6ca43 100755
--- a/test/system/casl2_cmd/cmd_push_pop__0/cmd
+++ b/test/system/casl2_cmd/cmd_push_pop__0/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/POP/push_pop__0.casl
../../../../casl2 -atd -M64 ../../../../as/cmd/POP/push_pop__0.casl
diff --git a/test/system/casl2_cmd/cmd_push_pop__1/0.txt b/test/system/casl2_cmd/cmd_push_pop__1/0.txt
index c196a60..6c5d43c 100644
--- a/test/system/casl2_cmd/cmd_push_pop__1/0.txt
+++ b/test/system/casl2_cmd/cmd_push_pop__1/0.txt
@@ -1,30 +1,3 @@
-;;; PUSH / POP å¤ã®äº¤æ
-MAIN START
- LD GR1,A
- LD GR1,0,GR7
- LD GR2,1,GR7
- LD GR3,2,GR7
- LD GR4,3,GR7
- LD GR5,4,GR7
- LD GR6,5,GR7
- LD GR7,6,GR7
- PUSH 0,GR1
- PUSH 0,GR2
- PUSH 0,GR3
- PUSH 0,GR4
- PUSH 0,GR5
- PUSH 0,GR6
- PUSH 0,GR7
- POP GR1
- POP GR2
- POP GR3
- POP GR4
- POP GR5
- POP GR6
- POP GR7
- RET
-A DC 1,2,3,4,5,6,7
- END
Assemble ../../../../as/cmd/POP/push_pop__1.casl (0)
diff --git a/test/system/casl2_cmd/cmd_push_pop__1/cmd b/test/system/casl2_cmd/cmd_push_pop__1/cmd
index 32e2691..acbfc85 100755
--- a/test/system/casl2_cmd/cmd_push_pop__1/cmd
+++ b/test/system/casl2_cmd/cmd_push_pop__1/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/POP/push_pop__1.casl
../../../../casl2 -atd -M64 ../../../../as/cmd/POP/push_pop__1.casl
diff --git a/test/system/casl2_cmd/cmd_rpop/0.txt b/test/system/casl2_cmd/cmd_rpop/0.txt
index 5c59697..ce1a643 100644
--- a/test/system/casl2_cmd/cmd_rpop/0.txt
+++ b/test/system/casl2_cmd/cmd_rpop/0.txt
@@ -1,24 +1,3 @@
-;;; RPOP å¤ã®å¾©å
-MAIN START
- LD GR1,A
- LD GR1,0,GR7
- LD GR2,1,GR7
- LD GR3,2,GR7
- LD GR4,3,GR7
- LD GR5,4,GR7
- LD GR6,5,GR7
- LD GR7,6,GR7
- PUSH 0,GR1
- PUSH 0,GR2
- PUSH 0,GR3
- PUSH 0,GR4
- PUSH 0,GR5
- PUSH 0,GR6
- PUSH 0,GR7
- RPOP
- RET
-A DC 1,2,3,4,5,6,7
- END
Assemble ../../../../as/cmd/RPOP/rpop.casl (0)
diff --git a/test/system/casl2_cmd/cmd_rpop/cmd b/test/system/casl2_cmd/cmd_rpop/cmd
index 40b9984..5d23525 100755
--- a/test/system/casl2_cmd/cmd_rpop/cmd
+++ b/test/system/casl2_cmd/cmd_rpop/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/RPOP/rpop.casl
../../../../casl2 -atd -M64 ../../../../as/cmd/RPOP/rpop.casl
diff --git a/test/system/casl2_cmd/cmd_rpush/0.txt b/test/system/casl2_cmd/cmd_rpush/0.txt
index c814f42..f8dff81 100644
--- a/test/system/casl2_cmd/cmd_rpush/0.txt
+++ b/test/system/casl2_cmd/cmd_rpush/0.txt
@@ -1,24 +1,3 @@
-;;; PUSH / POP å¤ã®å¾©å
-MAIN START
- LD GR1,A
- LD GR1,0,GR7
- LD GR2,1,GR7
- LD GR3,2,GR7
- LD GR4,3,GR7
- LD GR5,4,GR7
- LD GR6,5,GR7
- LD GR7,6,GR7
- RPUSH
- POP GR7
- POP GR6
- POP GR5
- POP GR4
- POP GR3
- POP GR2
- POP GR1
- RET
-A DC 1,2,3,4,5,6,7
- END
Assemble ../../../../as/cmd/RPUSH/rpush.casl (0)
diff --git a/test/system/casl2_cmd/cmd_rpush/cmd b/test/system/casl2_cmd/cmd_rpush/cmd
index e749978..a247cc0 100755
--- a/test/system/casl2_cmd/cmd_rpush/cmd
+++ b/test/system/casl2_cmd/cmd_rpush/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/RPUSH/rpush.casl
../../../../casl2 -atd -M64 ../../../../as/cmd/RPUSH/rpush.casl
diff --git a/test/system/casl2_cmd/cmd_sla/0.txt b/test/system/casl2_cmd/cmd_sla/0.txt
index c21ac98..f592f29 100644
--- a/test/system/casl2_cmd/cmd_sla/0.txt
+++ b/test/system/casl2_cmd/cmd_sla/0.txt
@@ -1,9 +1,3 @@
-;;; SLA r,adr
-MAIN START
- LAD GR1,3
- SLA GR1,13
- RET
- END
Assemble ../../../../as/cmd/SLA/sla.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sla/cmd b/test/system/casl2_cmd/cmd_sla/cmd
index 2130a50..6cc8c06 100755
--- a/test/system/casl2_cmd/cmd_sla/cmd
+++ b/test/system/casl2_cmd/cmd_sla/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLA/sla.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SLA/sla.casl
diff --git a/test/system/casl2_cmd/cmd_sla__o/0.txt b/test/system/casl2_cmd/cmd_sla__o/0.txt
index f3a3d8c..b66a7c5 100644
--- a/test/system/casl2_cmd/cmd_sla__o/0.txt
+++ b/test/system/casl2_cmd/cmd_sla__o/0.txt
@@ -1,9 +1,3 @@
-;;; SLA r,adr ãªã¼ãã¼ããã¼
-MAIN START
- LAD GR1,3
- SLA GR1,14
- RET
- END
Assemble ../../../../as/cmd/SLA/sla__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sla__o/cmd b/test/system/casl2_cmd/cmd_sla__o/cmd
index 3bf8e22..a4cc14e 100755
--- a/test/system/casl2_cmd/cmd_sla__o/cmd
+++ b/test/system/casl2_cmd/cmd_sla__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLA/sla__o.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SLA/sla__o.casl
diff --git a/test/system/casl2_cmd/cmd_sla__os/0.txt b/test/system/casl2_cmd/cmd_sla__os/0.txt
index d97888d..a423ad5 100644
--- a/test/system/casl2_cmd/cmd_sla__os/0.txt
+++ b/test/system/casl2_cmd/cmd_sla__os/0.txt
@@ -1,9 +1,3 @@
-;;; SLA r,adr è² æ°ã®ãªã¼ãã¼ããã¼
-MAIN START
- LAD GR1,#8003
- SLA GR1,14
- RET
- END
Assemble ../../../../as/cmd/SLA/sla__os.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sla__os/cmd b/test/system/casl2_cmd/cmd_sla__os/cmd
index 7caeaed..07dde95 100755
--- a/test/system/casl2_cmd/cmd_sla__os/cmd
+++ b/test/system/casl2_cmd/cmd_sla__os/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLA/sla__os.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SLA/sla__os.casl
diff --git a/test/system/casl2_cmd/cmd_sla__oz/0.txt b/test/system/casl2_cmd/cmd_sla__oz/0.txt
index 3441df3..f4144d0 100644
--- a/test/system/casl2_cmd/cmd_sla__oz/0.txt
+++ b/test/system/casl2_cmd/cmd_sla__oz/0.txt
@@ -1,9 +1,3 @@
-;;; SLA r,adr ãªã¼ãã¼ããã¼ããçµæã¯é¶
-MAIN START
- LAD GR1,3
- SLA GR1,15
- RET
- END
Assemble ../../../../as/cmd/SLA/sla__oz.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sla__oz/cmd b/test/system/casl2_cmd/cmd_sla__oz/cmd
index c001a01..f6b869d 100755
--- a/test/system/casl2_cmd/cmd_sla__oz/cmd
+++ b/test/system/casl2_cmd/cmd_sla__oz/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLA/sla__oz.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SLA/sla__oz.casl
diff --git a/test/system/casl2_cmd/cmd_sla__s/0.txt b/test/system/casl2_cmd/cmd_sla__s/0.txt
index 491844a..efea280 100644
--- a/test/system/casl2_cmd/cmd_sla__s/0.txt
+++ b/test/system/casl2_cmd/cmd_sla__s/0.txt
@@ -1,9 +1,3 @@
-;;; SLA r,adr è² æ°
-SLA2 START BEGIN
-BEGIN LAD GR1,#8003
- SLA GR1,13
- RET
- END
Assemble ../../../../as/cmd/SLA/sla__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sla__s/cmd b/test/system/casl2_cmd/cmd_sla__s/cmd
index 69a7316..b57b32e 100755
--- a/test/system/casl2_cmd/cmd_sla__s/cmd
+++ b/test/system/casl2_cmd/cmd_sla__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLA/sla__s.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SLA/sla__s.casl
diff --git a/test/system/casl2_cmd/cmd_sla__z/0.txt b/test/system/casl2_cmd/cmd_sla__z/0.txt
index 9e228ed..4b9deed 100644
--- a/test/system/casl2_cmd/cmd_sla__z/0.txt
+++ b/test/system/casl2_cmd/cmd_sla__z/0.txt
@@ -1,9 +1,3 @@
-;;; SLA r,adr çµæã¯é¶
-MAIN START
- LAD GR1,2
- SLA GR1,15
- RET
- END
Assemble ../../../../as/cmd/SLA/sla__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sla__z/cmd b/test/system/casl2_cmd/cmd_sla__z/cmd
index 5f50844..4bc3a2b 100755
--- a/test/system/casl2_cmd/cmd_sla__z/cmd
+++ b/test/system/casl2_cmd/cmd_sla__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLA/sla__z.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SLA/sla__z.casl
diff --git a/test/system/casl2_cmd/cmd_sll/0.txt b/test/system/casl2_cmd/cmd_sll/0.txt
index 95fad07..19cd585 100644
--- a/test/system/casl2_cmd/cmd_sll/0.txt
+++ b/test/system/casl2_cmd/cmd_sll/0.txt
@@ -1,9 +1,3 @@
-;;; SLL r,adr
-MAIN START
- LAD GR1,3
- SLL GR1,13
- RET
- END
Assemble ../../../../as/cmd/SLL/sll.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sll/cmd b/test/system/casl2_cmd/cmd_sll/cmd
index 7211946..c1f66c7 100755
--- a/test/system/casl2_cmd/cmd_sll/cmd
+++ b/test/system/casl2_cmd/cmd_sll/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLL/sll.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SLL/sll.casl
diff --git a/test/system/casl2_cmd/cmd_sll__o/0.txt b/test/system/casl2_cmd/cmd_sll__o/0.txt
index b1c7590..68d106e 100644
--- a/test/system/casl2_cmd/cmd_sll__o/0.txt
+++ b/test/system/casl2_cmd/cmd_sll__o/0.txt
@@ -1,9 +1,3 @@
-;;; SLL r,adr æ£æ°ã®ãªã¼ãã¼ããã¼
-MAIN START
- LAD GR1,2
- SLL GR1,15
- RET
- END
Assemble ../../../../as/cmd/SLL/sll__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sll__o/cmd b/test/system/casl2_cmd/cmd_sll__o/cmd
index a65d61f..35198a6 100755
--- a/test/system/casl2_cmd/cmd_sll__o/cmd
+++ b/test/system/casl2_cmd/cmd_sll__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLL/sll__o.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SLL/sll__o.casl
diff --git a/test/system/casl2_cmd/cmd_sll__os/0.txt b/test/system/casl2_cmd/cmd_sll__os/0.txt
index 237abfe..d0e0775 100644
--- a/test/system/casl2_cmd/cmd_sll__os/0.txt
+++ b/test/system/casl2_cmd/cmd_sll__os/0.txt
@@ -1,9 +1,3 @@
-;;; SLL r,adr 符å·ãã©ã°ãªã³ã§ããªã¼ãã¼ããã¼
-MAIN START
- LAD GR1,3
- SLL GR1,15
- RET
- END
Assemble ../../../../as/cmd/SLL/sll__os.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sll__os/cmd b/test/system/casl2_cmd/cmd_sll__os/cmd
index c5fe7c9..9fac729 100755
--- a/test/system/casl2_cmd/cmd_sll__os/cmd
+++ b/test/system/casl2_cmd/cmd_sll__os/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLL/sll__os.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SLL/sll__os.casl
diff --git a/test/system/casl2_cmd/cmd_sll__oz/0.txt b/test/system/casl2_cmd/cmd_sll__oz/0.txt
index be2235c..0dc30fb 100644
--- a/test/system/casl2_cmd/cmd_sll__oz/0.txt
+++ b/test/system/casl2_cmd/cmd_sll__oz/0.txt
@@ -1,9 +1,3 @@
-;;; SLL r,adr ãªã¼ãã¼ããã¼ããçµæã¯é¶
-MAIN START
- LAD GR1,3
- SLL GR1,16
- RET
- END
Assemble ../../../../as/cmd/SLL/sll__oz.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sll__oz/cmd b/test/system/casl2_cmd/cmd_sll__oz/cmd
index 3b1c703..f7cb695 100755
--- a/test/system/casl2_cmd/cmd_sll__oz/cmd
+++ b/test/system/casl2_cmd/cmd_sll__oz/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLL/sll__oz.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SLL/sll__oz.casl
diff --git a/test/system/casl2_cmd/cmd_sll__s/0.txt b/test/system/casl2_cmd/cmd_sll__s/0.txt
index c7f07ce..346b45a 100644
--- a/test/system/casl2_cmd/cmd_sll__s/0.txt
+++ b/test/system/casl2_cmd/cmd_sll__s/0.txt
@@ -1,9 +1,3 @@
-;;; SLL r,adr è² æ°
-SLL2 START BEGIN
-BEGIN LAD GR1,3
- SLL GR1,14
- RET
- END
Assemble ../../../../as/cmd/SLL/sll__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sll__s/cmd b/test/system/casl2_cmd/cmd_sll__s/cmd
index 3ed3e8e..0961fce 100755
--- a/test/system/casl2_cmd/cmd_sll__s/cmd
+++ b/test/system/casl2_cmd/cmd_sll__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLL/sll__s.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SLL/sll__s.casl
diff --git a/test/system/casl2_cmd/cmd_sll__z/0.txt b/test/system/casl2_cmd/cmd_sll__z/0.txt
index 557511b..8013c26 100644
--- a/test/system/casl2_cmd/cmd_sll__z/0.txt
+++ b/test/system/casl2_cmd/cmd_sll__z/0.txt
@@ -1,9 +1,3 @@
-;;; SLL r,adr çµæã¯é¶
-MAIN START
- LAD GR1,2
- SLL GR1,17
- RET
- END
Assemble ../../../../as/cmd/SLL/sll__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sll__z/cmd b/test/system/casl2_cmd/cmd_sll__z/cmd
index b7bb3cd..0b24fe5 100755
--- a/test/system/casl2_cmd/cmd_sll__z/cmd
+++ b/test/system/casl2_cmd/cmd_sll__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SLL/sll__z.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SLL/sll__z.casl
diff --git a/test/system/casl2_cmd/cmd_sra/0.txt b/test/system/casl2_cmd/cmd_sra/0.txt
index 0833474..c317efe 100644
--- a/test/system/casl2_cmd/cmd_sra/0.txt
+++ b/test/system/casl2_cmd/cmd_sra/0.txt
@@ -1,9 +1,3 @@
-;;; SRA r,adr
-MAIN START
- LAD GR1,#6000
- SRA GR1,13
- RET
- END
Assemble ../../../../as/cmd/SRA/sra.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sra/cmd b/test/system/casl2_cmd/cmd_sra/cmd
index 5616696..6b5a5bf 100755
--- a/test/system/casl2_cmd/cmd_sra/cmd
+++ b/test/system/casl2_cmd/cmd_sra/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRA/sra.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SRA/sra.casl
diff --git a/test/system/casl2_cmd/cmd_sra__o/0.txt b/test/system/casl2_cmd/cmd_sra__o/0.txt
index bfe932c..1e1fa23 100644
--- a/test/system/casl2_cmd/cmd_sra__o/0.txt
+++ b/test/system/casl2_cmd/cmd_sra__o/0.txt
@@ -1,9 +1,3 @@
-;;; SRA r,adr æ£æ°ã®ãªã¼ãã¼ããã¼
-MAIN START
- LAD GR1,#6000
- SRA GR1,14
- RET
- END
Assemble ../../../../as/cmd/SRA/sra__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sra__o/cmd b/test/system/casl2_cmd/cmd_sra__o/cmd
index c814a67..39813ee 100755
--- a/test/system/casl2_cmd/cmd_sra__o/cmd
+++ b/test/system/casl2_cmd/cmd_sra__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRA/sra__o.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SRA/sra__o.casl
diff --git a/test/system/casl2_cmd/cmd_sra__os/0.txt b/test/system/casl2_cmd/cmd_sra__os/0.txt
index d510482..40da7ae 100644
--- a/test/system/casl2_cmd/cmd_sra__os/0.txt
+++ b/test/system/casl2_cmd/cmd_sra__os/0.txt
@@ -1,9 +1,3 @@
-;;; SRA r,adr è² æ°ã®ãªã¼ãã¼ããã¼
-MAIN START
- LAD GR1,#A000
- SRA GR1,14
- RET
- END
Assemble ../../../../as/cmd/SRA/sra__os.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sra__os/cmd b/test/system/casl2_cmd/cmd_sra__os/cmd
index 9459779..315037d 100755
--- a/test/system/casl2_cmd/cmd_sra__os/cmd
+++ b/test/system/casl2_cmd/cmd_sra__os/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRA/sra__os.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SRA/sra__os.casl
diff --git a/test/system/casl2_cmd/cmd_sra__oz/0.txt b/test/system/casl2_cmd/cmd_sra__oz/0.txt
index 3b54f18..c1065b2 100644
--- a/test/system/casl2_cmd/cmd_sra__oz/0.txt
+++ b/test/system/casl2_cmd/cmd_sra__oz/0.txt
@@ -1,9 +1,3 @@
-;;; SRA r,adr ãªã¼ãã¼ããã¼ããçµæã¯é¶
-MAIN START
- LAD GR1,#6000
- SRA GR1,15
- RET
- END
Assemble ../../../../as/cmd/SRA/sra__oz.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sra__oz/cmd b/test/system/casl2_cmd/cmd_sra__oz/cmd
index 82c1c42..c361e1a 100755
--- a/test/system/casl2_cmd/cmd_sra__oz/cmd
+++ b/test/system/casl2_cmd/cmd_sra__oz/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRA/sra__oz.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SRA/sra__oz.casl
diff --git a/test/system/casl2_cmd/cmd_sra__s/0.txt b/test/system/casl2_cmd/cmd_sra__s/0.txt
index 9c50e3f..97179cc 100644
--- a/test/system/casl2_cmd/cmd_sra__s/0.txt
+++ b/test/system/casl2_cmd/cmd_sra__s/0.txt
@@ -1,9 +1,3 @@
-;;; SRA r,adr è² æ°
-SRA2 START BEGIN
-BEGIN LAD GR1,#A000
- SRA GR1,13
- RET
- END
Assemble ../../../../as/cmd/SRA/sra__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sra__s/cmd b/test/system/casl2_cmd/cmd_sra__s/cmd
index 2c7bbae..9f4dabb 100755
--- a/test/system/casl2_cmd/cmd_sra__s/cmd
+++ b/test/system/casl2_cmd/cmd_sra__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRA/sra__s.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SRA/sra__s.casl
diff --git a/test/system/casl2_cmd/cmd_sra__z/0.txt b/test/system/casl2_cmd/cmd_sra__z/0.txt
index 9c75592..64d1dd6 100644
--- a/test/system/casl2_cmd/cmd_sra__z/0.txt
+++ b/test/system/casl2_cmd/cmd_sra__z/0.txt
@@ -1,9 +1,3 @@
-;;; SRA r,adr çµæã¯é¶
-MAIN START
- LAD GR1,#2000
- SRA GR1,15
- RET
- END
Assemble ../../../../as/cmd/SRA/sra__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_sra__z/cmd b/test/system/casl2_cmd/cmd_sra__z/cmd
index bf1e7fb..ea9bd22 100755
--- a/test/system/casl2_cmd/cmd_sra__z/cmd
+++ b/test/system/casl2_cmd/cmd_sra__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRA/sra__z.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SRA/sra__z.casl
diff --git a/test/system/casl2_cmd/cmd_srl/0.txt b/test/system/casl2_cmd/cmd_srl/0.txt
index d4a1362..143bdc0 100644
--- a/test/system/casl2_cmd/cmd_srl/0.txt
+++ b/test/system/casl2_cmd/cmd_srl/0.txt
@@ -1,9 +1,3 @@
-;;; SRL r,adr
-MAIN START
- LAD GR1,#C000
- SRL GR1,14
- RET
- END
Assemble ../../../../as/cmd/SRL/srl.casl (0)
diff --git a/test/system/casl2_cmd/cmd_srl/cmd b/test/system/casl2_cmd/cmd_srl/cmd
index 1281740..8c12600 100755
--- a/test/system/casl2_cmd/cmd_srl/cmd
+++ b/test/system/casl2_cmd/cmd_srl/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRL/srl.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SRL/srl.casl
diff --git a/test/system/casl2_cmd/cmd_srl__o/0.txt b/test/system/casl2_cmd/cmd_srl__o/0.txt
index 2d7ea49..73635be 100644
--- a/test/system/casl2_cmd/cmd_srl__o/0.txt
+++ b/test/system/casl2_cmd/cmd_srl__o/0.txt
@@ -1,9 +1,3 @@
-;;; SRL r,adr ãªã¼ãã¼ããã¼
-MAIN START
- LAD GR1,#C000
- SRL GR1,15
- RET
- END
Assemble ../../../../as/cmd/SRL/srl__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_srl__o/cmd b/test/system/casl2_cmd/cmd_srl__o/cmd
index 11d5913..9157c01 100755
--- a/test/system/casl2_cmd/cmd_srl__o/cmd
+++ b/test/system/casl2_cmd/cmd_srl__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRL/srl__o.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SRL/srl__o.casl
diff --git a/test/system/casl2_cmd/cmd_srl__oz/0.txt b/test/system/casl2_cmd/cmd_srl__oz/0.txt
index 8c92637..15fe69e 100644
--- a/test/system/casl2_cmd/cmd_srl__oz/0.txt
+++ b/test/system/casl2_cmd/cmd_srl__oz/0.txt
@@ -1,9 +1,3 @@
-;;; SRL r,adr ãªã¼ãã¼ããã¼ããçµæã¯é¶
-MAIN START
- LAD GR1,#C000
- SRL GR1,16
- RET
- END
Assemble ../../../../as/cmd/SRL/srl__oz.casl (0)
diff --git a/test/system/casl2_cmd/cmd_srl__oz/cmd b/test/system/casl2_cmd/cmd_srl__oz/cmd
index a93d5d1..3bfbb83 100755
--- a/test/system/casl2_cmd/cmd_srl__oz/cmd
+++ b/test/system/casl2_cmd/cmd_srl__oz/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRL/srl__oz.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SRL/srl__oz.casl
diff --git a/test/system/casl2_cmd/cmd_srl__s/0.txt b/test/system/casl2_cmd/cmd_srl__s/0.txt
index e583a42..f7d60a4 100644
--- a/test/system/casl2_cmd/cmd_srl__s/0.txt
+++ b/test/system/casl2_cmd/cmd_srl__s/0.txt
@@ -1,9 +1,3 @@
-;;; SRL r,adr è² æ°
-SRL2 START BEGIN
-BEGIN LAD GR1,#C000
- SRL GR1,0
- RET
- END
Assemble ../../../../as/cmd/SRL/srl__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_srl__s/cmd b/test/system/casl2_cmd/cmd_srl__s/cmd
index 47e6005..3d54b7c 100755
--- a/test/system/casl2_cmd/cmd_srl__s/cmd
+++ b/test/system/casl2_cmd/cmd_srl__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRL/srl__s.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SRL/srl__s.casl
diff --git a/test/system/casl2_cmd/cmd_srl__z/0.txt b/test/system/casl2_cmd/cmd_srl__z/0.txt
index 04f0c33..5f78340 100644
--- a/test/system/casl2_cmd/cmd_srl__z/0.txt
+++ b/test/system/casl2_cmd/cmd_srl__z/0.txt
@@ -1,9 +1,3 @@
-;;; SRL r,adr çµæã¯é¶
-MAIN START
- LAD GR1,#C000
- SRL GR1,17
- RET
- END
Assemble ../../../../as/cmd/SRL/srl__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_srl__z/cmd b/test/system/casl2_cmd/cmd_srl__z/cmd
index e9b8dba..23aad67 100755
--- a/test/system/casl2_cmd/cmd_srl__z/cmd
+++ b/test/system/casl2_cmd/cmd_srl__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SRL/srl__z.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SRL/srl__z.casl
diff --git a/test/system/casl2_cmd/cmd_st_r_adr/0.txt b/test/system/casl2_cmd/cmd_st_r_adr/0.txt
index f14e247..1ead5c3 100644
--- a/test/system/casl2_cmd/cmd_st_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_st_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; ST r,adr
-MAIN START
- LD GR1,A
- ST GR1,B
- RET
-A DC 5
-B DS 1
- END
Assemble ../../../../as/cmd/ST/st_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_st_r_adr/cmd b/test/system/casl2_cmd/cmd_st_r_adr/cmd
index a3ce705..01759d8 100755
--- a/test/system/casl2_cmd/cmd_st_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_st_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ST/st_r_adr.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/ST/st_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_st_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_st_r_adr_x/0.txt
index 624880e..465ab14 100644
--- a/test/system/casl2_cmd/cmd_st_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_st_r_adr_x/0.txt
@@ -1,12 +1,3 @@
-;;; ST r,adr,x
-MAIN START
- LD GR1,A
- LAD GR2,A
- ST GR1,1,GR2
- RET
-A DC 5
-B DS 1
- END
Assemble ../../../../as/cmd/ST/st_r_adr_x.casl (0)
diff --git a/test/system/casl2_cmd/cmd_st_r_adr_x/cmd b/test/system/casl2_cmd/cmd_st_r_adr_x/cmd
index 2de95db..96aefaf 100755
--- a/test/system/casl2_cmd/cmd_st_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_st_r_adr_x/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/ST/st_r_adr_x.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/ST/st_r_adr_x.casl
diff --git a/test/system/casl2_cmd/cmd_start_opd/0.txt b/test/system/casl2_cmd/cmd_start_opd/0.txt
index cee6db6..22f4811 100644
--- a/test/system/casl2_cmd/cmd_start_opd/0.txt
+++ b/test/system/casl2_cmd/cmd_start_opd/0.txt
@@ -1,24 +1,3 @@
-;;; sum_10.casl
-;;; 1ãã10ã¾ã§ã®æ´æ°ããã¹ã¦å ç®ããå¤ãã¡ã¢ãªã¼ã«æ ¼ç´ãã
-MAIN START #20
- PUSH 0,GR1
- PUSH 0,GR2
- XOR GR2,GR2 ; GR2ãåæå
- LD GR1,FST ; GR1ã«åé
ãã¡ã¢ãªã¼ãã転é
-LOOP ADDL GR2,GR1 ; ã«ã¼ãå
é ãGR2 <- GR2 + GR1
- ADDL GR1,STEP ; GR1 <- GR1 + å
¬å·®
- CPL GR1,LST ; GR1ãæ«é
ãã大ããå ´åã¯çµäº
- JPL FIN ; â
- JUMP LOOP ; ã«ã¼ãçµç«¯
-FIN ST GR2,RST ; GR2ã®çµæãã¡ã¢ãªã¼ã«è»¢é
- POP GR2
- POP GR1
- RET
-FST DC 1 ; åé
-LST DC 10 ; æ«é
-STEP DC 1 ; å
¬å·®
-RST DS 1 ; çµæ
- END
Assemble sum_10.casl (0)
diff --git a/test/system/casl2_cmd/cmd_start_opd/cmd b/test/system/casl2_cmd/cmd_start_opd/cmd
index ab6a712..6b8d0b1 100755
--- a/test/system/casl2_cmd/cmd_start_opd/cmd
+++ b/test/system/casl2_cmd/cmd_start_opd/cmd
@@ -1,2 +1 @@
-cat sum_10.casl
../../../../casl2 -atd sum_10.casl
diff --git a/test/system/casl2_cmd/cmd_suba_r1_r2/0.txt b/test/system/casl2_cmd/cmd_suba_r1_r2/0.txt
index 450d076..78fcb04 100644
--- a/test/system/casl2_cmd/cmd_suba_r1_r2/0.txt
+++ b/test/system/casl2_cmd/cmd_suba_r1_r2/0.txt
@@ -1,12 +1,3 @@
-;;; SUBA r1,r2
-MAIN START
-BEGIN LD GR1,A
- LD GR2,B
- SUBA GR1,GR2
- RET
-A DC 3
-B DC 1
- END
Assemble ../../../../as/cmd/SUBA/suba_r1_r2.casl (0)
diff --git a/test/system/casl2_cmd/cmd_suba_r1_r2/cmd b/test/system/casl2_cmd/cmd_suba_r1_r2/cmd
index 8aa2d34..389b24a 100755
--- a/test/system/casl2_cmd/cmd_suba_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_suba_r1_r2/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBA/suba_r1_r2.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/SUBA/suba_r1_r2.casl
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr/0.txt
index 45a9561..7e63f3e 100644
--- a/test/system/casl2_cmd/cmd_suba_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_suba_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; SUBA r,adr
-MAIN START
-BEGIN LD GR1,A
- SUBA GR1,B
- RET
-A DC 3
-B DC 1
- END
Assemble ../../../../as/cmd/SUBA/suba_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr/cmd b/test/system/casl2_cmd/cmd_suba_r_adr/cmd
index e974289..78189f7 100755
--- a/test/system/casl2_cmd/cmd_suba_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_suba_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBA/suba_r_adr.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SUBA/suba_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__ao/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__ao/0.txt
index 2771537..f521b50 100644
--- a/test/system/casl2_cmd/cmd_suba_r_adr__ao/0.txt
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__ao/0.txt
@@ -1,11 +1,3 @@
-;;; SUBA r,adr æ£æ°ã§ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- SUBA GR1,B
- RET
-A DC #7FFE ; 32766
-B DC #FFF6 ; -10
- END
Assemble ../../../../as/cmd/SUBA/suba_r_adr__ao.casl (0)
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__ao/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__ao/cmd
index 290acba..711771d 100755
--- a/test/system/casl2_cmd/cmd_suba_r_adr__ao/cmd
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__ao/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBA/suba_r_adr__ao.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SUBA/suba_r_adr__ao.casl
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__as0/0.txt
index 31dd353..a9da457 100644
--- a/test/system/casl2_cmd/cmd_suba_r_adr__as0/0.txt
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__as0/0.txt
@@ -1,11 +1,3 @@
-;;; SUBA r,adr æ¼ç®çµæãè² æ°(r > adr)
-MAIN START
- LD GR1,A
- SUBA GR1,B
- RET
-A DC 10
-B DC 20
- END
Assemble ../../../../as/cmd/SUBA/suba_r_adr__as0.casl (0)
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__as0/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__as0/cmd
index 75364c1..0536939 100755
--- a/test/system/casl2_cmd/cmd_suba_r_adr__as0/cmd
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__as0/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBA/suba_r_adr__as0.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SUBA/suba_r_adr__as0.casl
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__as1/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__as1/0.txt
index 345e56b..3e53810 100644
--- a/test/system/casl2_cmd/cmd_suba_r_adr__as1/0.txt
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__as1/0.txt
@@ -1,11 +1,3 @@
-;;; SUBA r,adr æ¼ç®çµæãè² æ°(r < adr)
-MAIN START
- LD GR1,A
- SUBA GR1,B
- RET
-A DC #FFEC ; -20
-B DC #FFF6 ; -10
- END
Assemble ../../../../as/cmd/SUBA/suba_r_adr__as1.casl (0)
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__as1/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__as1/cmd
index 4839aea..7d7edf8 100755
--- a/test/system/casl2_cmd/cmd_suba_r_adr__as1/cmd
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__as1/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBA/suba_r_adr__as1.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SUBA/suba_r_adr__as1.casl
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__lo/0.txt
index 4f45ff1..c0f23fb 100644
--- a/test/system/casl2_cmd/cmd_suba_r_adr__lo/0.txt
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__lo/0.txt
@@ -1,11 +1,3 @@
-;;; SUBA r,adr SUBLã§ã¯ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- SUBA GR1,B
- RET
-A DC 2
-B DC 15
- END
Assemble ../../../../as/cmd/SUBA/suba_r_adr__lo.casl (0)
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__lo/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__lo/cmd
index 40bf6a3..099847a 100755
--- a/test/system/casl2_cmd/cmd_suba_r_adr__lo/cmd
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__lo/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBA/suba_r_adr__lo.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SUBA/suba_r_adr__lo.casl
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__o/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__o/0.txt
index 199ca00..1b1e4c1 100644
--- a/test/system/casl2_cmd/cmd_suba_r_adr__o/0.txt
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__o/0.txt
@@ -1,11 +1,3 @@
-;;; SUBA r,adr ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- SUBA GR1,B
- RET
-A DC #8002 ; -32766
-B DC #7FFF ; 32767
- END
Assemble ../../../../as/cmd/SUBA/suba_r_adr__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__o/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__o/cmd
index 64c6f3d..028193a 100755
--- a/test/system/casl2_cmd/cmd_suba_r_adr__o/cmd
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBA/suba_r_adr__o.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SUBA/suba_r_adr__o.casl
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__z/0.txt
index c053cf7..b697611 100644
--- a/test/system/casl2_cmd/cmd_suba_r_adr__z/0.txt
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__z/0.txt
@@ -1,11 +1,3 @@
-;;; SUBA r,adr æ¼ç®çµæãé¶
-MAIN START
- LD GR1,A
- SUBA GR1,B
- RET
-A DC #FFF6 ; -10
-B DC #FFF6 ; -10
- END
Assemble ../../../../as/cmd/SUBA/suba_r_adr__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr__z/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__z/cmd
index 0bbe750..5bffefc 100755
--- a/test/system/casl2_cmd/cmd_suba_r_adr__z/cmd
+++ b/test/system/casl2_cmd/cmd_suba_r_adr__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBA/suba_r_adr__z.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SUBA/suba_r_adr__z.casl
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr_x/0.txt
index f759e8a..c8dff3e 100644
--- a/test/system/casl2_cmd/cmd_suba_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_suba_r_adr_x/0.txt
@@ -1,12 +1,3 @@
-;;; SUBA r,adr,x
-MAIN START
-BEGIN LD GR1,A
- LAD GR2,1
- SUBA GR1,A,GR2
- RET
-A DC 3
- DC 1
- END
Assemble ../../../../as/cmd/SUBA/suba_r_adr_x.casl (0)
diff --git a/test/system/casl2_cmd/cmd_suba_r_adr_x/cmd b/test/system/casl2_cmd/cmd_suba_r_adr_x/cmd
index 3559a27..b591af7 100755
--- a/test/system/casl2_cmd/cmd_suba_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_suba_r_adr_x/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBA/suba_r_adr_x.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/SUBA/suba_r_adr_x.casl
diff --git a/test/system/casl2_cmd/cmd_subl_r1_r2/0.txt b/test/system/casl2_cmd/cmd_subl_r1_r2/0.txt
index 8d241a0..2b2f2fe 100644
--- a/test/system/casl2_cmd/cmd_subl_r1_r2/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r1_r2/0.txt
@@ -1,12 +1,3 @@
-;;; SUBL r1,r2
-MAIN START
-BEGIN LD GR1,A
- LD GR2,B
- SUBL GR1,GR2
- RET
-A DC 3
-B DC 1
- END
Assemble ../../../../as/cmd/SUBL/subl_r1_r2.casl (0)
diff --git a/test/system/casl2_cmd/cmd_subl_r1_r2/cmd b/test/system/casl2_cmd/cmd_subl_r1_r2/cmd
index 30fdc5e..a7f0b6f 100755
--- a/test/system/casl2_cmd/cmd_subl_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r1_r2/cmd
@@ -1,2 +1 @@
-cat ../../../../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/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr/0.txt
index ee1fbe0..3ae2090 100644
--- a/test/system/casl2_cmd/cmd_subl_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; SUBL r,adr
-MAIN START
-BEGIN LD GR1,A
- SUBL GR1,B
- RET
-A DC 3
-B DC 1
- END
Assemble ../../../../as/cmd/SUBL/subl_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_subl_r_adr/cmd b/test/system/casl2_cmd/cmd_subl_r_adr/cmd
index ac4e5bf..88adb84 100755
--- a/test/system/casl2_cmd/cmd_subl_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../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 0fd2930..ddc33b2 100644
--- a/test/system/casl2_cmd/cmd_subl_r_adr__ao/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__ao/0.txt
@@ -1,11 +1,3 @@
-;;; SUBL r,adr æ£æ°ã§ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- SUBL GR1,B
- RET
-A DC #7FFE ; 32766
-B DC #FFF6 ; 65526
- END
Assemble ../../../../as/cmd/SUBL/subl_r_adr__ao.casl (0)
diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__ao/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__ao/cmd
index c81943b..0aa7eac 100755
--- a/test/system/casl2_cmd/cmd_subl_r_adr__ao/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__ao/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBL/subl_r_adr__ao.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SUBL/subl_r_adr__ao.casl
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 ba707aa..360d26d 100644
--- a/test/system/casl2_cmd/cmd_subl_r_adr__as0/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__as0/0.txt
@@ -1,11 +1,3 @@
-;;; SUBL r,adr æ¼ç®çµæãè² æ°(r > adr)
-MAIN START
- LD GR1,A
- SUBL GR1,B
- RET
-A DC 10
-B DC 20
- END
Assemble ../../../../as/cmd/SUBL/subl_r_adr__as0.casl (0)
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 83b8a64..b6c0cbf 100755
--- 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 @@
-cat ../../../../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 013aa6a..2cccab5 100644
--- a/test/system/casl2_cmd/cmd_subl_r_adr__as1/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__as1/0.txt
@@ -1,11 +1,3 @@
-;;; SUBL r,adr æ¼ç®çµæãè² æ°(r < adr)
-MAIN START
- LD GR1,A
- SUBL GR1,B
- RET
-A DC #FFEC ; 65516
-B DC #FFF6 ; 65526
- END
Assemble ../../../../as/cmd/SUBL/subl_r_adr__as1.casl (0)
diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__as1/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__as1/cmd
index 0ce2864..e3143a5 100755
--- a/test/system/casl2_cmd/cmd_subl_r_adr__as1/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__as1/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBL/subl_r_adr__as1.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/SUBL/subl_r_adr__as1.casl
diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__lo/0.txt
index 48c7c1f..7659284 100644
--- a/test/system/casl2_cmd/cmd_subl_r_adr__lo/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__lo/0.txt
@@ -1,11 +1,3 @@
-;;; SUBL r,adr SUBLã§ã¯ãªã¼ãã¼ããã¼
-MAIN START
- LD GR1,A
- SUBL GR1,B
- RET
-A DC 2
-B DC 15
- END
Assemble ../../../../as/cmd/SUBL/subl_r_adr__lo.casl (0)
diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__lo/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__lo/cmd
index 8c529c6..6f59551 100755
--- a/test/system/casl2_cmd/cmd_subl_r_adr__lo/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__lo/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBL/subl_r_adr__lo.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SUBL/subl_r_adr__lo.casl
diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__o/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__o/0.txt
index 7867aa2..74a493d 100644
--- a/test/system/casl2_cmd/cmd_subl_r_adr__o/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__o/0.txt
@@ -1,11 +1,3 @@
-;;; SUBL r,adr è«çæ¼ç®ã§ã¯ãªã¼ãã¼ããã¼ãªãï¼ç®è¡æ¸ç®ã§ã¯ãªã¼ãã¼ããã¼ï¼
-MAIN START
- LD GR1,A
- SUBL GR1,B
- RET
-A DC #8002 ; 32770
-B DC #7FFF ; 32767
- END
Assemble ../../../../as/cmd/SUBL/subl_r_adr__o.casl (0)
diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__o/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__o/cmd
index a801805..7e83712 100755
--- a/test/system/casl2_cmd/cmd_subl_r_adr__o/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__o/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBL/subl_r_adr__o.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SUBL/subl_r_adr__o.casl
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 11a1a7a..0a49cc9 100644
--- a/test/system/casl2_cmd/cmd_subl_r_adr__z/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__z/0.txt
@@ -1,11 +1,3 @@
-;;; SUBL r,adr æ¼ç®çµæãé¶
-MAIN START
- LD GR1,A
- SUBL GR1,B
- RET
-A DC #FFF6 ; 65526
-B DC #FFF6 ; 65526
- END
Assemble ../../../../as/cmd/SUBL/subl_r_adr__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_subl_r_adr__z/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__z/cmd
index 6e15b11..661a57d 100755
--- a/test/system/casl2_cmd/cmd_subl_r_adr__z/cmd
+++ b/test/system/casl2_cmd/cmd_subl_r_adr__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SUBL/subl_r_adr__z.casl
../../../../casl2 -aTd -M8 ../../../../as/cmd/SUBL/subl_r_adr__z.casl
diff --git a/test/system/casl2_cmd/cmd_subl_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr_x/0.txt
index 991d287..9d992f7 100644
--- a/test/system/casl2_cmd/cmd_subl_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_subl_r_adr_x/0.txt
@@ -1,12 +1,3 @@
-;;; SUBL r,adr,x
-MAIN START
-BEGIN LD GR1,A
- LAD GR2,1
- SUBL GR1,A,GR2
- RET
-A DC 5
- DC 2
- END
Assemble ../../../../as/cmd/SUBL/subl_r_adr_x.casl (0)
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 617c47f..4aa65be 100755
--- 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 @@
-cat ../../../../as/cmd/SUBL/subl_r_adr_x.casl
../../../../casl2 -aTd -M16 ../../../../as/cmd/SUBL/subl_r_adr_x.casl
diff --git a/test/system/casl2_cmd/cmd_svc__1/0.txt b/test/system/casl2_cmd/cmd_svc__1/0.txt
index 1c04df9..17c641e 100644
--- a/test/system/casl2_cmd/cmd_svc__1/0.txt
+++ b/test/system/casl2_cmd/cmd_svc__1/0.txt
@@ -1,13 +1,3 @@
-;;; SVC 1 1æåãå
¥å
-MAIN START
- LAD GR1,IBUF
- LAD GR2,ILEN
- SVC 1
- RET
-IBUF DS 6
-ILEN DS 1
- END
-abcd
Assemble ../../../../as/cmd/SVC/svc__1.casl (0)
diff --git a/test/system/casl2_cmd/cmd_svc__1/cmd b/test/system/casl2_cmd/cmd_svc__1/cmd
index e2d3da3..2c0f5ff 100755
--- a/test/system/casl2_cmd/cmd_svc__1/cmd
+++ b/test/system/casl2_cmd/cmd_svc__1/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SVC/svc__1.casl teststr.txt
../../../../casl2 -atd -M64 ../../../../as/cmd/SVC/svc__1.casl <teststr.txt
diff --git a/test/system/casl2_cmd/cmd_svc__2/0.txt b/test/system/casl2_cmd/cmd_svc__2/0.txt
index eb99d1e..65870cf 100644
--- a/test/system/casl2_cmd/cmd_svc__2/0.txt
+++ b/test/system/casl2_cmd/cmd_svc__2/0.txt
@@ -1,14 +1,3 @@
-;;; SVC 2 1æåã表示
-MAIN START
-BEGIN LAD GR1,D
- LAD GR2,A
- SVC 2
- LAD GR1,=#A
- SVC 2
- RET
-D DC '0'
-A DC 1
- END
Assemble ../../../../as/cmd/SVC/svc__2.casl (0)
diff --git a/test/system/casl2_cmd/cmd_svc__2/cmd b/test/system/casl2_cmd/cmd_svc__2/cmd
index 14f4364..b128d5d 100755
--- a/test/system/casl2_cmd/cmd_svc__2/cmd
+++ b/test/system/casl2_cmd/cmd_svc__2/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/SVC/svc__2.casl
../../../../casl2 -atd -M64 ../../../../as/cmd/SVC/svc__2.casl
diff --git a/test/system/casl2_cmd/cmd_xor_r1_r2/0.txt b/test/system/casl2_cmd/cmd_xor_r1_r2/0.txt
index b378443..82135e3 100644
--- a/test/system/casl2_cmd/cmd_xor_r1_r2/0.txt
+++ b/test/system/casl2_cmd/cmd_xor_r1_r2/0.txt
@@ -1,12 +1,3 @@
-;;; XOR r1,r2
-MAIN START
- LD GR1,A
- LD GR2,B
- XOR GR1,GR2
- RET
-A DC #3000
-B DC #4FFF
- END
Assemble ../../../../as/cmd/XOR/xor_r1_r2.casl (0)
diff --git a/test/system/casl2_cmd/cmd_xor_r1_r2/cmd b/test/system/casl2_cmd/cmd_xor_r1_r2/cmd
index b649fc6..8d12768 100755
--- a/test/system/casl2_cmd/cmd_xor_r1_r2/cmd
+++ b/test/system/casl2_cmd/cmd_xor_r1_r2/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/XOR/xor_r1_r2.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/XOR/xor_r1_r2.casl
diff --git a/test/system/casl2_cmd/cmd_xor_r1_r2__clear/0.txt b/test/system/casl2_cmd/cmd_xor_r1_r2__clear/0.txt
index 780f349..1c3650a 100644
--- a/test/system/casl2_cmd/cmd_xor_r1_r2__clear/0.txt
+++ b/test/system/casl2_cmd/cmd_xor_r1_r2__clear/0.txt
@@ -1,10 +1,3 @@
-;;; XOR r1,r2 rã®å
容ãã¯ãªã¢
-MAIN START
-BEGIN LD GR1,A
- XOR GR1,GR1
- RET
-A DC 3
- END
Assemble ../../../../as/cmd/XOR/xor_r1_r2__clear.casl (0)
diff --git a/test/system/casl2_cmd/cmd_xor_r1_r2__clear/cmd b/test/system/casl2_cmd/cmd_xor_r1_r2__clear/cmd
index 0d81093..e24e885 100755
--- a/test/system/casl2_cmd/cmd_xor_r1_r2__clear/cmd
+++ b/test/system/casl2_cmd/cmd_xor_r1_r2__clear/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/XOR/xor_r1_r2__clear.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/XOR/xor_r1_r2__clear.casl
diff --git a/test/system/casl2_cmd/cmd_xor_r_adr/0.txt b/test/system/casl2_cmd/cmd_xor_r_adr/0.txt
index a9f6f56..1a2e7f5 100644
--- a/test/system/casl2_cmd/cmd_xor_r_adr/0.txt
+++ b/test/system/casl2_cmd/cmd_xor_r_adr/0.txt
@@ -1,11 +1,3 @@
-;;; XOR r,adr
-MAIN START
- LD GR1,A
- XOR GR1,B
- RET
-A DC #3000
-B DC #4FFF
- END
Assemble ../../../../as/cmd/XOR/xor_r_adr.casl (0)
diff --git a/test/system/casl2_cmd/cmd_xor_r_adr/cmd b/test/system/casl2_cmd/cmd_xor_r_adr/cmd
index 3c6d90e..9bec76e 100755
--- a/test/system/casl2_cmd/cmd_xor_r_adr/cmd
+++ b/test/system/casl2_cmd/cmd_xor_r_adr/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/XOR/xor_r_adr.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/XOR/xor_r_adr.casl
diff --git a/test/system/casl2_cmd/cmd_xor_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_xor_r_adr__s/0.txt
index 9b5c47b..e62a6ec 100644
--- a/test/system/casl2_cmd/cmd_xor_r_adr__s/0.txt
+++ b/test/system/casl2_cmd/cmd_xor_r_adr__s/0.txt
@@ -1,11 +1,3 @@
-;;; XOR r,adr æ¼ç®çµæã®ç¬¦å·ãè²
-MAIN START
- LD GR1,A
- XOR GR1,B
- RET
-A DC #8000
-B DC #FFFF
- END
Assemble ../../../../as/cmd/XOR/xor_r_adr__s.casl (0)
diff --git a/test/system/casl2_cmd/cmd_xor_r_adr__s/cmd b/test/system/casl2_cmd/cmd_xor_r_adr__s/cmd
index ab8ebc8..b510592 100755
--- a/test/system/casl2_cmd/cmd_xor_r_adr__s/cmd
+++ b/test/system/casl2_cmd/cmd_xor_r_adr__s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/XOR/xor_r_adr__s.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/XOR/xor_r_adr__s.casl
diff --git a/test/system/casl2_cmd/cmd_xor_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_xor_r_adr__z/0.txt
index a52bbe1..74ccd28 100644
--- a/test/system/casl2_cmd/cmd_xor_r_adr__z/0.txt
+++ b/test/system/casl2_cmd/cmd_xor_r_adr__z/0.txt
@@ -1,11 +1,3 @@
-;;; XOR r,adr æ¼ç®çµæãé¶
-MAIN START
- LD GR1,A
- XOR GR1,B
- RET
-A DC #0001
-B DC #FFFE
- END
Assemble ../../../../as/cmd/XOR/xor_r_adr__z.casl (0)
diff --git a/test/system/casl2_cmd/cmd_xor_r_adr__z/cmd b/test/system/casl2_cmd/cmd_xor_r_adr__z/cmd
index 4a0ae22..5808edd 100755
--- a/test/system/casl2_cmd/cmd_xor_r_adr__z/cmd
+++ b/test/system/casl2_cmd/cmd_xor_r_adr__z/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/XOR/xor_r_adr__z.casl
../../../../casl2 -atd -M8 ../../../../as/cmd/XOR/xor_r_adr__z.casl
diff --git a/test/system/casl2_cmd/cmd_xor_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_xor_r_adr_x/0.txt
index f4312e2..fc48551 100644
--- a/test/system/casl2_cmd/cmd_xor_r_adr_x/0.txt
+++ b/test/system/casl2_cmd/cmd_xor_r_adr_x/0.txt
@@ -1,12 +1,3 @@
-;;; XOR r,adr,x
-MAIN START
- LD GR1,A
- LAD GR2,1
- XOR GR1,1,GR2
- RET
-A DC #3000
- DC #4FFF
- END
Assemble ../../../../as/cmd/XOR/xor_r_adr_x.casl (0)
diff --git a/test/system/casl2_cmd/cmd_xor_r_adr_x/cmd b/test/system/casl2_cmd/cmd_xor_r_adr_x/cmd
index 1a7b515..801f410 100755
--- a/test/system/casl2_cmd/cmd_xor_r_adr_x/cmd
+++ b/test/system/casl2_cmd/cmd_xor_r_adr_x/cmd
@@ -1,2 +1 @@
-cat ../../../../as/cmd/XOR/xor_r_adr_x.casl
../../../../casl2 -atd -M16 ../../../../as/cmd/XOR/xor_r_adr_x.casl
diff --git a/test/system/casl2_err/err_101/0.txt b/test/system/casl2_err/err_101/0.txt
index 7c126ac..d49aa3b 100644
--- a/test/system/casl2_err/err_101/0.txt
+++ b/test/system/casl2_err/err_101/0.txt
@@ -1,9 +1,2 @@
-MAIN START BEGIN
-BEGIN LD GR1,A
- ADDA GR1,B
- RET
-A DC 3
-A DC 1
- END
Assemble error - 101: A: label already defined
../../../../as/err/err_101.casl: 6:A DC 1
diff --git a/test/system/casl2_err/err_101/cmd b/test/system/casl2_err/err_101/cmd
index 32e27b8..3dbfb11 100755
--- a/test/system/casl2_err/err_101/cmd
+++ b/test/system/casl2_err/err_101/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_101.casl
../../../../casl2 ../../../../as/err/err_101.casl
diff --git a/test/system/casl2_err/err_103/0.txt b/test/system/casl2_err/err_103/0.txt
index 932e2da..7617c92 100644
--- a/test/system/casl2_err/err_103/0.txt
+++ b/test/system/casl2_err/err_103/0.txt
@@ -1,7 +1,2 @@
-MAIN START
- LD GR1,B
- RET
-A DC 7
- END
Assemble error - 103: B: label not found
../../../../as/err/err_103.casl: 2: LD GR1,B
diff --git a/test/system/casl2_err/err_103/cmd b/test/system/casl2_err/err_103/cmd
index 7b321d4..119ab1a 100755
--- a/test/system/casl2_err/err_103/cmd
+++ b/test/system/casl2_err/err_103/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_103.casl
../../../../casl2 ../../../../as/err/err_103.casl
diff --git a/test/system/casl2_err/err_104/0.txt b/test/system/casl2_err/err_104/0.txt
index 6de6a5e..0451c31 100644
--- a/test/system/casl2_err/err_104/0.txt
+++ b/test/system/casl2_err/err_104/0.txt
@@ -1,7 +1,2 @@
-MAIN START
- LD GR1,A23456789
- RET
-A23456789 DC 7
- END
Assemble error - 104: A23456789: label length is too long
../../../../as/err/err_104.casl: 4:A23456789 DC 7
diff --git a/test/system/casl2_err/err_104/cmd b/test/system/casl2_err/err_104/cmd
index 4604e5a..d5dce1c 100755
--- a/test/system/casl2_err/err_104/cmd
+++ b/test/system/casl2_err/err_104/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_104.casl
../../../../casl2 ../../../../as/err/err_104.casl
diff --git a/test/system/casl2_err/err_105/0.txt b/test/system/casl2_err/err_105/0.txt
index c9ed4ef..13914b9 100644
--- a/test/system/casl2_err/err_105/0.txt
+++ b/test/system/casl2_err/err_105/0.txt
@@ -1,7 +1,2 @@
-MAIN START
- LD GR1,A
- RET
-A
- END
Assemble error - 105: no command in the line
../../../../as/err/err_105.casl: 4:A
diff --git a/test/system/casl2_err/err_105/cmd b/test/system/casl2_err/err_105/cmd
index b288a00..04c9d6a 100755
--- a/test/system/casl2_err/err_105/cmd
+++ b/test/system/casl2_err/err_105/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_105.casl
../../../../casl2 ../../../../as/err/err_105.casl
diff --git a/test/system/casl2_err/err_106_DC/0.txt b/test/system/casl2_err/err_106_DC/0.txt
index 139178d..59bdb58 100644
--- a/test/system/casl2_err/err_106_DC/0.txt
+++ b/test/system/casl2_err/err_106_DC/0.txt
@@ -1,6 +1,2 @@
-MAIN START
- RET
- DC
- END
Assemble error - 106: operand mismatch in CASL II command
../../../../as/err/err_106_DC.casl: 3: DC
diff --git a/test/system/casl2_err/err_106_DC/cmd b/test/system/casl2_err/err_106_DC/cmd
index e4c1437..e809608 100755
--- a/test/system/casl2_err/err_106_DC/cmd
+++ b/test/system/casl2_err/err_106_DC/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_106_DC.casl
../../../../casl2 ../../../../as/err/err_106_DC.casl
diff --git a/test/system/casl2_err/err_106_DS/0.txt b/test/system/casl2_err/err_106_DS/0.txt
index 30efd22..c0ce106 100644
--- a/test/system/casl2_err/err_106_DS/0.txt
+++ b/test/system/casl2_err/err_106_DS/0.txt
@@ -1,7 +1,2 @@
-MAIN START
- LD GR1,A
- RET
-A DS
- END
Assemble error - 106: operand mismatch in CASL II command
../../../../as/err/err_106_DS.casl: 4:A DS
diff --git a/test/system/casl2_err/err_106_DS/cmd b/test/system/casl2_err/err_106_DS/cmd
index aed1988..4daa347 100755
--- a/test/system/casl2_err/err_106_DS/cmd
+++ b/test/system/casl2_err/err_106_DS/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_106_DS.casl
../../../../casl2 ../../../../as/err/err_106_DS.casl
diff --git a/test/system/casl2_err/err_107/0.txt b/test/system/casl2_err/err_107/0.txt
index bff3e28..55635b3 100644
--- a/test/system/casl2_err/err_107/0.txt
+++ b/test/system/casl2_err/err_107/0.txt
@@ -1,7 +1,2 @@
- START
- LD GR1,A
- RET
-A DC 1
- END
Assemble error - 107: no label in START
../../../../as/err/err_107.casl: 1: START
diff --git a/test/system/casl2_err/err_107/cmd b/test/system/casl2_err/err_107/cmd
index 493580a..db7ae0e 100755
--- a/test/system/casl2_err/err_107/cmd
+++ b/test/system/casl2_err/err_107/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_107.casl
../../../../casl2 ../../../../as/err/err_107.casl
diff --git a/test/system/casl2_err/err_108/0.txt b/test/system/casl2_err/err_108/0.txt
index dfed81f..ea5289e 100644
--- a/test/system/casl2_err/err_108/0.txt
+++ b/test/system/casl2_err/err_108/0.txt
@@ -1,7 +1,2 @@
-MAIN START
- LD GR1
- RET
-A DC 1
- END
Assemble error - 108: LD: not command of operand "r"
../../../../as/err/err_108.casl: 2: LD GR1
diff --git a/test/system/casl2_err/err_108/cmd b/test/system/casl2_err/err_108/cmd
index fab9012..4f29a0f 100755
--- a/test/system/casl2_err/err_108/cmd
+++ b/test/system/casl2_err/err_108/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_108.casl
../../../../casl2 ../../../../as/err/err_108.casl
diff --git a/test/system/casl2_err/err_109/0.txt b/test/system/casl2_err/err_109/0.txt
index d64f4ab..210719a 100644
--- a/test/system/casl2_err/err_109/0.txt
+++ b/test/system/casl2_err/err_109/0.txt
@@ -1,6 +1,2 @@
-MAIN START
- ST GR1,GR2
- RET
- END
Assemble error - 109: ST: not command of operand "r1,r2"
../../../../as/err/err_109.casl: 2: ST GR1,GR2
diff --git a/test/system/casl2_err/err_109/cmd b/test/system/casl2_err/err_109/cmd
index 2a8e745..756fae9 100755
--- a/test/system/casl2_err/err_109/cmd
+++ b/test/system/casl2_err/err_109/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_109.casl
../../../../casl2 ../../../../as/err/err_109.casl
diff --git a/test/system/casl2_err/err_110/0.txt b/test/system/casl2_err/err_110/0.txt
index 0271d9d..ffd472a 100644
--- a/test/system/casl2_err/err_110/0.txt
+++ b/test/system/casl2_err/err_110/0.txt
@@ -1,7 +1,2 @@
-MAIN START
- CALL GR1,A
- RET
-A DC 3
- END
Assemble error - 110: CALL: not command of operand "r,adr[,x]"
../../../../as/err/err_110.casl: 2: CALL GR1,A
diff --git a/test/system/casl2_err/err_110/cmd b/test/system/casl2_err/err_110/cmd
index 92d60d5..52dac39 100755
--- a/test/system/casl2_err/err_110/cmd
+++ b/test/system/casl2_err/err_110/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_110.casl
../../../../casl2 ../../../../as/err/err_110.casl
diff --git a/test/system/casl2_err/err_111/0.txt b/test/system/casl2_err/err_111/0.txt
index 4058fe7..3e20c6d 100644
--- a/test/system/casl2_err/err_111/0.txt
+++ b/test/system/casl2_err/err_111/0.txt
@@ -1,7 +1,2 @@
-MAIN START
- LD A
- RET
-A DC 3
- END
Assemble error - 111: LD: not command of operand "adr[,x]"
../../../../as/err/err_111.casl: 2: LD A
diff --git a/test/system/casl2_err/err_111/cmd b/test/system/casl2_err/err_111/cmd
index a06ed0d..569e4e1 100755
--- a/test/system/casl2_err/err_111/cmd
+++ b/test/system/casl2_err/err_111/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_111.casl
../../../../casl2 ../../../../as/err/err_111.casl
diff --git a/test/system/casl2_err/err_112/0.txt b/test/system/casl2_err/err_112/0.txt
index 1d7c6f7..5915f9b 100644
--- a/test/system/casl2_err/err_112/0.txt
+++ b/test/system/casl2_err/err_112/0.txt
@@ -1,6 +1,2 @@
-MAIN START
- LAD
- RET
- END
Assemble error - 112: LAD: not command of no operand
../../../../as/err/err_112.casl: 2: LAD
diff --git a/test/system/casl2_err/err_112/cmd b/test/system/casl2_err/err_112/cmd
index 65d9743..5ff82c7 100755
--- a/test/system/casl2_err/err_112/cmd
+++ b/test/system/casl2_err/err_112/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_112.casl
../../../../casl2 ../../../../as/err/err_112.casl
diff --git a/test/system/casl2_err/err_113/0.txt b/test/system/casl2_err/err_113/0.txt
index 56dd38a..91a425a 100644
--- a/test/system/casl2_err/err_113/0.txt
+++ b/test/system/casl2_err/err_113/0.txt
@@ -1,7 +1,2 @@
-MAIN START
- LD GR1,A,1,2
- RET
-A DC 0,1,2,3
- END
Assemble error - 113: LD: operand too many in COMET II command
../../../../as/err/err_113.casl: 2: LD GR1,A,1,2
diff --git a/test/system/casl2_err/err_113/cmd b/test/system/casl2_err/err_113/cmd
index 2e02428..64359a8 100755
--- a/test/system/casl2_err/err_113/cmd
+++ b/test/system/casl2_err/err_113/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_113.casl
../../../../casl2 ../../../../as/err/err_113.casl
diff --git a/test/system/casl2_err/err_114/0.txt b/test/system/casl2_err/err_114/0.txt
index 5d79380..8fe40fe 100644
--- a/test/system/casl2_err/err_114/0.txt
+++ b/test/system/casl2_err/err_114/0.txt
@@ -1,6 +1,2 @@
-MAIN START
- LD GR1,-A
- RET
- END
Assemble error - 114: -A: not integer
../../../../as/err/err_114.casl: 2: LD GR1,-A
diff --git a/test/system/casl2_err/err_114/cmd b/test/system/casl2_err/err_114/cmd
index 847381f..fc91623 100755
--- a/test/system/casl2_err/err_114/cmd
+++ b/test/system/casl2_err/err_114/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_114.casl
../../../../casl2 ../../../../as/err/err_114.casl
diff --git a/test/system/casl2_err/err_115/0.txt b/test/system/casl2_err/err_115/0.txt
index 3538454..3bd626b 100644
--- a/test/system/casl2_err/err_115/0.txt
+++ b/test/system/casl2_err/err_115/0.txt
@@ -1,6 +1,2 @@
-MAIN START
- LD GR1,#G
- RET
- END
Assemble error - 115: #G: not hex
../../../../as/err/err_115.casl: 2: LD GR1,#G
diff --git a/test/system/casl2_err/err_115/cmd b/test/system/casl2_err/err_115/cmd
index d077f64..7905d00 100755
--- a/test/system/casl2_err/err_115/cmd
+++ b/test/system/casl2_err/err_115/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_115.casl
../../../../casl2 ../../../../as/err/err_115.casl
diff --git a/test/system/casl2_err/err_116/0.txt b/test/system/casl2_err/err_116/0.txt
index e90f14c..69a2558 100644
--- a/test/system/casl2_err/err_116/0.txt
+++ b/test/system/casl2_err/err_116/0.txt
@@ -1,6 +1,2 @@
-MAIN START
- LD GR1,#10000
- RET
- END
Assemble error - 116: #10000: out of hex range
../../../../as/err/err_116.casl: 2: LD GR1,#10000
diff --git a/test/system/casl2_err/err_116/cmd b/test/system/casl2_err/err_116/cmd
index 65bb141..7933b38 100755
--- a/test/system/casl2_err/err_116/cmd
+++ b/test/system/casl2_err/err_116/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_116.casl
../../../../casl2 ../../../../as/err/err_116.casl
diff --git a/test/system/casl2_err/err_117/0.txt b/test/system/casl2_err/err_117/0.txt
index 7c21bb3..b0dbd77 100644
--- a/test/system/casl2_err/err_117/0.txt
+++ b/test/system/casl2_err/err_117/0.txt
@@ -1,6 +1,2 @@
-MAIN START
- RET
- DC 1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1
- END
Assemble error - 117: operand too many in DC
../../../../as/err/err_117.casl: 3: DC 1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1
diff --git a/test/system/casl2_err/err_117/cmd b/test/system/casl2_err/err_117/cmd
index 4181584..0f30257 100755
--- a/test/system/casl2_err/err_117/cmd
+++ b/test/system/casl2_err/err_117/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_117.casl
../../../../casl2 ../../../../as/err/err_117.casl
diff --git a/test/system/casl2_err/err_118/0.txt b/test/system/casl2_err/err_118/0.txt
index b3ce39a..fbb1080 100644
--- a/test/system/casl2_err/err_118/0.txt
+++ b/test/system/casl2_err/err_118/0.txt
@@ -1,6 +1,2 @@
-MAIN START
- RET
- DC '12345678901234567890123456789012345678901'
- END
Assemble error - 118: operand length too long
../../../../as/err/err_118.casl: 3: DC '12345678901234567890123456789012345678901'
diff --git a/test/system/casl2_err/err_118/cmd b/test/system/casl2_err/err_118/cmd
index bb8e11a..dfc5cd3 100755
--- a/test/system/casl2_err/err_118/cmd
+++ b/test/system/casl2_err/err_118/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_118.casl
../../../../casl2 ../../../../as/err/err_118.casl
diff --git a/test/system/casl2_err/err_119/0.txt b/test/system/casl2_err/err_119/0.txt
index 5fd6d38..fa722e4 100644
--- a/test/system/casl2_err/err_119/0.txt
+++ b/test/system/casl2_err/err_119/0.txt
@@ -1,12 +1,2 @@
-;;; casl2 -M8 err_119.casl
-MAIN START
- LD GR0,A
- LD GR0,B
- LD GR0,C
- RET
-A DC 7
-B DC -7
-C DC 0
- END
Assemble error - 119: 8: out of COMET II memory
../../../../as/err/err_119.casl: 8:B DC -7
diff --git a/test/system/casl2_err/err_119/cmd b/test/system/casl2_err/err_119/cmd
index 20ab7f9..b906256 100755
--- a/test/system/casl2_err/err_119/cmd
+++ b/test/system/casl2_err/err_119/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_119.casl
../../../../casl2 -M8 ../../../../as/err/err_119.casl
diff --git a/test/system/casl2_err/err_120/0.txt b/test/system/casl2_err/err_120/0.txt
index f794b84..a494a20 100644
--- a/test/system/casl2_err/err_120/0.txt
+++ b/test/system/casl2_err/err_120/0.txt
@@ -1,8 +1,2 @@
-MAIN START
- LAD GR0,1
- LD GR1,A,GR0
- RET
-A DC 7,-7
- END
Assemble error - 120: GR0 in operand x
../../../../as/err/err_120.casl: 3: LD GR1,A,GR0
diff --git a/test/system/casl2_err/err_120/cmd b/test/system/casl2_err/err_120/cmd
index 7540015..e5264dd 100755
--- a/test/system/casl2_err/err_120/cmd
+++ b/test/system/casl2_err/err_120/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_120.casl
../../../../casl2 ../../../../as/err/err_120.casl
diff --git a/test/system/casl2_err/err_121/0.txt b/test/system/casl2_err/err_121/0.txt
index 39606b3..0397eca 100644
--- a/test/system/casl2_err/err_121/0.txt
+++ b/test/system/casl2_err/err_121/0.txt
@@ -1,9 +1,2 @@
-MAIN START BEGIN
-BEGIN LD GR1, A
- ADDA GR1,B
- RET
-A DC 3
-B DC 1
- END
Assemble error - 121: cannot get operand token
../../../../as/err/err_121.casl: 2:BEGIN LD GR1, A
diff --git a/test/system/casl2_err/err_121/cmd b/test/system/casl2_err/err_121/cmd
index 6fe5dc4..784fae6 100755
--- a/test/system/casl2_err/err_121/cmd
+++ b/test/system/casl2_err/err_121/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_121.casl
../../../../casl2 ../../../../as/err/err_121.casl
diff --git a/test/system/casl2_err/err_123/0.txt b/test/system/casl2_err/err_123/0.txt
index 6471283..148aab5 100644
--- a/test/system/casl2_err/err_123/0.txt
+++ b/test/system/casl2_err/err_123/0.txt
@@ -1,8 +1,2 @@
-MAIN START
- OUT BUF,LEN
- RET
-BUF DC 'Hello, World!
-LEN DC 13
- END
Assemble error - 123: unclosed quote
../../../../as/err/err_123.casl: 4:BUF DC 'Hello, World!
diff --git a/test/system/casl2_err/err_123/cmd b/test/system/casl2_err/err_123/cmd
index 7be1a65..6b2fb6f 100755
--- a/test/system/casl2_err/err_123/cmd
+++ b/test/system/casl2_err/err_123/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_123.casl
../../../../casl2 ../../../../as/err/err_123.casl
diff --git a/test/system/casl2_err/err_124/0.txt b/test/system/casl2_err/err_124/0.txt
index 00e0863..24d9abd 100644
--- a/test/system/casl2_err/err_124/0.txt
+++ b/test/system/casl2_err/err_124/0.txt
@@ -1,6 +1,2 @@
-MAIN START
- LAD GR1,='ab'
-END RET
- END
Assemble error - 124: 'ab': more than one character in literal
../../../../as/err/err_124.casl: 2: LAD GR1,='ab'
diff --git a/test/system/casl2_err/err_124/cmd b/test/system/casl2_err/err_124/cmd
index 6110e0d..f7f2192 100755
--- a/test/system/casl2_err/err_124/cmd
+++ b/test/system/casl2_err/err_124/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_124.casl
../../../../casl2 ../../../../as/err/err_124.casl
diff --git a/test/system/casl2_err/err_125/0.txt b/test/system/casl2_err/err_125/0.txt
index 05b33a0..abd9a15 100644
--- a/test/system/casl2_err/err_125/0.txt
+++ b/test/system/casl2_err/err_125/0.txt
@@ -1,7 +1,2 @@
-MAIN START
- LD GR1,A,1
- RET
-A DC 0,1
- END
Assemble error - 125: LD: not GR in operand x
../../../../as/err/err_125.casl: 2: LD GR1,A,1
diff --git a/test/system/casl2_err/err_125/cmd b/test/system/casl2_err/err_125/cmd
index 1d392ab..c37f09f 100755
--- a/test/system/casl2_err/err_125/cmd
+++ b/test/system/casl2_err/err_125/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_125.casl
../../../../casl2 ../../../../as/err/err_125.casl
diff --git a/test/system/casl2_err/err_201/0.txt b/test/system/casl2_err/err_201/0.txt
index 30deaa3..a51e9d0 100644
--- a/test/system/casl2_err/err_201/0.txt
+++ b/test/system/casl2_err/err_201/0.txt
@@ -1,6 +1 @@
-;;; casl2 -M8 err_201.casl
-MAIN START
- JUMP #FFFF
-FIN RET
- END
Execute error - 201: PR:#FFFF: Program Register (PR) - memory overflow
diff --git a/test/system/casl2_err/err_201/cmd b/test/system/casl2_err/err_201/cmd
index 54a894d..052353c 100755
--- a/test/system/casl2_err/err_201/cmd
+++ b/test/system/casl2_err/err_201/cmd
@@ -1,3 +1 @@
-YACASL2DIR=../../../..
-cat $YACASL2DIR/as/err/err_201.casl
-$YACASL2DIR/casl2 -M8 $YACASL2DIR/as/err/err_201.casl
+../../../../casl2 -M8 ../../../../as/err/err_201.casl
diff --git a/test/system/casl2_err/err_202/0.txt b/test/system/casl2_err/err_202/0.txt
index 5948cf1..b6b279d 100644
--- a/test/system/casl2_err/err_202/0.txt
+++ b/test/system/casl2_err/err_202/0.txt
@@ -1,9 +1 @@
-;;; casl2 -M32 err_202.casl
-MAIN START
- RPUSH
- LD GR0,A
- RPOP
- RET
-A DC 7
- END
Execute error - 202: PR:#000E: Stack Pointer (SP) - stack overflow
diff --git a/test/system/casl2_err/err_202/cmd b/test/system/casl2_err/err_202/cmd
index dc72695..f05a2ae 100755
--- a/test/system/casl2_err/err_202/cmd
+++ b/test/system/casl2_err/err_202/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_202.casl
../../../../casl2 -M32 ../../../../as/err/err_202.casl
diff --git a/test/system/casl2_err/err_203/0.txt b/test/system/casl2_err/err_203/0.txt
index 403a8e7..1ccd366 100644
--- a/test/system/casl2_err/err_203/0.txt
+++ b/test/system/casl2_err/err_203/0.txt
@@ -1,6 +1 @@
-;;; casl2 -M8 err_203.casl
-MAIN START
- POP GR1
- RET
- END
Execute error - 203: PR:#0000: Stack Pointer (SP) - stack underflow
diff --git a/test/system/casl2_err/err_203/cmd b/test/system/casl2_err/err_203/cmd
index d7536c5..acee8fe 100755
--- a/test/system/casl2_err/err_203/cmd
+++ b/test/system/casl2_err/err_203/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_203.casl
../../../../casl2 -M8 ../../../../as/err/err_203.casl
diff --git a/test/system/casl2_err/err_207/0.txt b/test/system/casl2_err/err_207/0.txt
index a47eae0..be06bec 100644
--- a/test/system/casl2_err/err_207/0.txt
+++ b/test/system/casl2_err/err_207/0.txt
@@ -1,6 +1 @@
-;;; casl2 -M8 err_207.casl
-MAIN START
- LD GR1,#FFFF
- RET
- END
Execute error - 207: PR:#0001: address in word #2 - out of memory
diff --git a/test/system/casl2_err/err_207/cmd b/test/system/casl2_err/err_207/cmd
index a6c8911..8db01b9 100755
--- a/test/system/casl2_err/err_207/cmd
+++ b/test/system/casl2_err/err_207/cmd
@@ -1,2 +1 @@
-cat ../../../../as/err/err_207.casl
../../../../casl2 -M8 ../../../../as/err/err_207.casl
diff --git a/test/system/casl2_err/err_208/0.txt b/test/system/casl2_err/err_208/0.txt
index 0bf66a6..5b9f4fb 100644
--- a/test/system/casl2_err/err_208/0.txt
+++ b/test/system/casl2_err/err_208/0.txt
@@ -1,10 +1 @@
-;;; casl2 -M32 err_208.casl <teststr.txt
-MAIN START
- IN IBUF,ILEN
-FIN RET
-IBUF DS 10
-ILEN DS 1
- END
-12345678901234567890123456789012345678901234567890123456789012345678901234567890
-
Execute error - 208: SVC input - memory overflow
diff --git a/test/system/casl2_err/err_208/cmd b/test/system/casl2_err/err_208/cmd
index c39245c..58ae5c9 100755
--- a/test/system/casl2_err/err_208/cmd
+++ b/test/system/casl2_err/err_208/cmd
@@ -1,3 +1 @@
-YACASL2DIR=../../../..
-cat $YACASL2DIR/as/err/err_208.casl teststr.txt
-$YACASL2DIR/casl2 -M32 $YACASL2DIR/as/err/err_208.casl <teststr.txt
+../../../../casl2 -M32 ../../../../as/err/err_208.casl <teststr.txt
diff --git a/test/system/casl2_err/err_209/0.txt b/test/system/casl2_err/err_209/0.txt
index 6f1974a..f7d3df1 100644
--- a/test/system/casl2_err/err_209/0.txt
+++ b/test/system/casl2_err/err_209/0.txt
@@ -1,9 +1,2 @@
-;;; casl2 -M32 err_209.casl
-MAIN START
- OUT BUF,LEN
- RET
-BUF DC ' !'
-LEN DC 60
- END
!<
..Execute error - 209: SVC output - memory overflow
diff --git a/test/system/casl2_err/err_209/cmd b/test/system/casl2_err/err_209/cmd
index 016671d..e355b1c 100755
--- a/test/system/casl2_err/err_209/cmd
+++ b/test/system/casl2_err/err_209/cmd
@@ -1,3 +1 @@
-YACASL2DIR=../../../..
-cat $YACASL2DIR/as/err/err_209.casl
-$YACASL2DIR/casl2 -M32 $YACASL2DIR/as/err/err_209.casl
+../../../../casl2 -M32 ../../../../as/err/err_209.casl
diff --git a/test/system/casl2_opt/opt_o_nofile/0.txt b/test/system/casl2_opt/opt_o_nofile/0.txt
new file mode 100644
index 0000000..1448d64
--- /dev/null
+++ b/test/system/casl2_opt/opt_o_nofile/0.txt
@@ -0,0 +1 @@
+notexistfile.casl: No such file or directory
diff --git a/test/system/dumpword/a/Makefile b/test/system/casl2_opt/opt_o_nofile/Makefile
similarity index 100%
rename from test/system/dumpword/a/Makefile
rename to test/system/casl2_opt/opt_o_nofile/Makefile
diff --git a/test/system/casl2_opt/opt_o_nofile/cmd b/test/system/casl2_opt/opt_o_nofile/cmd
new file mode 100755
index 0000000..5d736a5
--- /dev/null
+++ b/test/system/casl2_opt/opt_o_nofile/cmd
@@ -0,0 +1 @@
+../../../../casl2 -o notexistfile.casl
diff --git a/test/system/casl2_opt/opt_opterr/0.txt b/test/system/casl2_opt/opt_opterr/0.txt
index 06d7a62..f281e21 100644
--- a/test/system/casl2_opt/opt_opterr/0.txt
+++ b/test/system/casl2_opt/opt_opterr/0.txt
@@ -1 +1,2 @@
+../../../../casl2: invalid option -- 'z'
Usage: ../../../../casl2 [-slLaAtTdmvh] [-oO[<OBJECTFILE>]] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE1[ FILE2 ...]
diff --git a/test/system/casl2_opt/opt_opterr/cmd b/test/system/casl2_opt/opt_opterr/cmd
index b8ff4b6..2fe73d6 100755
--- a/test/system/casl2_opt/opt_opterr/cmd
+++ b/test/system/casl2_opt/opt_opterr/cmd
@@ -1 +1 @@
-../../../../casl2 -z ../../../../as/sum_10.casl 2>&1 | tail -1 1>&2
+../../../../casl2 -z ../../../../as/sum_10.casl
diff --git a/test/system/casl2_opt/opt_s/0.txt b/test/system/casl2_opt/opt_s/0.txt
index 2189d06..351fed5 100644
--- a/test/system/casl2_opt/opt_s/0.txt
+++ b/test/system/casl2_opt/opt_s/0.txt
@@ -1,24 +1,3 @@
-;;; sum_10.casl
-;;; 1ãã10ã¾ã§ã®æ´æ°ããã¹ã¦å ç®ããå¤ãã¡ã¢ãªã¼ã«æ ¼ç´ãã
-MAIN START
- PUSH 0,GR1
- PUSH 0,GR2
- XOR GR2,GR2 ; GR2ãåæå
- LD GR1,FST ; GR1ã«åé
ãã¡ã¢ãªã¼ãã転é
-LOOP ADDL GR2,GR1 ; ã«ã¼ãå
é ãGR2 <- GR2 + GR1
- ADDL GR1,STEP ; GR1 <- GR1 + å
¬å·®
- CPL GR1,LST ; GR1ãæ«é
ãã大ããå ´åã¯çµäº
- JPL FIN ; â
- JUMP LOOP ; ã«ã¼ãçµç«¯
-FIN ST GR2,RST ; GR2ã®çµæãã¡ã¢ãªã¼ã«è»¢é
- POP GR2
- POP GR1
- RET
-FST DC 1 ; åé
-LST DC 10 ; æ«é
-STEP DC 1 ; å
¬å·®
-RST DS 1 ; çµæ
- END
Assemble ../../../../as/sample/sum_10.casl (0)
../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl
diff --git a/test/system/casl2_opt/opt_s/cmd b/test/system/casl2_opt/opt_s/cmd
index aed94f6..96702d4 100755
--- a/test/system/casl2_opt/opt_s/cmd
+++ b/test/system/casl2_opt/opt_s/cmd
@@ -1,2 +1 @@
-cat ../../../../as/sample/sum_10.casl
../../../../casl2 -s ../../../../as/sample/sum_10.casl
diff --git a/test/system/casl2_opt/opt_sL/0.txt b/test/system/casl2_opt/opt_sL/0.txt
index fd6c4ad..541b525 100644
--- a/test/system/casl2_opt/opt_sL/0.txt
+++ b/test/system/casl2_opt/opt_sL/0.txt
@@ -1,24 +1,3 @@
-;;; sum_10.casl
-;;; 1ãã10ã¾ã§ã®æ´æ°ããã¹ã¦å ç®ããå¤ãã¡ã¢ãªã¼ã«æ ¼ç´ãã
-MAIN START
- PUSH 0,GR1
- PUSH 0,GR2
- XOR GR2,GR2 ; GR2ãåæå
- LD GR1,FST ; GR1ã«åé
ãã¡ã¢ãªã¼ãã転é
-LOOP ADDL GR2,GR1 ; ã«ã¼ãå
é ãGR2 <- GR2 + GR1
- ADDL GR1,STEP ; GR1 <- GR1 + å
¬å·®
- CPL GR1,LST ; GR1ãæ«é
ãã大ããå ´åã¯çµäº
- JPL FIN ; â
- JUMP LOOP ; ã«ã¼ãçµç«¯
-FIN ST GR2,RST ; GR2ã®çµæãã¡ã¢ãªã¼ã«è»¢é
- POP GR2
- POP GR1
- RET
-FST DC 1 ; åé
-LST DC 10 ; æ«é
-STEP DC 1 ; å
¬å·®
-RST DS 1 ; çµæ
- END
Assemble ../../../../as/sample/sum_10.casl (0)
../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl
diff --git a/test/system/casl2_opt/opt_sL/cmd b/test/system/casl2_opt/opt_sL/cmd
index 11dde66..0b7f7cd 100755
--- a/test/system/casl2_opt/opt_sL/cmd
+++ b/test/system/casl2_opt/opt_sL/cmd
@@ -1,2 +1 @@
-cat ../../../../as/sample/sum_10.casl
../../../../casl2 -sL ../../../../as/sample/sum_10.casl
diff --git a/test/system/casl2_opt/opt_slA/0.txt b/test/system/casl2_opt/opt_slA/0.txt
index a8afb2e..8b77aea 100644
--- a/test/system/casl2_opt/opt_slA/0.txt
+++ b/test/system/casl2_opt/opt_slA/0.txt
@@ -1,24 +1,3 @@
-;;; sum_10.casl
-;;; 1ãã10ã¾ã§ã®æ´æ°ããã¹ã¦å ç®ããå¤ãã¡ã¢ãªã¼ã«æ ¼ç´ãã
-MAIN START
- PUSH 0,GR1
- PUSH 0,GR2
- XOR GR2,GR2 ; GR2ãåæå
- LD GR1,FST ; GR1ã«åé
ãã¡ã¢ãªã¼ãã転é
-LOOP ADDL GR2,GR1 ; ã«ã¼ãå
é ãGR2 <- GR2 + GR1
- ADDL GR1,STEP ; GR1 <- GR1 + å
¬å·®
- CPL GR1,LST ; GR1ãæ«é
ãã大ããå ´åã¯çµäº
- JPL FIN ; â
- JUMP LOOP ; ã«ã¼ãçµç«¯
-FIN ST GR2,RST ; GR2ã®çµæãã¡ã¢ãªã¼ã«è»¢é
- POP GR2
- POP GR1
- RET
-FST DC 1 ; åé
-LST DC 10 ; æ«é
-STEP DC 1 ; å
¬å·®
-RST DS 1 ; çµæ
- END
Assemble ../../../../as/sample/sum_10.casl (0)
../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl
diff --git a/test/system/casl2_opt/opt_slA/cmd b/test/system/casl2_opt/opt_slA/cmd
index 7406f90..c99852c 100755
--- a/test/system/casl2_opt/opt_slA/cmd
+++ b/test/system/casl2_opt/opt_slA/cmd
@@ -1,2 +1 @@
-cat ../../../../as/sample/sum_10.casl
../../../../casl2 -slA ../../../../as/sample/sum_10.casl
diff --git a/test/system/casl2_opt/opt_slaO/0.txt b/test/system/casl2_opt/opt_slaO/0.txt
index a8afb2e..b58aeff 100644
--- a/test/system/casl2_opt/opt_slaO/0.txt
+++ b/test/system/casl2_opt/opt_slaO/0.txt
@@ -1,24 +1,3 @@
-;;; sum_10.casl
-;;; 1ãã10ã¾ã§ã®æ´æ°ããã¹ã¦å ç®ããå¤ãã¡ã¢ãªã¼ã«æ ¼ç´ãã
-MAIN START
- PUSH 0,GR1
- PUSH 0,GR2
- XOR GR2,GR2 ; GR2ãåæå
- LD GR1,FST ; GR1ã«åé
ãã¡ã¢ãªã¼ãã転é
-LOOP ADDL GR2,GR1 ; ã«ã¼ãå
é ãGR2 <- GR2 + GR1
- ADDL GR1,STEP ; GR1 <- GR1 + å
¬å·®
- CPL GR1,LST ; GR1ãæ«é
ãã大ããå ´åã¯çµäº
- JPL FIN ; â
- JUMP LOOP ; ã«ã¼ãçµç«¯
-FIN ST GR2,RST ; GR2ã®çµæãã¡ã¢ãªã¼ã«è»¢é
- POP GR2
- POP GR1
- RET
-FST DC 1 ; åé
-LST DC 10 ; æ«é
-STEP DC 1 ; å
¬å·®
-RST DS 1 ; çµæ
- END
Assemble ../../../../as/sample/sum_10.casl (0)
../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl
@@ -99,3 +78,8 @@ Assemble ../../../../as/sample/sum_10.casl (1)
../../../../as/sample/sum_10.casl: 20:RST DS 1 ; çµæ
#0018 #0000
../../../../as/sample/sum_10.casl: 21: END
+0000000 7001 0000 7002 0000 3622 1010 0015 2621
+0000020 2210 0017 4110 0016 6500 0010 6400 0007
+0000040 1120 0018 7120 7110 8100 0001 000a 0001
+0000060 0000
+0000062
diff --git a/test/system/casl2_opt/opt_slaO/Makefile b/test/system/casl2_opt/opt_slaO/Makefile
index b6dac59..6d08bec 100644
--- a/test/system/casl2_opt/opt_slaO/Makefile
+++ b/test/system/casl2_opt/opt_slaO/Makefile
@@ -1,2 +1,7 @@
include ../Define.mk
include ../Test.mk
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/casl2_opt/opt_slaO/cmd b/test/system/casl2_opt/opt_slaO/cmd
index 98822fc..f689196 100755
--- a/test/system/casl2_opt/opt_slaO/cmd
+++ b/test/system/casl2_opt/opt_slaO/cmd
@@ -1,2 +1,2 @@
-cat ../../../../as/sample/sum_10.casl
-../../../../casl2 -sla -O ../../../../as/sample/sum_10.casl
+sh cmd_valgrind
+od -x a.o
diff --git a/test/system/casl2_opt/opt_slaO/cmd_valgrind b/test/system/casl2_opt/opt_slaO/cmd_valgrind
new file mode 100755
index 0000000..7e639b3
--- /dev/null
+++ b/test/system/casl2_opt/opt_slaO/cmd_valgrind
@@ -0,0 +1 @@
+../../../../casl2 -sla -O ../../../../as/sample/sum_10.casl
diff --git a/test/system/casl2_opt/opt_slaOn/0.txt b/test/system/casl2_opt/opt_slaOn/0.txt
index a8afb2e..b58aeff 100644
--- a/test/system/casl2_opt/opt_slaOn/0.txt
+++ b/test/system/casl2_opt/opt_slaOn/0.txt
@@ -1,24 +1,3 @@
-;;; sum_10.casl
-;;; 1ãã10ã¾ã§ã®æ´æ°ããã¹ã¦å ç®ããå¤ãã¡ã¢ãªã¼ã«æ ¼ç´ãã
-MAIN START
- PUSH 0,GR1
- PUSH 0,GR2
- XOR GR2,GR2 ; GR2ãåæå
- LD GR1,FST ; GR1ã«åé
ãã¡ã¢ãªã¼ãã転é
-LOOP ADDL GR2,GR1 ; ã«ã¼ãå
é ãGR2 <- GR2 + GR1
- ADDL GR1,STEP ; GR1 <- GR1 + å
¬å·®
- CPL GR1,LST ; GR1ãæ«é
ãã大ããå ´åã¯çµäº
- JPL FIN ; â
- JUMP LOOP ; ã«ã¼ãçµç«¯
-FIN ST GR2,RST ; GR2ã®çµæãã¡ã¢ãªã¼ã«è»¢é
- POP GR2
- POP GR1
- RET
-FST DC 1 ; åé
-LST DC 10 ; æ«é
-STEP DC 1 ; å
¬å·®
-RST DS 1 ; çµæ
- END
Assemble ../../../../as/sample/sum_10.casl (0)
../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl
@@ -99,3 +78,8 @@ Assemble ../../../../as/sample/sum_10.casl (1)
../../../../as/sample/sum_10.casl: 20:RST DS 1 ; çµæ
#0018 #0000
../../../../as/sample/sum_10.casl: 21: END
+0000000 7001 0000 7002 0000 3622 1010 0015 2621
+0000020 2210 0017 4110 0016 6500 0010 6400 0007
+0000040 1120 0018 7120 7110 8100 0001 000a 0001
+0000060 0000
+0000062
diff --git a/test/system/casl2_opt/opt_slaOn/Makefile b/test/system/casl2_opt/opt_slaOn/Makefile
index b6dac59..e039251 100644
--- a/test/system/casl2_opt/opt_slaOn/Makefile
+++ b/test/system/casl2_opt/opt_slaOn/Makefile
@@ -1,2 +1,7 @@
include ../Define.mk
include ../Test.mk
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) opt.o
diff --git a/test/system/casl2_opt/opt_slaOn/cmd b/test/system/casl2_opt/opt_slaOn/cmd
index 80b9087..2925181 100755
--- a/test/system/casl2_opt/opt_slaOn/cmd
+++ b/test/system/casl2_opt/opt_slaOn/cmd
@@ -1,2 +1,2 @@
-cat ../../../../as/sample/sum_10.casl
-../../../../casl2 -sla -Oopt.o ../../../../as/sample/sum_10.casl
+sh cmd_valgrind
+od -x opt.o
diff --git a/test/system/casl2_opt/opt_slaOn/cmd_valgrind b/test/system/casl2_opt/opt_slaOn/cmd_valgrind
new file mode 100755
index 0000000..ad32b25
--- /dev/null
+++ b/test/system/casl2_opt/opt_slaOn/cmd_valgrind
@@ -0,0 +1,2 @@
+../../../../casl2 -sla -Oopt.o ../../../../as/sample/sum_10.casl
+
diff --git a/test/system/casl2_opt/opt_slao_T/0.txt b/test/system/casl2_opt/opt_slao_T/0.txt
index 510ab9d..08525e0 100644
--- a/test/system/casl2_opt/opt_slao_T/0.txt
+++ b/test/system/casl2_opt/opt_slao_T/0.txt
@@ -1,24 +1,3 @@
-;;; sum_10.casl
-;;; 1ãã10ã¾ã§ã®æ´æ°ããã¹ã¦å ç®ããå¤ãã¡ã¢ãªã¼ã«æ ¼ç´ãã
-MAIN START
- PUSH 0,GR1
- PUSH 0,GR2
- XOR GR2,GR2 ; GR2ãåæå
- LD GR1,FST ; GR1ã«åé
ãã¡ã¢ãªã¼ãã転é
-LOOP ADDL GR2,GR1 ; ã«ã¼ãå
é ãGR2 <- GR2 + GR1
- ADDL GR1,STEP ; GR1 <- GR1 + å
¬å·®
- CPL GR1,LST ; GR1ãæ«é
ãã大ããå ´åã¯çµäº
- JPL FIN ; â
- JUMP LOOP ; ã«ã¼ãçµç«¯
-FIN ST GR2,RST ; GR2ã®çµæãã¡ã¢ãªã¼ã«è»¢é
- POP GR2
- POP GR1
- RET
-FST DC 1 ; åé
-LST DC 10 ; æ«é
-STEP DC 1 ; å
¬å·®
-RST DS 1 ; çµæ
- END
Assemble ../../../../as/sample/sum_10.casl (0)
../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl
@@ -842,3 +821,8 @@ Executing machine codes
#0014: PR: 20 = #0014 = 0000000000010100
#0014: FR (OF SF ZF): 000
+0000000 7001 0000 7002 0000 3622 1010 0015 2621
+0000020 2210 0017 4110 0016 6500 0010 6400 0007
+0000040 1120 0018 7120 7110 8100 0001 000a 0001
+0000060 0000
+0000062
diff --git a/test/system/casl2_opt/opt_slao_T/Makefile b/test/system/casl2_opt/opt_slao_T/Makefile
index b6dac59..6d08bec 100644
--- a/test/system/casl2_opt/opt_slao_T/Makefile
+++ b/test/system/casl2_opt/opt_slao_T/Makefile
@@ -1,2 +1,7 @@
include ../Define.mk
include ../Test.mk
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/casl2_opt/opt_slao_T/cmd b/test/system/casl2_opt/opt_slao_T/cmd
index b71e5c1..f689196 100755
--- a/test/system/casl2_opt/opt_slao_T/cmd
+++ b/test/system/casl2_opt/opt_slao_T/cmd
@@ -1,2 +1,2 @@
-cat ../../../../as/sample/sum_10.casl
-../../../../casl2 -slaTo ../../../../as/sample/sum_10.casl
+sh cmd_valgrind
+od -x a.o
diff --git a/test/system/casl2_opt/opt_slao_T/cmd_valgrind b/test/system/casl2_opt/opt_slao_T/cmd_valgrind
new file mode 100755
index 0000000..5a1a12f
--- /dev/null
+++ b/test/system/casl2_opt/opt_slao_T/cmd_valgrind
@@ -0,0 +1 @@
+../../../../casl2 -slaTo ../../../../as/sample/sum_10.casl
diff --git a/test/system/casl2_opt/opt_slaot/0.txt b/test/system/casl2_opt/opt_slaot/0.txt
index 510ab9d..08525e0 100644
--- a/test/system/casl2_opt/opt_slaot/0.txt
+++ b/test/system/casl2_opt/opt_slaot/0.txt
@@ -1,24 +1,3 @@
-;;; sum_10.casl
-;;; 1ãã10ã¾ã§ã®æ´æ°ããã¹ã¦å ç®ããå¤ãã¡ã¢ãªã¼ã«æ ¼ç´ãã
-MAIN START
- PUSH 0,GR1
- PUSH 0,GR2
- XOR GR2,GR2 ; GR2ãåæå
- LD GR1,FST ; GR1ã«åé
ãã¡ã¢ãªã¼ãã転é
-LOOP ADDL GR2,GR1 ; ã«ã¼ãå
é ãGR2 <- GR2 + GR1
- ADDL GR1,STEP ; GR1 <- GR1 + å
¬å·®
- CPL GR1,LST ; GR1ãæ«é
ãã大ããå ´åã¯çµäº
- JPL FIN ; â
- JUMP LOOP ; ã«ã¼ãçµç«¯
-FIN ST GR2,RST ; GR2ã®çµæãã¡ã¢ãªã¼ã«è»¢é
- POP GR2
- POP GR1
- RET
-FST DC 1 ; åé
-LST DC 10 ; æ«é
-STEP DC 1 ; å
¬å·®
-RST DS 1 ; çµæ
- END
Assemble ../../../../as/sample/sum_10.casl (0)
../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl
@@ -842,3 +821,8 @@ Executing machine codes
#0014: PR: 20 = #0014 = 0000000000010100
#0014: FR (OF SF ZF): 000
+0000000 7001 0000 7002 0000 3622 1010 0015 2621
+0000020 2210 0017 4110 0016 6500 0010 6400 0007
+0000040 1120 0018 7120 7110 8100 0001 000a 0001
+0000060 0000
+0000062
diff --git a/test/system/casl2_opt/opt_slaot/Makefile b/test/system/casl2_opt/opt_slaot/Makefile
index b6dac59..6d08bec 100644
--- a/test/system/casl2_opt/opt_slaot/Makefile
+++ b/test/system/casl2_opt/opt_slaot/Makefile
@@ -1,2 +1,7 @@
include ../Define.mk
include ../Test.mk
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/casl2_opt/opt_slaot/cmd b/test/system/casl2_opt/opt_slaot/cmd
index ebc2594..f689196 100755
--- a/test/system/casl2_opt/opt_slaot/cmd
+++ b/test/system/casl2_opt/opt_slaot/cmd
@@ -1,2 +1,2 @@
-cat ../../../../as/sample/sum_10.casl
-../../../../casl2 -slat -o ../../../../as/sample/sum_10.casl
+sh cmd_valgrind
+od -x a.o
diff --git a/test/system/casl2_opt/opt_slaot/cmd_valgrind b/test/system/casl2_opt/opt_slaot/cmd_valgrind
new file mode 100755
index 0000000..6ad31e5
--- /dev/null
+++ b/test/system/casl2_opt/opt_slaot/cmd_valgrind
@@ -0,0 +1 @@
+../../../../casl2 -slat -o ../../../../as/sample/sum_10.casl
diff --git a/test/system/casl2_opt/opt_slaotd/0.txt b/test/system/casl2_opt/opt_slaotd/0.txt
index f32c95c..1b9ee0a 100644
--- a/test/system/casl2_opt/opt_slaotd/0.txt
+++ b/test/system/casl2_opt/opt_slaotd/0.txt
@@ -1,24 +1,3 @@
-;;; sum_10.casl
-;;; 1ãã10ã¾ã§ã®æ´æ°ããã¹ã¦å ç®ããå¤ãã¡ã¢ãªã¼ã«æ ¼ç´ãã
-MAIN START
- PUSH 0,GR1
- PUSH 0,GR2
- XOR GR2,GR2 ; GR2ãåæå
- LD GR1,FST ; GR1ã«åé
ãã¡ã¢ãªã¼ãã転é
-LOOP ADDL GR2,GR1 ; ã«ã¼ãå
é ãGR2 <- GR2 + GR1
- ADDL GR1,STEP ; GR1 <- GR1 + å
¬å·®
- CPL GR1,LST ; GR1ãæ«é
ãã大ããå ´åã¯çµäº
- JPL FIN ; â
- JUMP LOOP ; ã«ã¼ãçµç«¯
-FIN ST GR2,RST ; GR2ã®çµæãã¡ã¢ãªã¼ã«è»¢é
- POP GR2
- POP GR1
- RET
-FST DC 1 ; åé
-LST DC 10 ; æ«é
-STEP DC 1 ; å
¬å·®
-RST DS 1 ; çµæ
- END
Assemble ../../../../as/sample/sum_10.casl (0)
../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl
@@ -2837,3 +2816,8 @@ Executing machine codes
#0014: 01E0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
#0014: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+0000000 7001 0000 7002 0000 3622 1010 0015 2621
+0000020 2210 0017 4110 0016 6500 0010 6400 0007
+0000040 1120 0018 7120 7110 8100 0001 000a 0001
+0000060 0000
+0000062
diff --git a/test/system/casl2_opt/opt_slaotd/Makefile b/test/system/casl2_opt/opt_slaotd/Makefile
index b6dac59..6d08bec 100644
--- a/test/system/casl2_opt/opt_slaotd/Makefile
+++ b/test/system/casl2_opt/opt_slaotd/Makefile
@@ -1,2 +1,7 @@
include ../Define.mk
include ../Test.mk
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/casl2_opt/opt_slaotd/cmd b/test/system/casl2_opt/opt_slaotd/cmd
index acd8987..f689196 100755
--- a/test/system/casl2_opt/opt_slaotd/cmd
+++ b/test/system/casl2_opt/opt_slaotd/cmd
@@ -1,2 +1,2 @@
-cat ../../../../as/sample/sum_10.casl
-../../../../casl2 -slatdo ../../../../as/sample/sum_10.casl
+sh cmd_valgrind
+od -x a.o
diff --git a/test/system/casl2_opt/opt_slaotd/cmd_valgrind b/test/system/casl2_opt/opt_slaotd/cmd_valgrind
new file mode 100755
index 0000000..b31740d
--- /dev/null
+++ b/test/system/casl2_opt/opt_slaotd/cmd_valgrind
@@ -0,0 +1 @@
+../../../../casl2 -slatdo ../../../../as/sample/sum_10.casl
diff --git a/test/system/casl2_smoke/hello/0.txt b/test/system/casl2_smoke/hello/0.txt
index 384470e..b53f2dc 100644
--- a/test/system/casl2_smoke/hello/0.txt
+++ b/test/system/casl2_smoke/hello/0.txt
@@ -1,9 +1,3 @@
-MAIN START
- OUT OBUF,LEN
- RET
-OBUF DC 'Hello, World!'
-LEN DC 13
- END
Assemble ../../../../as/sample/hello.casl (0)
../../../../as/sample/hello.casl: 1:MAIN START
diff --git a/test/system/casl2_smoke/hello/cmd b/test/system/casl2_smoke/hello/cmd
index 1b676ca..435fbf7 100755
--- a/test/system/casl2_smoke/hello/cmd
+++ b/test/system/casl2_smoke/hello/cmd
@@ -1,2 +1 @@
-cat ../../../../as/sample/hello.casl
../../../../casl2 -sla ../../../../as/sample/hello.casl
diff --git a/test/system/casl2rev/io/Makefile b/test/system/casl2rev/io/Makefile
index b6dac59..ced7c64 100644
--- a/test/system/casl2rev/io/Makefile
+++ b/test/system/casl2rev/io/Makefile
@@ -1,2 +1,7 @@
include ../Define.mk
include ../Test.mk
+
+cmd: io.o
+
+io.o: ../../../../as/misc/io.casl
+ ../../../../casl2 -O$@ $<
diff --git a/test/system/casl2rev/io/cmd b/test/system/casl2rev/io/cmd
index c388a75..7a07d12 100755
--- a/test/system/casl2rev/io/cmd
+++ b/test/system/casl2rev/io/cmd
@@ -1,2 +1 @@
-../../../../casl2 -O../../../../as/misc/io.o ../../../../as/misc/io.casl
-../../../../casl2rev ../../../../as/misc/io.o
+../../../../casl2rev io.o
diff --git a/test/system/comet2_cmd/cmd_adda_r1_r2/Makefile b/test/system/comet2_cmd/cmd_adda_r1_r2/Makefile
index b6dac59..9c96b9f 100644
--- a/test/system/comet2_cmd/cmd_adda_r1_r2/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r1_r2/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r1_r2.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r1_r2/cmd b/test/system/comet2_cmd/cmd_adda_r1_r2/cmd
index bed22ef..8b17467 100755
--- a/test/system/comet2_cmd/cmd_adda_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r1_r2/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r1_r2.casl
../../../../comet2 -td -M128 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr/Makefile b/test/system/comet2_cmd/cmd_adda_r_adr/Makefile
index b6dac59..fbf2ef3 100644
--- a/test/system/comet2_cmd/cmd_adda_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr/cmd b/test/system/comet2_cmd/cmd_adda_r_adr/cmd
index 3c720df..371301e 100755
--- a/test/system/comet2_cmd/cmd_adda_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__ao/Makefile b/test/system/comet2_cmd/cmd_adda_r_adr__ao/Makefile
index b6dac59..6179f47 100644
--- a/test/system/comet2_cmd/cmd_adda_r_adr__ao/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__ao/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr__ao.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__ao/cmd b/test/system/comet2_cmd/cmd_adda_r_adr__ao/cmd
index c06876a..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_adda_r_adr__ao/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__ao/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr__ao.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__as0/Makefile b/test/system/comet2_cmd/cmd_adda_r_adr__as0/Makefile
index b6dac59..c19be67 100644
--- a/test/system/comet2_cmd/cmd_adda_r_adr__as0/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__as0/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr__as0.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__as0/cmd b/test/system/comet2_cmd/cmd_adda_r_adr__as0/cmd
index ebd30d3..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_adda_r_adr__as0/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__as0/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr__as0.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__as1/Makefile b/test/system/comet2_cmd/cmd_adda_r_adr__as1/Makefile
index b6dac59..3bf9e78 100644
--- a/test/system/comet2_cmd/cmd_adda_r_adr__as1/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__as1/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr__as1.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__as1/cmd b/test/system/comet2_cmd/cmd_adda_r_adr__as1/cmd
index 071b858..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_adda_r_adr__as1/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__as1/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr__as1.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__az/Makefile b/test/system/comet2_cmd/cmd_adda_r_adr__az/Makefile
index b6dac59..bd26373 100644
--- a/test/system/comet2_cmd/cmd_adda_r_adr__az/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__az/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr__az.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__az/cmd b/test/system/comet2_cmd/cmd_adda_r_adr__az/cmd
index 28cee76..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_adda_r_adr__az/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__az/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr__az.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__lo/Makefile b/test/system/comet2_cmd/cmd_adda_r_adr__lo/Makefile
index b6dac59..5b4ff46 100644
--- a/test/system/comet2_cmd/cmd_adda_r_adr__lo/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__lo/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr__lo.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__lo/cmd b/test/system/comet2_cmd/cmd_adda_r_adr__lo/cmd
index 821cdc3..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_adda_r_adr__lo/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__lo/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr__lo.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__o/Makefile b/test/system/comet2_cmd/cmd_adda_r_adr__o/Makefile
index b6dac59..04ab108 100644
--- a/test/system/comet2_cmd/cmd_adda_r_adr__o/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__o/cmd b/test/system/comet2_cmd/cmd_adda_r_adr__o/cmd
index c794b49..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_adda_r_adr__o/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr__o.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__z/Makefile b/test/system/comet2_cmd/cmd_adda_r_adr__z/Makefile
index b6dac59..b51b314 100644
--- a/test/system/comet2_cmd/cmd_adda_r_adr__z/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr__z/cmd b/test/system/comet2_cmd/cmd_adda_r_adr__z/cmd
index 97af609..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_adda_r_adr__z/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r_adr__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_adda_r_adr_x/Makefile
index b6dac59..d32fc75 100644
--- a/test/system/comet2_cmd/cmd_adda_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_adda_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_adda_r_adr_x/cmd b/test/system/comet2_cmd/cmd_adda_r_adr_x/cmd
index 262603d..371301e 100755
--- a/test/system/comet2_cmd/cmd_adda_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_adda_r_adr_x/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr_x.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r1_r2/Makefile b/test/system/comet2_cmd/cmd_addl_r1_r2/Makefile
index b6dac59..f767ca6 100644
--- a/test/system/comet2_cmd/cmd_addl_r1_r2/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r1_r2/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r1_r2.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r1_r2/cmd b/test/system/comet2_cmd/cmd_addl_r1_r2/cmd
index 0b3f66f..1372ec0 100755
--- a/test/system/comet2_cmd/cmd_addl_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r1_r2/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r1_r2.casl
../../../../comet2 -Td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r_adr/Makefile b/test/system/comet2_cmd/cmd_addl_r_adr/Makefile
index b6dac59..4a17a2b 100644
--- a/test/system/comet2_cmd/cmd_addl_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) 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 3f61679..2b6b1d7 100755
--- a/test/system/comet2_cmd/cmd_addl_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_addl_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__ao/Makefile b/test/system/comet2_cmd/cmd_addl_r_adr__ao/Makefile
index b6dac59..1ae097b 100644
--- a/test/system/comet2_cmd/cmd_addl_r_adr__ao/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__ao/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r_adr__ao.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 4adcd9b..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__ao.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__as0/Makefile b/test/system/comet2_cmd/cmd_addl_r_adr__as0/Makefile
index b6dac59..54b739e 100644
--- a/test/system/comet2_cmd/cmd_addl_r_adr__as0/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__as0/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r_adr__as0.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 af15cbb..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__as0.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__as1/Makefile b/test/system/comet2_cmd/cmd_addl_r_adr__as1/Makefile
index b6dac59..13c245a 100644
--- a/test/system/comet2_cmd/cmd_addl_r_adr__as1/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__as1/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r_adr__as1.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 cf620e9..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__as1.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__az/Makefile b/test/system/comet2_cmd/cmd_addl_r_adr__az/Makefile
index b6dac59..fd599dc 100644
--- a/test/system/comet2_cmd/cmd_addl_r_adr__az/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__az/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r_adr__az.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 4563670..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__az.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__lo/Makefile b/test/system/comet2_cmd/cmd_addl_r_adr__lo/Makefile
index b6dac59..c88f2e2 100644
--- a/test/system/comet2_cmd/cmd_addl_r_adr__lo/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__lo/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r_adr__lo.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 6f901c6..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__lo.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__o/Makefile b/test/system/comet2_cmd/cmd_addl_r_adr__o/Makefile
index b6dac59..70d84da 100644
--- a/test/system/comet2_cmd/cmd_addl_r_adr__o/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r_adr__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 8331829..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__o.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r_adr__z/Makefile b/test/system/comet2_cmd/cmd_addl_r_adr__z/Makefile
index b6dac59..b962ea3 100644
--- a/test/system/comet2_cmd/cmd_addl_r_adr__z/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r_adr__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r_adr__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) 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 7bb43f5..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr__z.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_addl_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_addl_r_adr_x/Makefile
index b6dac59..74ef3ae 100644
--- a/test/system/comet2_cmd/cmd_addl_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_addl_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDL/addl_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) 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 a7c1283..1372ec0 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/ADDL/addl_r_adr_x.casl
../../../../comet2 -Td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_and_r1_r2/Makefile b/test/system/comet2_cmd/cmd_and_r1_r2/Makefile
index b6dac59..fb8c950 100644
--- a/test/system/comet2_cmd/cmd_and_r1_r2/Makefile
+++ b/test/system/comet2_cmd/cmd_and_r1_r2/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/AND/and_r1_r2.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_and_r1_r2/cmd b/test/system/comet2_cmd/cmd_and_r1_r2/cmd
index 08e60f1..371301e 100755
--- a/test/system/comet2_cmd/cmd_and_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_and_r1_r2/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/AND/and_r1_r2.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_and_r_adr/Makefile b/test/system/comet2_cmd/cmd_and_r_adr/Makefile
index b6dac59..51a4508 100644
--- a/test/system/comet2_cmd/cmd_and_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_and_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/AND/and_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_and_r_adr/cmd b/test/system/comet2_cmd/cmd_and_r_adr/cmd
index b88da8e..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_and_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_and_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/AND/and_r_adr.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_and_r_adr__s/Makefile b/test/system/comet2_cmd/cmd_and_r_adr__s/Makefile
index b6dac59..770f288 100644
--- a/test/system/comet2_cmd/cmd_and_r_adr__s/Makefile
+++ b/test/system/comet2_cmd/cmd_and_r_adr__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/AND/and_r_adr__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_and_r_adr__s/cmd b/test/system/comet2_cmd/cmd_and_r_adr__s/cmd
index 9e0f213..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_and_r_adr__s/cmd
+++ b/test/system/comet2_cmd/cmd_and_r_adr__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/AND/and_r_adr__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_and_r_adr__z/Makefile b/test/system/comet2_cmd/cmd_and_r_adr__z/Makefile
index b6dac59..c2ba69d 100644
--- a/test/system/comet2_cmd/cmd_and_r_adr__z/Makefile
+++ b/test/system/comet2_cmd/cmd_and_r_adr__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/AND/and_r_adr__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_and_r_adr__z/cmd b/test/system/comet2_cmd/cmd_and_r_adr__z/cmd
index 56ba2e2..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_and_r_adr__z/cmd
+++ b/test/system/comet2_cmd/cmd_and_r_adr__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/AND/and_r_adr__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_and_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_and_r_adr_x/Makefile
index b6dac59..4765d12 100644
--- a/test/system/comet2_cmd/cmd_and_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_and_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/AND/and_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_and_r_adr_x/cmd b/test/system/comet2_cmd/cmd_and_r_adr_x/cmd
index eeb2acb..371301e 100755
--- a/test/system/comet2_cmd/cmd_and_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_and_r_adr_x/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/AND/and_r_adr_x.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_call__inner/Makefile b/test/system/comet2_cmd/cmd_call__inner/Makefile
index b6dac59..7f8c6db 100644
--- a/test/system/comet2_cmd/cmd_call__inner/Makefile
+++ b/test/system/comet2_cmd/cmd_call__inner/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CALL/call__inner.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_call__inner/cmd b/test/system/comet2_cmd/cmd_call__inner/cmd
index e8d6fa1..371301e 100755
--- a/test/system/comet2_cmd/cmd_call__inner/cmd
+++ b/test/system/comet2_cmd/cmd_call__inner/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CALL/call__inner.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_call__outer/Makefile b/test/system/comet2_cmd/cmd_call__outer/Makefile
index b6dac59..489bb49 100644
--- a/test/system/comet2_cmd/cmd_call__outer/Makefile
+++ b/test/system/comet2_cmd/cmd_call__outer/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CALL/call__outer.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_call__outer/cmd b/test/system/comet2_cmd/cmd_call__outer/cmd
index e9c23bd..371301e 100755
--- a/test/system/comet2_cmd/cmd_call__outer/cmd
+++ b/test/system/comet2_cmd/cmd_call__outer/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CALL/call__outer.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r1_r2__s/Makefile b/test/system/comet2_cmd/cmd_cpa_r1_r2__s/Makefile
index b6dac59..9a9b71e 100644
--- a/test/system/comet2_cmd/cmd_cpa_r1_r2__s/Makefile
+++ b/test/system/comet2_cmd/cmd_cpa_r1_r2__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPA/cpa_r1_r2__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r1_r2__s/cmd b/test/system/comet2_cmd/cmd_cpa_r1_r2__s/cmd
index 37d6376..371301e 100755
--- a/test/system/comet2_cmd/cmd_cpa_r1_r2__s/cmd
+++ b/test/system/comet2_cmd/cmd_cpa_r1_r2__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPA/cpa_r1_r2__s.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr/Makefile b/test/system/comet2_cmd/cmd_cpa_r_adr/Makefile
index b6dac59..0d93e0a 100644
--- a/test/system/comet2_cmd/cmd_cpa_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPA/cpa_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr/cmd b/test/system/comet2_cmd/cmd_cpa_r_adr/cmd
index b99f3f0..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_cpa_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPA/cpa_r_adr.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr__ls/Makefile b/test/system/comet2_cmd/cmd_cpa_r_adr__ls/Makefile
index b6dac59..8ba00ca 100644
--- a/test/system/comet2_cmd/cmd_cpa_r_adr__ls/Makefile
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr__ls/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPA/cpa_r_adr__ls.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr__ls/cmd b/test/system/comet2_cmd/cmd_cpa_r_adr__ls/cmd
index 1690b79..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_cpa_r_adr__ls/cmd
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr__ls/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPA/cpa_r_adr__ls.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr__s/Makefile b/test/system/comet2_cmd/cmd_cpa_r_adr__s/Makefile
index b6dac59..1a7231d 100644
--- a/test/system/comet2_cmd/cmd_cpa_r_adr__s/Makefile
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPA/cpa_r_adr__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr__s/cmd b/test/system/comet2_cmd/cmd_cpa_r_adr__s/cmd
index 8af9f5c..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_cpa_r_adr__s/cmd
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPA/cpa_r_adr__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr__z/Makefile b/test/system/comet2_cmd/cmd_cpa_r_adr__z/Makefile
index b6dac59..1f1117b 100644
--- a/test/system/comet2_cmd/cmd_cpa_r_adr__z/Makefile
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPA/cpa_r_adr__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr__z/cmd b/test/system/comet2_cmd/cmd_cpa_r_adr__z/cmd
index 06b5959..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_cpa_r_adr__z/cmd
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPA/cpa_r_adr__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr_x__s/Makefile b/test/system/comet2_cmd/cmd_cpa_r_adr_x__s/Makefile
index b6dac59..4d87b5a 100644
--- a/test/system/comet2_cmd/cmd_cpa_r_adr_x__s/Makefile
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr_x__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPA/cpa_r_adr_x__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpa_r_adr_x__s/cmd b/test/system/comet2_cmd/cmd_cpa_r_adr_x__s/cmd
index b5b4c4f..371301e 100755
--- a/test/system/comet2_cmd/cmd_cpa_r_adr_x__s/cmd
+++ b/test/system/comet2_cmd/cmd_cpa_r_adr_x__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPA/cpa_r_adr_x__s.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r1_r2__s/Makefile b/test/system/comet2_cmd/cmd_cpl_r1_r2__s/Makefile
index b6dac59..93f74d0 100644
--- a/test/system/comet2_cmd/cmd_cpl_r1_r2__s/Makefile
+++ b/test/system/comet2_cmd/cmd_cpl_r1_r2__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPL/cpl_r1_r2__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r1_r2__s/cmd b/test/system/comet2_cmd/cmd_cpl_r1_r2__s/cmd
index a9ae5e6..371301e 100755
--- a/test/system/comet2_cmd/cmd_cpl_r1_r2__s/cmd
+++ b/test/system/comet2_cmd/cmd_cpl_r1_r2__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPL/cpl_r1_r2__s.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr/Makefile b/test/system/comet2_cmd/cmd_cpl_r_adr/Makefile
index b6dac59..f3ba6fd 100644
--- a/test/system/comet2_cmd/cmd_cpl_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPL/cpl_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr/cmd b/test/system/comet2_cmd/cmd_cpl_r_adr/cmd
index f3fd510..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_cpl_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPL/cpl_r_adr.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr__ls/Makefile b/test/system/comet2_cmd/cmd_cpl_r_adr__ls/Makefile
index b6dac59..2338a9a 100644
--- a/test/system/comet2_cmd/cmd_cpl_r_adr__ls/Makefile
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr__ls/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPL/cpl_r_adr__ls.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr__ls/cmd b/test/system/comet2_cmd/cmd_cpl_r_adr__ls/cmd
index ed5dd60..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_cpl_r_adr__ls/cmd
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr__ls/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPL/cpl_r_adr__ls.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr__s/Makefile b/test/system/comet2_cmd/cmd_cpl_r_adr__s/Makefile
index b6dac59..80e15fc 100644
--- a/test/system/comet2_cmd/cmd_cpl_r_adr__s/Makefile
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPL/cpl_r_adr__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr__s/cmd b/test/system/comet2_cmd/cmd_cpl_r_adr__s/cmd
index 0b4dfa9..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_cpl_r_adr__s/cmd
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPL/cpl_r_adr__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr__z/Makefile b/test/system/comet2_cmd/cmd_cpl_r_adr__z/Makefile
index b6dac59..b7b7c7e 100644
--- a/test/system/comet2_cmd/cmd_cpl_r_adr__z/Makefile
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPL/cpl_r_adr__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr__z/cmd b/test/system/comet2_cmd/cmd_cpl_r_adr__z/cmd
index 57185e5..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_cpl_r_adr__z/cmd
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPL/cpl_r_adr__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr_x__s/Makefile b/test/system/comet2_cmd/cmd_cpl_r_adr_x__s/Makefile
index b6dac59..29bd2d2 100644
--- a/test/system/comet2_cmd/cmd_cpl_r_adr_x__s/Makefile
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr_x__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/CPL/cpl_r_adr_x__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_cpl_r_adr_x__s/cmd b/test/system/comet2_cmd/cmd_cpl_r_adr_x__s/cmd
index 45a68a0..371301e 100755
--- a/test/system/comet2_cmd/cmd_cpl_r_adr_x__s/cmd
+++ b/test/system/comet2_cmd/cmd_cpl_r_adr_x__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/CPL/cpl_r_adr_x__s.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_dc__c0/Makefile b/test/system/comet2_cmd/cmd_dc__c0/Makefile
index b6dac59..19a6296 100644
--- a/test/system/comet2_cmd/cmd_dc__c0/Makefile
+++ b/test/system/comet2_cmd/cmd_dc__c0/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/DC/dc__c0.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_dc__c0/cmd b/test/system/comet2_cmd/cmd_dc__c0/cmd
index 597a6c4..8b17467 100755
--- a/test/system/comet2_cmd/cmd_dc__c0/cmd
+++ b/test/system/comet2_cmd/cmd_dc__c0/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/DC/dc__c0.casl
../../../../comet2 -td -M128 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_dc__c1/Makefile b/test/system/comet2_cmd/cmd_dc__c1/Makefile
index b6dac59..821e4d1 100644
--- a/test/system/comet2_cmd/cmd_dc__c1/Makefile
+++ b/test/system/comet2_cmd/cmd_dc__c1/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/DC/dc__c1.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_dc__c1/cmd b/test/system/comet2_cmd/cmd_dc__c1/cmd
index dc2d4b8..8b17467 100755
--- a/test/system/comet2_cmd/cmd_dc__c1/cmd
+++ b/test/system/comet2_cmd/cmd_dc__c1/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/DC/dc__c1.casl
../../../../comet2 -td -M128 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_dc__i0/Makefile b/test/system/comet2_cmd/cmd_dc__i0/Makefile
index b6dac59..1182af0 100644
--- a/test/system/comet2_cmd/cmd_dc__i0/Makefile
+++ b/test/system/comet2_cmd/cmd_dc__i0/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/DC/dc__i0.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_dc__i0/cmd b/test/system/comet2_cmd/cmd_dc__i0/cmd
index 6a91b43..80d0ff5 100755
--- a/test/system/comet2_cmd/cmd_dc__i0/cmd
+++ b/test/system/comet2_cmd/cmd_dc__i0/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/DC/dc__i0.casl
../../../../comet2 -td -M32 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_dc__i1/Makefile b/test/system/comet2_cmd/cmd_dc__i1/Makefile
index b6dac59..ebab151 100644
--- a/test/system/comet2_cmd/cmd_dc__i1/Makefile
+++ b/test/system/comet2_cmd/cmd_dc__i1/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/DC/dc__i1.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_dc__i1/cmd b/test/system/comet2_cmd/cmd_dc__i1/cmd
index fafbb9d..80d0ff5 100755
--- a/test/system/comet2_cmd/cmd_dc__i1/cmd
+++ b/test/system/comet2_cmd/cmd_dc__i1/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/DC/dc__i1.casl
../../../../comet2 -td -M32 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_dc__io/Makefile b/test/system/comet2_cmd/cmd_dc__io/Makefile
index b6dac59..2c0d4f2 100644
--- a/test/system/comet2_cmd/cmd_dc__io/Makefile
+++ b/test/system/comet2_cmd/cmd_dc__io/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/DC/dc__io.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_dc__io/cmd b/test/system/comet2_cmd/cmd_dc__io/cmd
index dd44f79..80d0ff5 100755
--- a/test/system/comet2_cmd/cmd_dc__io/cmd
+++ b/test/system/comet2_cmd/cmd_dc__io/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/DC/dc__io.casl
../../../../comet2 -td -M32 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_ds/Makefile b/test/system/comet2_cmd/cmd_ds/Makefile
index b6dac59..06ae571 100644
--- a/test/system/comet2_cmd/cmd_ds/Makefile
+++ b/test/system/comet2_cmd/cmd_ds/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/DS/ds.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_ds/cmd b/test/system/comet2_cmd/cmd_ds/cmd
index d8a5238..80d0ff5 100755
--- a/test/system/comet2_cmd/cmd_ds/cmd
+++ b/test/system/comet2_cmd/cmd_ds/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/DS/ds.casl
../../../../comet2 -td -M32 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_ds__0/Makefile b/test/system/comet2_cmd/cmd_ds__0/Makefile
index b6dac59..6e98738 100644
--- a/test/system/comet2_cmd/cmd_ds__0/Makefile
+++ b/test/system/comet2_cmd/cmd_ds__0/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/DS/ds__0.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_ds__0/cmd b/test/system/comet2_cmd/cmd_ds__0/cmd
index 2e8d1bc..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_ds__0/cmd
+++ b/test/system/comet2_cmd/cmd_ds__0/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/DS/ds__0.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_in/Makefile b/test/system/comet2_cmd/cmd_in/Makefile
index b6dac59..05b4b7f 100644
--- a/test/system/comet2_cmd/cmd_in/Makefile
+++ b/test/system/comet2_cmd/cmd_in/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/IN/in.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_in/cmd b/test/system/comet2_cmd/cmd_in/cmd
index d1737dd..3fc00f7 100755
--- a/test/system/comet2_cmd/cmd_in/cmd
+++ b/test/system/comet2_cmd/cmd_in/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/IN/in.casl
../../../../comet2 -td -M64 a.o <teststr.txt
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jmi__m/Makefile b/test/system/comet2_cmd/cmd_jmi__m/Makefile
index b6dac59..dd91d24 100644
--- a/test/system/comet2_cmd/cmd_jmi__m/Makefile
+++ b/test/system/comet2_cmd/cmd_jmi__m/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JMI/jmi__m.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jmi__m/cmd b/test/system/comet2_cmd/cmd_jmi__m/cmd
index aa05438..371301e 100755
--- a/test/system/comet2_cmd/cmd_jmi__m/cmd
+++ b/test/system/comet2_cmd/cmd_jmi__m/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JMI/jmi__m.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jmi__o/Makefile b/test/system/comet2_cmd/cmd_jmi__o/Makefile
index b6dac59..735a60c 100644
--- a/test/system/comet2_cmd/cmd_jmi__o/Makefile
+++ b/test/system/comet2_cmd/cmd_jmi__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JMI/jmi__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jmi__o/cmd b/test/system/comet2_cmd/cmd_jmi__o/cmd
index 4d9b844..371301e 100755
--- a/test/system/comet2_cmd/cmd_jmi__o/cmd
+++ b/test/system/comet2_cmd/cmd_jmi__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JMI/jmi__o.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jmi__p/Makefile b/test/system/comet2_cmd/cmd_jmi__p/Makefile
index b6dac59..1e61f67 100644
--- a/test/system/comet2_cmd/cmd_jmi__p/Makefile
+++ b/test/system/comet2_cmd/cmd_jmi__p/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JMI/jmi__p.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jmi__p/cmd b/test/system/comet2_cmd/cmd_jmi__p/cmd
index d649ab4..371301e 100755
--- a/test/system/comet2_cmd/cmd_jmi__p/cmd
+++ b/test/system/comet2_cmd/cmd_jmi__p/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JMI/jmi__p.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jmi__z/Makefile b/test/system/comet2_cmd/cmd_jmi__z/Makefile
index b6dac59..d4af42f 100644
--- a/test/system/comet2_cmd/cmd_jmi__z/Makefile
+++ b/test/system/comet2_cmd/cmd_jmi__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JMI/jmi__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jmi__z/cmd b/test/system/comet2_cmd/cmd_jmi__z/cmd
index 04d2340..371301e 100755
--- a/test/system/comet2_cmd/cmd_jmi__z/cmd
+++ b/test/system/comet2_cmd/cmd_jmi__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JMI/jmi__z.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jnz__m/Makefile b/test/system/comet2_cmd/cmd_jnz__m/Makefile
index b6dac59..e6bf725 100644
--- a/test/system/comet2_cmd/cmd_jnz__m/Makefile
+++ b/test/system/comet2_cmd/cmd_jnz__m/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JNZ/jnz__m.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jnz__m/cmd b/test/system/comet2_cmd/cmd_jnz__m/cmd
index b3e64b8..371301e 100755
--- a/test/system/comet2_cmd/cmd_jnz__m/cmd
+++ b/test/system/comet2_cmd/cmd_jnz__m/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JNZ/jnz__m.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jnz__o/Makefile b/test/system/comet2_cmd/cmd_jnz__o/Makefile
index b6dac59..b47b1d5 100644
--- a/test/system/comet2_cmd/cmd_jnz__o/Makefile
+++ b/test/system/comet2_cmd/cmd_jnz__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JNZ/jnz__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jnz__o/cmd b/test/system/comet2_cmd/cmd_jnz__o/cmd
index 5077063..371301e 100755
--- a/test/system/comet2_cmd/cmd_jnz__o/cmd
+++ b/test/system/comet2_cmd/cmd_jnz__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JNZ/jnz__o.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jnz__p/Makefile b/test/system/comet2_cmd/cmd_jnz__p/Makefile
index b6dac59..5d092ba 100644
--- a/test/system/comet2_cmd/cmd_jnz__p/Makefile
+++ b/test/system/comet2_cmd/cmd_jnz__p/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JNZ/jnz__p.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jnz__p/cmd b/test/system/comet2_cmd/cmd_jnz__p/cmd
index 98300ec..371301e 100755
--- a/test/system/comet2_cmd/cmd_jnz__p/cmd
+++ b/test/system/comet2_cmd/cmd_jnz__p/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JNZ/jnz__p.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jnz__z/Makefile b/test/system/comet2_cmd/cmd_jnz__z/Makefile
index b6dac59..c0c0b62 100644
--- a/test/system/comet2_cmd/cmd_jnz__z/Makefile
+++ b/test/system/comet2_cmd/cmd_jnz__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JNZ/jnz__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jnz__z/cmd b/test/system/comet2_cmd/cmd_jnz__z/cmd
index 0e71c8e..371301e 100755
--- a/test/system/comet2_cmd/cmd_jnz__z/cmd
+++ b/test/system/comet2_cmd/cmd_jnz__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JNZ/jnz__z.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jov__m/Makefile b/test/system/comet2_cmd/cmd_jov__m/Makefile
index b6dac59..2f75f48 100644
--- a/test/system/comet2_cmd/cmd_jov__m/Makefile
+++ b/test/system/comet2_cmd/cmd_jov__m/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JOV/jov__m.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jov__m/cmd b/test/system/comet2_cmd/cmd_jov__m/cmd
index 4f52cdd..371301e 100755
--- a/test/system/comet2_cmd/cmd_jov__m/cmd
+++ b/test/system/comet2_cmd/cmd_jov__m/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JOV/jov__m.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jov__o/Makefile b/test/system/comet2_cmd/cmd_jov__o/Makefile
index b6dac59..271d2fd 100644
--- a/test/system/comet2_cmd/cmd_jov__o/Makefile
+++ b/test/system/comet2_cmd/cmd_jov__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JOV/jov__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jov__o/cmd b/test/system/comet2_cmd/cmd_jov__o/cmd
index e857c57..371301e 100755
--- a/test/system/comet2_cmd/cmd_jov__o/cmd
+++ b/test/system/comet2_cmd/cmd_jov__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JOV/jov__o.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jov__p/Makefile b/test/system/comet2_cmd/cmd_jov__p/Makefile
index b6dac59..19876a6 100644
--- a/test/system/comet2_cmd/cmd_jov__p/Makefile
+++ b/test/system/comet2_cmd/cmd_jov__p/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JOV/jov__p.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jov__p/cmd b/test/system/comet2_cmd/cmd_jov__p/cmd
index f5328d8..371301e 100755
--- a/test/system/comet2_cmd/cmd_jov__p/cmd
+++ b/test/system/comet2_cmd/cmd_jov__p/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JOV/jov__p.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jov__z/Makefile b/test/system/comet2_cmd/cmd_jov__z/Makefile
index b6dac59..c1f8243 100644
--- a/test/system/comet2_cmd/cmd_jov__z/Makefile
+++ b/test/system/comet2_cmd/cmd_jov__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JOV/jov__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jov__z/cmd b/test/system/comet2_cmd/cmd_jov__z/cmd
index 64dc60e..371301e 100755
--- a/test/system/comet2_cmd/cmd_jov__z/cmd
+++ b/test/system/comet2_cmd/cmd_jov__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JOV/jov__z.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jpl__m/Makefile b/test/system/comet2_cmd/cmd_jpl__m/Makefile
index b6dac59..fdea7b2 100644
--- a/test/system/comet2_cmd/cmd_jpl__m/Makefile
+++ b/test/system/comet2_cmd/cmd_jpl__m/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JPL/jpl__m.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jpl__m/cmd b/test/system/comet2_cmd/cmd_jpl__m/cmd
index 36dec3b..371301e 100755
--- a/test/system/comet2_cmd/cmd_jpl__m/cmd
+++ b/test/system/comet2_cmd/cmd_jpl__m/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JPL/jpl__m.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jpl__o/Makefile b/test/system/comet2_cmd/cmd_jpl__o/Makefile
index b6dac59..1e989c9 100644
--- a/test/system/comet2_cmd/cmd_jpl__o/Makefile
+++ b/test/system/comet2_cmd/cmd_jpl__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JPL/jpl__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jpl__o/cmd b/test/system/comet2_cmd/cmd_jpl__o/cmd
index a000412..371301e 100755
--- a/test/system/comet2_cmd/cmd_jpl__o/cmd
+++ b/test/system/comet2_cmd/cmd_jpl__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JPL/jpl__o.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jpl__p/Makefile b/test/system/comet2_cmd/cmd_jpl__p/Makefile
index b6dac59..d6aaa5a 100644
--- a/test/system/comet2_cmd/cmd_jpl__p/Makefile
+++ b/test/system/comet2_cmd/cmd_jpl__p/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JPL/jpl__p.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jpl__p/cmd b/test/system/comet2_cmd/cmd_jpl__p/cmd
index 7d6596f..371301e 100755
--- a/test/system/comet2_cmd/cmd_jpl__p/cmd
+++ b/test/system/comet2_cmd/cmd_jpl__p/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JPL/jpl__p.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jpl__z/Makefile b/test/system/comet2_cmd/cmd_jpl__z/Makefile
index b6dac59..9377e92 100644
--- a/test/system/comet2_cmd/cmd_jpl__z/Makefile
+++ b/test/system/comet2_cmd/cmd_jpl__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JPL/jpl__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jpl__z/cmd b/test/system/comet2_cmd/cmd_jpl__z/cmd
index ec35f7c..371301e 100755
--- a/test/system/comet2_cmd/cmd_jpl__z/cmd
+++ b/test/system/comet2_cmd/cmd_jpl__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JPL/jpl__z.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jump__m/Makefile b/test/system/comet2_cmd/cmd_jump__m/Makefile
index b6dac59..62c1010 100644
--- a/test/system/comet2_cmd/cmd_jump__m/Makefile
+++ b/test/system/comet2_cmd/cmd_jump__m/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JUMP/jump__m.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jump__m/cmd b/test/system/comet2_cmd/cmd_jump__m/cmd
index 5b9deed..371301e 100755
--- a/test/system/comet2_cmd/cmd_jump__m/cmd
+++ b/test/system/comet2_cmd/cmd_jump__m/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JUMP/jump__m.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jump__o/Makefile b/test/system/comet2_cmd/cmd_jump__o/Makefile
index b6dac59..4f8023b 100644
--- a/test/system/comet2_cmd/cmd_jump__o/Makefile
+++ b/test/system/comet2_cmd/cmd_jump__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JUMP/jump__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jump__o/cmd b/test/system/comet2_cmd/cmd_jump__o/cmd
index 6500fe4..371301e 100755
--- a/test/system/comet2_cmd/cmd_jump__o/cmd
+++ b/test/system/comet2_cmd/cmd_jump__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JUMP/jump__o.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jump__p/Makefile b/test/system/comet2_cmd/cmd_jump__p/Makefile
index b6dac59..0c834bc 100644
--- a/test/system/comet2_cmd/cmd_jump__p/Makefile
+++ b/test/system/comet2_cmd/cmd_jump__p/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JUMP/jump__p.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jump__p/cmd b/test/system/comet2_cmd/cmd_jump__p/cmd
index dc76310..371301e 100755
--- a/test/system/comet2_cmd/cmd_jump__p/cmd
+++ b/test/system/comet2_cmd/cmd_jump__p/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JUMP/jump__p.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jump__z/Makefile b/test/system/comet2_cmd/cmd_jump__z/Makefile
index b6dac59..aa7bf96 100644
--- a/test/system/comet2_cmd/cmd_jump__z/Makefile
+++ b/test/system/comet2_cmd/cmd_jump__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JUMP/jump__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jump__z/cmd b/test/system/comet2_cmd/cmd_jump__z/cmd
index b76a91b..371301e 100755
--- a/test/system/comet2_cmd/cmd_jump__z/cmd
+++ b/test/system/comet2_cmd/cmd_jump__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JUMP/jump__z.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jze__m/Makefile b/test/system/comet2_cmd/cmd_jze__m/Makefile
index b6dac59..4af7717 100644
--- a/test/system/comet2_cmd/cmd_jze__m/Makefile
+++ b/test/system/comet2_cmd/cmd_jze__m/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JZE/jze__m.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jze__m/cmd b/test/system/comet2_cmd/cmd_jze__m/cmd
index 0c93e5d..371301e 100755
--- a/test/system/comet2_cmd/cmd_jze__m/cmd
+++ b/test/system/comet2_cmd/cmd_jze__m/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JZE/jze__m.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jze__o/Makefile b/test/system/comet2_cmd/cmd_jze__o/Makefile
index b6dac59..37af2d1 100644
--- a/test/system/comet2_cmd/cmd_jze__o/Makefile
+++ b/test/system/comet2_cmd/cmd_jze__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JZE/jze__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jze__o/cmd b/test/system/comet2_cmd/cmd_jze__o/cmd
index 6fc944f..371301e 100755
--- a/test/system/comet2_cmd/cmd_jze__o/cmd
+++ b/test/system/comet2_cmd/cmd_jze__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JZE/jze__o.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jze__p/Makefile b/test/system/comet2_cmd/cmd_jze__p/Makefile
index b6dac59..63bec05 100644
--- a/test/system/comet2_cmd/cmd_jze__p/Makefile
+++ b/test/system/comet2_cmd/cmd_jze__p/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JZE/jze__p.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jze__p/cmd b/test/system/comet2_cmd/cmd_jze__p/cmd
index a173317..371301e 100755
--- a/test/system/comet2_cmd/cmd_jze__p/cmd
+++ b/test/system/comet2_cmd/cmd_jze__p/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JZE/jze__p.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_jze__z/Makefile b/test/system/comet2_cmd/cmd_jze__z/Makefile
index b6dac59..08e1f7c 100644
--- a/test/system/comet2_cmd/cmd_jze__z/Makefile
+++ b/test/system/comet2_cmd/cmd_jze__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/JZE/jze__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_jze__z/cmd b/test/system/comet2_cmd/cmd_jze__z/cmd
index fe6e0b8..371301e 100755
--- a/test/system/comet2_cmd/cmd_jze__z/cmd
+++ b/test/system/comet2_cmd/cmd_jze__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/JZE/jze__z.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_lad_r_adr/Makefile b/test/system/comet2_cmd/cmd_lad_r_adr/Makefile
index b6dac59..5fd7064 100644
--- a/test/system/comet2_cmd/cmd_lad_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_lad_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/LAD/lad_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_lad_r_adr/cmd b/test/system/comet2_cmd/cmd_lad_r_adr/cmd
index 02bb858..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_lad_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_lad_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/LAD/lad_r_adr.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_lad_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_lad_r_adr_x/Makefile
index b6dac59..bc0c17f 100644
--- a/test/system/comet2_cmd/cmd_lad_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_lad_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/LAD/lad_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_lad_r_adr_x/cmd b/test/system/comet2_cmd/cmd_lad_r_adr_x/cmd
index 83e7ce5..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_lad_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_lad_r_adr_x/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/LAD/lad_r_adr_x.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_lad_r_adr_x__o/Makefile b/test/system/comet2_cmd/cmd_lad_r_adr_x__o/Makefile
index b6dac59..55fd5ae 100644
--- a/test/system/comet2_cmd/cmd_lad_r_adr_x__o/Makefile
+++ b/test/system/comet2_cmd/cmd_lad_r_adr_x__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/LAD/lad_r_adr_x__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_lad_r_adr_x__o/cmd b/test/system/comet2_cmd/cmd_lad_r_adr_x__o/cmd
index af6c935..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_lad_r_adr_x__o/cmd
+++ b/test/system/comet2_cmd/cmd_lad_r_adr_x__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/LAD/lad_r_adr_x__o.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_lad_r_adr_x__s/Makefile b/test/system/comet2_cmd/cmd_lad_r_adr_x__s/Makefile
index b6dac59..67a9661 100644
--- a/test/system/comet2_cmd/cmd_lad_r_adr_x__s/Makefile
+++ b/test/system/comet2_cmd/cmd_lad_r_adr_x__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/LAD/lad_r_adr_x__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_lad_r_adr_x__s/cmd b/test/system/comet2_cmd/cmd_lad_r_adr_x__s/cmd
index 65fd3ad..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_lad_r_adr_x__s/cmd
+++ b/test/system/comet2_cmd/cmd_lad_r_adr_x__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/LAD/lad_r_adr_x__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_ld_r1_r2/Makefile b/test/system/comet2_cmd/cmd_ld_r1_r2/Makefile
index b6dac59..6f1294a 100644
--- a/test/system/comet2_cmd/cmd_ld_r1_r2/Makefile
+++ b/test/system/comet2_cmd/cmd_ld_r1_r2/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/LD/ld_r1_r2.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_ld_r1_r2/cmd b/test/system/comet2_cmd/cmd_ld_r1_r2/cmd
index b6d4107..80d0ff5 100755
--- a/test/system/comet2_cmd/cmd_ld_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_ld_r1_r2/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/LD/ld_r1_r2.casl
../../../../comet2 -td -M32 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_ld_r_adr/Makefile b/test/system/comet2_cmd/cmd_ld_r_adr/Makefile
index b6dac59..1cf62be 100644
--- a/test/system/comet2_cmd/cmd_ld_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_ld_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/LD/ld_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_ld_r_adr/cmd b/test/system/comet2_cmd/cmd_ld_r_adr/cmd
index aac42d0..371301e 100755
--- a/test/system/comet2_cmd/cmd_ld_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_ld_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/LD/ld_r_adr.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_ld_r_adr__l/Makefile b/test/system/comet2_cmd/cmd_ld_r_adr__l/Makefile
index b6dac59..058ee3e 100644
--- a/test/system/comet2_cmd/cmd_ld_r_adr__l/Makefile
+++ b/test/system/comet2_cmd/cmd_ld_r_adr__l/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/LD/ld_r_adr__l.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_ld_r_adr__l/cmd b/test/system/comet2_cmd/cmd_ld_r_adr__l/cmd
index e11e94a..39b9316 100755
--- a/test/system/comet2_cmd/cmd_ld_r_adr__l/cmd
+++ b/test/system/comet2_cmd/cmd_ld_r_adr__l/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/LD/ld_r_adr__l.casl
../../../../comet2 -td a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_ld_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_ld_r_adr_x/Makefile
index b6dac59..448fdae 100644
--- a/test/system/comet2_cmd/cmd_ld_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_ld_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/LD/ld_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_ld_r_adr_x/cmd b/test/system/comet2_cmd/cmd_ld_r_adr_x/cmd
index 4750548..ba650ba 100755
--- a/test/system/comet2_cmd/cmd_ld_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_ld_r_adr_x/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/LD/ld_r_adr_x.casl
../../../../comet2 -td -M64 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_nop/Makefile b/test/system/comet2_cmd/cmd_nop/Makefile
index b6dac59..2fd6b09 100644
--- a/test/system/comet2_cmd/cmd_nop/Makefile
+++ b/test/system/comet2_cmd/cmd_nop/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/NOP/nop.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_nop/cmd b/test/system/comet2_cmd/cmd_nop/cmd
index af0e4f5..371301e 100755
--- a/test/system/comet2_cmd/cmd_nop/cmd
+++ b/test/system/comet2_cmd/cmd_nop/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/NOP/nop.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_or_r1_r2/Makefile b/test/system/comet2_cmd/cmd_or_r1_r2/Makefile
index b6dac59..adff06d 100644
--- a/test/system/comet2_cmd/cmd_or_r1_r2/Makefile
+++ b/test/system/comet2_cmd/cmd_or_r1_r2/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/OR/or_r1_r2.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_or_r1_r2/cmd b/test/system/comet2_cmd/cmd_or_r1_r2/cmd
index f255e93..371301e 100755
--- a/test/system/comet2_cmd/cmd_or_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_or_r1_r2/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/OR/or_r1_r2.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_or_r_adr/Makefile b/test/system/comet2_cmd/cmd_or_r_adr/Makefile
index b6dac59..7c38fd9 100644
--- a/test/system/comet2_cmd/cmd_or_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_or_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/OR/or_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_or_r_adr/cmd b/test/system/comet2_cmd/cmd_or_r_adr/cmd
index 71b9a19..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_or_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_or_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/OR/or_r_adr.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_or_r_adr__s/Makefile b/test/system/comet2_cmd/cmd_or_r_adr__s/Makefile
index b6dac59..0e24696 100644
--- a/test/system/comet2_cmd/cmd_or_r_adr__s/Makefile
+++ b/test/system/comet2_cmd/cmd_or_r_adr__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/OR/or_r_adr__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_or_r_adr__s/cmd b/test/system/comet2_cmd/cmd_or_r_adr__s/cmd
index bb3e8a5..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_or_r_adr__s/cmd
+++ b/test/system/comet2_cmd/cmd_or_r_adr__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/OR/or_r_adr__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_or_r_adr__z/Makefile b/test/system/comet2_cmd/cmd_or_r_adr__z/Makefile
index b6dac59..6152a39 100644
--- a/test/system/comet2_cmd/cmd_or_r_adr__z/Makefile
+++ b/test/system/comet2_cmd/cmd_or_r_adr__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/OR/or_r_adr__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_or_r_adr__z/cmd b/test/system/comet2_cmd/cmd_or_r_adr__z/cmd
index ef171b5..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_or_r_adr__z/cmd
+++ b/test/system/comet2_cmd/cmd_or_r_adr__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/OR/or_r_adr__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_or_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_or_r_adr_x/Makefile
index b6dac59..f602f6d 100644
--- a/test/system/comet2_cmd/cmd_or_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_or_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/OR/or_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_or_r_adr_x/cmd b/test/system/comet2_cmd/cmd_or_r_adr_x/cmd
index 92af02e..371301e 100755
--- a/test/system/comet2_cmd/cmd_or_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_or_r_adr_x/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/OR/or_r_adr_x.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_out/Makefile b/test/system/comet2_cmd/cmd_out/Makefile
index b6dac59..fe91fe4 100644
--- a/test/system/comet2_cmd/cmd_out/Makefile
+++ b/test/system/comet2_cmd/cmd_out/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/OUT/out.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_out/cmd b/test/system/comet2_cmd/cmd_out/cmd
index 25ecf8f..b769f8d 100755
--- a/test/system/comet2_cmd/cmd_out/cmd
+++ b/test/system/comet2_cmd/cmd_out/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/OUT/out.casl
../../../../comet2 -td -M256 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_push_pop__0/Makefile b/test/system/comet2_cmd/cmd_push_pop__0/Makefile
index b6dac59..720639a 100644
--- a/test/system/comet2_cmd/cmd_push_pop__0/Makefile
+++ b/test/system/comet2_cmd/cmd_push_pop__0/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/POP/push_pop__0.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_push_pop__0/cmd b/test/system/comet2_cmd/cmd_push_pop__0/cmd
index 3c06cde..ba650ba 100755
--- a/test/system/comet2_cmd/cmd_push_pop__0/cmd
+++ b/test/system/comet2_cmd/cmd_push_pop__0/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/POP/push_pop__0.casl
../../../../comet2 -td -M64 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_push_pop__1/Makefile b/test/system/comet2_cmd/cmd_push_pop__1/Makefile
index b6dac59..07601d4 100644
--- a/test/system/comet2_cmd/cmd_push_pop__1/Makefile
+++ b/test/system/comet2_cmd/cmd_push_pop__1/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/POP/push_pop__1.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_push_pop__1/cmd b/test/system/comet2_cmd/cmd_push_pop__1/cmd
index 01cae64..ba650ba 100755
--- a/test/system/comet2_cmd/cmd_push_pop__1/cmd
+++ b/test/system/comet2_cmd/cmd_push_pop__1/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/POP/push_pop__1.casl
../../../../comet2 -td -M64 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_rpop/Makefile b/test/system/comet2_cmd/cmd_rpop/Makefile
index b6dac59..bcae226 100644
--- a/test/system/comet2_cmd/cmd_rpop/Makefile
+++ b/test/system/comet2_cmd/cmd_rpop/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/RPOP/rpop.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_rpop/cmd b/test/system/comet2_cmd/cmd_rpop/cmd
index c9f3c36..ba650ba 100755
--- a/test/system/comet2_cmd/cmd_rpop/cmd
+++ b/test/system/comet2_cmd/cmd_rpop/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/RPOP/rpop.casl
../../../../comet2 -td -M64 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_rpush/Makefile b/test/system/comet2_cmd/cmd_rpush/Makefile
index b6dac59..dd50efb 100644
--- a/test/system/comet2_cmd/cmd_rpush/Makefile
+++ b/test/system/comet2_cmd/cmd_rpush/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/RPUSH/rpush.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_rpush/cmd b/test/system/comet2_cmd/cmd_rpush/cmd
index 0d99ff7..ba650ba 100755
--- a/test/system/comet2_cmd/cmd_rpush/cmd
+++ b/test/system/comet2_cmd/cmd_rpush/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/RPUSH/rpush.casl
../../../../comet2 -td -M64 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sla/Makefile b/test/system/comet2_cmd/cmd_sla/Makefile
index b6dac59..44c591e 100644
--- a/test/system/comet2_cmd/cmd_sla/Makefile
+++ b/test/system/comet2_cmd/cmd_sla/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLA/sla.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sla/cmd b/test/system/comet2_cmd/cmd_sla/cmd
index 931ab52..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sla/cmd
+++ b/test/system/comet2_cmd/cmd_sla/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLA/sla.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sla__o/Makefile b/test/system/comet2_cmd/cmd_sla__o/Makefile
index b6dac59..d1f785a 100644
--- a/test/system/comet2_cmd/cmd_sla__o/Makefile
+++ b/test/system/comet2_cmd/cmd_sla__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLA/sla__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sla__o/cmd b/test/system/comet2_cmd/cmd_sla__o/cmd
index cd7cde8..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sla__o/cmd
+++ b/test/system/comet2_cmd/cmd_sla__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLA/sla__o.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sla__os/Makefile b/test/system/comet2_cmd/cmd_sla__os/Makefile
index b6dac59..a1007f6 100644
--- a/test/system/comet2_cmd/cmd_sla__os/Makefile
+++ b/test/system/comet2_cmd/cmd_sla__os/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLA/sla__os.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sla__os/cmd b/test/system/comet2_cmd/cmd_sla__os/cmd
index 643b375..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sla__os/cmd
+++ b/test/system/comet2_cmd/cmd_sla__os/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLA/sla__os.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sla__oz/Makefile b/test/system/comet2_cmd/cmd_sla__oz/Makefile
index b6dac59..ac28879 100644
--- a/test/system/comet2_cmd/cmd_sla__oz/Makefile
+++ b/test/system/comet2_cmd/cmd_sla__oz/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLA/sla__oz.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sla__oz/cmd b/test/system/comet2_cmd/cmd_sla__oz/cmd
index c494a7d..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sla__oz/cmd
+++ b/test/system/comet2_cmd/cmd_sla__oz/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLA/sla__oz.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sla__s/Makefile b/test/system/comet2_cmd/cmd_sla__s/Makefile
index b6dac59..d5dca70 100644
--- a/test/system/comet2_cmd/cmd_sla__s/Makefile
+++ b/test/system/comet2_cmd/cmd_sla__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLA/sla__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sla__s/cmd b/test/system/comet2_cmd/cmd_sla__s/cmd
index 0d20bcf..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sla__s/cmd
+++ b/test/system/comet2_cmd/cmd_sla__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLA/sla__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sla__z/Makefile b/test/system/comet2_cmd/cmd_sla__z/Makefile
index b6dac59..ec84062 100644
--- a/test/system/comet2_cmd/cmd_sla__z/Makefile
+++ b/test/system/comet2_cmd/cmd_sla__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLA/sla__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sla__z/cmd b/test/system/comet2_cmd/cmd_sla__z/cmd
index c6a7cff..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sla__z/cmd
+++ b/test/system/comet2_cmd/cmd_sla__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLA/sla__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sll/Makefile b/test/system/comet2_cmd/cmd_sll/Makefile
index b6dac59..b824d4a 100644
--- a/test/system/comet2_cmd/cmd_sll/Makefile
+++ b/test/system/comet2_cmd/cmd_sll/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLL/sll.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sll/cmd b/test/system/comet2_cmd/cmd_sll/cmd
index ddfb4f3..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sll/cmd
+++ b/test/system/comet2_cmd/cmd_sll/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLL/sll.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sll__o/Makefile b/test/system/comet2_cmd/cmd_sll__o/Makefile
index b6dac59..8696aca 100644
--- a/test/system/comet2_cmd/cmd_sll__o/Makefile
+++ b/test/system/comet2_cmd/cmd_sll__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLL/sll__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sll__o/cmd b/test/system/comet2_cmd/cmd_sll__o/cmd
index 86e0e6f..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sll__o/cmd
+++ b/test/system/comet2_cmd/cmd_sll__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLL/sll__o.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sll__os/Makefile b/test/system/comet2_cmd/cmd_sll__os/Makefile
index b6dac59..5e4524e 100644
--- a/test/system/comet2_cmd/cmd_sll__os/Makefile
+++ b/test/system/comet2_cmd/cmd_sll__os/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLL/sll__os.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sll__os/cmd b/test/system/comet2_cmd/cmd_sll__os/cmd
index 1f448d2..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sll__os/cmd
+++ b/test/system/comet2_cmd/cmd_sll__os/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLL/sll__os.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sll__oz/Makefile b/test/system/comet2_cmd/cmd_sll__oz/Makefile
index b6dac59..dadf9d1 100644
--- a/test/system/comet2_cmd/cmd_sll__oz/Makefile
+++ b/test/system/comet2_cmd/cmd_sll__oz/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLL/sll__oz.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sll__oz/cmd b/test/system/comet2_cmd/cmd_sll__oz/cmd
index 2a23970..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sll__oz/cmd
+++ b/test/system/comet2_cmd/cmd_sll__oz/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLL/sll__oz.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sll__s/Makefile b/test/system/comet2_cmd/cmd_sll__s/Makefile
index b6dac59..1e49950 100644
--- a/test/system/comet2_cmd/cmd_sll__s/Makefile
+++ b/test/system/comet2_cmd/cmd_sll__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLL/sll__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sll__s/cmd b/test/system/comet2_cmd/cmd_sll__s/cmd
index f9798c6..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sll__s/cmd
+++ b/test/system/comet2_cmd/cmd_sll__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLL/sll__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sll__z/Makefile b/test/system/comet2_cmd/cmd_sll__z/Makefile
index b6dac59..60010b9 100644
--- a/test/system/comet2_cmd/cmd_sll__z/Makefile
+++ b/test/system/comet2_cmd/cmd_sll__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SLL/sll__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sll__z/cmd b/test/system/comet2_cmd/cmd_sll__z/cmd
index 95fad4f..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sll__z/cmd
+++ b/test/system/comet2_cmd/cmd_sll__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SLL/sll__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sra/Makefile b/test/system/comet2_cmd/cmd_sra/Makefile
index b6dac59..52e3567 100644
--- a/test/system/comet2_cmd/cmd_sra/Makefile
+++ b/test/system/comet2_cmd/cmd_sra/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRA/sra.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sra/cmd b/test/system/comet2_cmd/cmd_sra/cmd
index 33828ef..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sra/cmd
+++ b/test/system/comet2_cmd/cmd_sra/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRA/sra.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sra__o/Makefile b/test/system/comet2_cmd/cmd_sra__o/Makefile
index b6dac59..26609a4 100644
--- a/test/system/comet2_cmd/cmd_sra__o/Makefile
+++ b/test/system/comet2_cmd/cmd_sra__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRA/sra__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sra__o/cmd b/test/system/comet2_cmd/cmd_sra__o/cmd
index d20d961..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sra__o/cmd
+++ b/test/system/comet2_cmd/cmd_sra__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRA/sra__o.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sra__os/Makefile b/test/system/comet2_cmd/cmd_sra__os/Makefile
index b6dac59..80ab546 100644
--- a/test/system/comet2_cmd/cmd_sra__os/Makefile
+++ b/test/system/comet2_cmd/cmd_sra__os/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRA/sra__os.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sra__os/cmd b/test/system/comet2_cmd/cmd_sra__os/cmd
index 5e7623d..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sra__os/cmd
+++ b/test/system/comet2_cmd/cmd_sra__os/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRA/sra__os.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sra__oz/Makefile b/test/system/comet2_cmd/cmd_sra__oz/Makefile
index b6dac59..bd18f89 100644
--- a/test/system/comet2_cmd/cmd_sra__oz/Makefile
+++ b/test/system/comet2_cmd/cmd_sra__oz/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRA/sra__oz.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sra__oz/cmd b/test/system/comet2_cmd/cmd_sra__oz/cmd
index 635f08d..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sra__oz/cmd
+++ b/test/system/comet2_cmd/cmd_sra__oz/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRA/sra__oz.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sra__s/Makefile b/test/system/comet2_cmd/cmd_sra__s/Makefile
index b6dac59..c8fb0f4 100644
--- a/test/system/comet2_cmd/cmd_sra__s/Makefile
+++ b/test/system/comet2_cmd/cmd_sra__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRA/sra__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sra__s/cmd b/test/system/comet2_cmd/cmd_sra__s/cmd
index 0cb8ab7..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sra__s/cmd
+++ b/test/system/comet2_cmd/cmd_sra__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRA/sra__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_sra__z/Makefile b/test/system/comet2_cmd/cmd_sra__z/Makefile
index b6dac59..c9ce17f 100644
--- a/test/system/comet2_cmd/cmd_sra__z/Makefile
+++ b/test/system/comet2_cmd/cmd_sra__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRA/sra__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_sra__z/cmd b/test/system/comet2_cmd/cmd_sra__z/cmd
index e7b5838..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_sra__z/cmd
+++ b/test/system/comet2_cmd/cmd_sra__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRA/sra__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_srl/Makefile b/test/system/comet2_cmd/cmd_srl/Makefile
index b6dac59..3e70a15 100644
--- a/test/system/comet2_cmd/cmd_srl/Makefile
+++ b/test/system/comet2_cmd/cmd_srl/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRL/srl.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_srl/cmd b/test/system/comet2_cmd/cmd_srl/cmd
index 9333b9c..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_srl/cmd
+++ b/test/system/comet2_cmd/cmd_srl/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRL/srl.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_srl__o/Makefile b/test/system/comet2_cmd/cmd_srl__o/Makefile
index b6dac59..d767fe8 100644
--- a/test/system/comet2_cmd/cmd_srl__o/Makefile
+++ b/test/system/comet2_cmd/cmd_srl__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRL/srl__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_srl__o/cmd b/test/system/comet2_cmd/cmd_srl__o/cmd
index 92e4972..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_srl__o/cmd
+++ b/test/system/comet2_cmd/cmd_srl__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRL/srl__o.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_srl__oz/Makefile b/test/system/comet2_cmd/cmd_srl__oz/Makefile
index b6dac59..c49a15f 100644
--- a/test/system/comet2_cmd/cmd_srl__oz/Makefile
+++ b/test/system/comet2_cmd/cmd_srl__oz/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRL/srl__oz.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_srl__oz/cmd b/test/system/comet2_cmd/cmd_srl__oz/cmd
index 81764bb..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_srl__oz/cmd
+++ b/test/system/comet2_cmd/cmd_srl__oz/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRL/srl__oz.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_srl__s/Makefile b/test/system/comet2_cmd/cmd_srl__s/Makefile
index b6dac59..47074ab 100644
--- a/test/system/comet2_cmd/cmd_srl__s/Makefile
+++ b/test/system/comet2_cmd/cmd_srl__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRL/srl__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_srl__s/cmd b/test/system/comet2_cmd/cmd_srl__s/cmd
index c34c190..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_srl__s/cmd
+++ b/test/system/comet2_cmd/cmd_srl__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRL/srl__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_srl__z/Makefile b/test/system/comet2_cmd/cmd_srl__z/Makefile
index b6dac59..26a9f51 100644
--- a/test/system/comet2_cmd/cmd_srl__z/Makefile
+++ b/test/system/comet2_cmd/cmd_srl__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SRL/srl__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_srl__z/cmd b/test/system/comet2_cmd/cmd_srl__z/cmd
index bb1c535..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_srl__z/cmd
+++ b/test/system/comet2_cmd/cmd_srl__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SRL/srl__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_st_r_adr/Makefile b/test/system/comet2_cmd/cmd_st_r_adr/Makefile
index b6dac59..56171e7 100644
--- a/test/system/comet2_cmd/cmd_st_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_st_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ST/st_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_st_r_adr/cmd b/test/system/comet2_cmd/cmd_st_r_adr/cmd
index e0e9bb1..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_st_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_st_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ST/st_r_adr.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_st_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_st_r_adr_x/Makefile
index b6dac59..db6bc33 100644
--- a/test/system/comet2_cmd/cmd_st_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_st_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ST/st_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_st_r_adr_x/cmd b/test/system/comet2_cmd/cmd_st_r_adr_x/cmd
index 345f51d..371301e 100755
--- a/test/system/comet2_cmd/cmd_st_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_st_r_adr_x/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ST/st_r_adr_x.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r1_r2/Makefile b/test/system/comet2_cmd/cmd_suba_r1_r2/Makefile
index b6dac59..47abdaf 100644
--- a/test/system/comet2_cmd/cmd_suba_r1_r2/Makefile
+++ b/test/system/comet2_cmd/cmd_suba_r1_r2/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBA/suba_r1_r2.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r1_r2/cmd b/test/system/comet2_cmd/cmd_suba_r1_r2/cmd
index 2e3013e..371301e 100755
--- a/test/system/comet2_cmd/cmd_suba_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_suba_r1_r2/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBA/suba_r1_r2.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr/Makefile b/test/system/comet2_cmd/cmd_suba_r_adr/Makefile
index b6dac59..ea3ea6d 100644
--- a/test/system/comet2_cmd/cmd_suba_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_suba_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBA/suba_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr/cmd b/test/system/comet2_cmd/cmd_suba_r_adr/cmd
index 13d2083..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_suba_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_suba_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBA/suba_r_adr.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__ao/Makefile b/test/system/comet2_cmd/cmd_suba_r_adr__ao/Makefile
index b6dac59..92d8bf7 100644
--- a/test/system/comet2_cmd/cmd_suba_r_adr__ao/Makefile
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__ao/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBA/suba_r_adr__ao.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__ao/cmd b/test/system/comet2_cmd/cmd_suba_r_adr__ao/cmd
index 565d695..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_suba_r_adr__ao/cmd
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__ao/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBA/suba_r_adr__ao.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__as0/Makefile b/test/system/comet2_cmd/cmd_suba_r_adr__as0/Makefile
index b6dac59..9ec3519 100644
--- a/test/system/comet2_cmd/cmd_suba_r_adr__as0/Makefile
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__as0/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBA/suba_r_adr__as0.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__as0/cmd b/test/system/comet2_cmd/cmd_suba_r_adr__as0/cmd
index 189bc5c..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_suba_r_adr__as0/cmd
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__as0/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBA/suba_r_adr__as0.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__as1/Makefile b/test/system/comet2_cmd/cmd_suba_r_adr__as1/Makefile
index b6dac59..9702e3d 100644
--- a/test/system/comet2_cmd/cmd_suba_r_adr__as1/Makefile
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__as1/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBA/suba_r_adr__as1.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__as1/cmd b/test/system/comet2_cmd/cmd_suba_r_adr__as1/cmd
index afb4f28..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_suba_r_adr__as1/cmd
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__as1/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBA/suba_r_adr__as1.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__lo/Makefile b/test/system/comet2_cmd/cmd_suba_r_adr__lo/Makefile
index b6dac59..bd2bfc1 100644
--- a/test/system/comet2_cmd/cmd_suba_r_adr__lo/Makefile
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__lo/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBA/suba_r_adr__lo.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__lo/cmd b/test/system/comet2_cmd/cmd_suba_r_adr__lo/cmd
index 6f08c7a..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_suba_r_adr__lo/cmd
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__lo/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBA/suba_r_adr__lo.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__o/Makefile b/test/system/comet2_cmd/cmd_suba_r_adr__o/Makefile
index b6dac59..795f269 100644
--- a/test/system/comet2_cmd/cmd_suba_r_adr__o/Makefile
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBA/suba_r_adr__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__o/cmd b/test/system/comet2_cmd/cmd_suba_r_adr__o/cmd
index 0a64dcd..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_suba_r_adr__o/cmd
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__o/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBA/suba_r_adr__o.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__z/Makefile b/test/system/comet2_cmd/cmd_suba_r_adr__z/Makefile
index b6dac59..4cc8775 100644
--- a/test/system/comet2_cmd/cmd_suba_r_adr__z/Makefile
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBA/suba_r_adr__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr__z/cmd b/test/system/comet2_cmd/cmd_suba_r_adr__z/cmd
index fb1109a..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_suba_r_adr__z/cmd
+++ b/test/system/comet2_cmd/cmd_suba_r_adr__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBA/suba_r_adr__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_suba_r_adr_x/Makefile
index b6dac59..6122e89 100644
--- a/test/system/comet2_cmd/cmd_suba_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_suba_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBA/suba_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_suba_r_adr_x/cmd b/test/system/comet2_cmd/cmd_suba_r_adr_x/cmd
index e44f1f9..371301e 100755
--- a/test/system/comet2_cmd/cmd_suba_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_suba_r_adr_x/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBA/suba_r_adr_x.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r1_r2/Makefile b/test/system/comet2_cmd/cmd_subl_r1_r2/Makefile
index b6dac59..130e082 100644
--- a/test/system/comet2_cmd/cmd_subl_r1_r2/Makefile
+++ b/test/system/comet2_cmd/cmd_subl_r1_r2/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBL/subl_r1_r2.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r1_r2/cmd b/test/system/comet2_cmd/cmd_subl_r1_r2/cmd
index d63ce4f..1372ec0 100755
--- a/test/system/comet2_cmd/cmd_subl_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r1_r2/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r1_r2.casl
../../../../comet2 -Td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r_adr/Makefile b/test/system/comet2_cmd/cmd_subl_r_adr/Makefile
index b6dac59..13629a9 100644
--- a/test/system/comet2_cmd/cmd_subl_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_subl_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBL/subl_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r_adr/cmd b/test/system/comet2_cmd/cmd_subl_r_adr/cmd
index 90c0d06..2b6b1d7 100755
--- a/test/system/comet2_cmd/cmd_subl_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_subl_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__ao/Makefile b/test/system/comet2_cmd/cmd_subl_r_adr__ao/Makefile
index b6dac59..b1b824e 100644
--- a/test/system/comet2_cmd/cmd_subl_r_adr__ao/Makefile
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__ao/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBL/subl_r_adr__ao.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 4be56e7..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__ao.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__as0/Makefile b/test/system/comet2_cmd/cmd_subl_r_adr__as0/Makefile
index b6dac59..0f61aae 100644
--- a/test/system/comet2_cmd/cmd_subl_r_adr__as0/Makefile
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__as0/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBL/subl_r_adr__as0.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 cd6a154..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__as0.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__as1/Makefile b/test/system/comet2_cmd/cmd_subl_r_adr__as1/Makefile
index b6dac59..d3f7cc0 100644
--- a/test/system/comet2_cmd/cmd_subl_r_adr__as1/Makefile
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__as1/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBL/subl_r_adr__as1.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 a7a92a7..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__as1.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__lo/Makefile b/test/system/comet2_cmd/cmd_subl_r_adr__lo/Makefile
index b6dac59..7c92cb4 100644
--- a/test/system/comet2_cmd/cmd_subl_r_adr__lo/Makefile
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__lo/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBL/subl_r_adr__lo.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 8388b98..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__lo.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__o/Makefile b/test/system/comet2_cmd/cmd_subl_r_adr__o/Makefile
index b6dac59..1fb4067 100644
--- a/test/system/comet2_cmd/cmd_subl_r_adr__o/Makefile
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__o/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBL/subl_r_adr__o.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 f3e8ade..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__o.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r_adr__z/Makefile b/test/system/comet2_cmd/cmd_subl_r_adr__z/Makefile
index b6dac59..cce817a 100644
--- a/test/system/comet2_cmd/cmd_subl_r_adr__z/Makefile
+++ b/test/system/comet2_cmd/cmd_subl_r_adr__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBL/subl_r_adr__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 7aaa0af..2b6b1d7 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr__z.casl
../../../../comet2 -Td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_subl_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_subl_r_adr_x/Makefile
index b6dac59..f377968 100644
--- a/test/system/comet2_cmd/cmd_subl_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_subl_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SUBL/subl_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
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 bbd1e21..1372ec0 100755
--- 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 @@
-../../../../casl2 -O ../../../../as/cmd/SUBL/subl_r_adr_x.casl
../../../../comet2 -Td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_svc__1/Makefile b/test/system/comet2_cmd/cmd_svc__1/Makefile
index b6dac59..4e6f756 100644
--- a/test/system/comet2_cmd/cmd_svc__1/Makefile
+++ b/test/system/comet2_cmd/cmd_svc__1/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SVC/svc__1.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_svc__1/cmd b/test/system/comet2_cmd/cmd_svc__1/cmd
index 0b98537..3fc00f7 100755
--- a/test/system/comet2_cmd/cmd_svc__1/cmd
+++ b/test/system/comet2_cmd/cmd_svc__1/cmd
@@ -1,5 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SVC/svc__1.casl
../../../../comet2 -td -M64 a.o <teststr.txt
-
-
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_svc__2/Makefile b/test/system/comet2_cmd/cmd_svc__2/Makefile
index b6dac59..e506b1f 100644
--- a/test/system/comet2_cmd/cmd_svc__2/Makefile
+++ b/test/system/comet2_cmd/cmd_svc__2/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/SVC/svc__2.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_svc__2/cmd b/test/system/comet2_cmd/cmd_svc__2/cmd
index 404dd94..ba650ba 100755
--- a/test/system/comet2_cmd/cmd_svc__2/cmd
+++ b/test/system/comet2_cmd/cmd_svc__2/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/SVC/svc__2.casl
../../../../comet2 -td -M64 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r1_r2/Makefile b/test/system/comet2_cmd/cmd_xor_r1_r2/Makefile
index b6dac59..57f200e 100644
--- a/test/system/comet2_cmd/cmd_xor_r1_r2/Makefile
+++ b/test/system/comet2_cmd/cmd_xor_r1_r2/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/XOR/xor_r1_r2.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r1_r2/cmd b/test/system/comet2_cmd/cmd_xor_r1_r2/cmd
index 2d7100d..371301e 100755
--- a/test/system/comet2_cmd/cmd_xor_r1_r2/cmd
+++ b/test/system/comet2_cmd/cmd_xor_r1_r2/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/XOR/xor_r1_r2.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r1_r2__clear/Makefile b/test/system/comet2_cmd/cmd_xor_r1_r2__clear/Makefile
index b6dac59..4718d97 100644
--- a/test/system/comet2_cmd/cmd_xor_r1_r2__clear/Makefile
+++ b/test/system/comet2_cmd/cmd_xor_r1_r2__clear/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/XOR/xor_r1_r2__clear.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r1_r2__clear/cmd b/test/system/comet2_cmd/cmd_xor_r1_r2__clear/cmd
index 5c1a921..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_xor_r1_r2__clear/cmd
+++ b/test/system/comet2_cmd/cmd_xor_r1_r2__clear/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/XOR/xor_r1_r2__clear.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r_adr/Makefile b/test/system/comet2_cmd/cmd_xor_r_adr/Makefile
index b6dac59..3afd5f5 100644
--- a/test/system/comet2_cmd/cmd_xor_r_adr/Makefile
+++ b/test/system/comet2_cmd/cmd_xor_r_adr/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/XOR/xor_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r_adr/cmd b/test/system/comet2_cmd/cmd_xor_r_adr/cmd
index 937687b..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_xor_r_adr/cmd
+++ b/test/system/comet2_cmd/cmd_xor_r_adr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/XOR/xor_r_adr.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r_adr__s/Makefile b/test/system/comet2_cmd/cmd_xor_r_adr__s/Makefile
index b6dac59..7830d64 100644
--- a/test/system/comet2_cmd/cmd_xor_r_adr__s/Makefile
+++ b/test/system/comet2_cmd/cmd_xor_r_adr__s/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/XOR/xor_r_adr__s.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r_adr__s/cmd b/test/system/comet2_cmd/cmd_xor_r_adr__s/cmd
index 18c9e59..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_xor_r_adr__s/cmd
+++ b/test/system/comet2_cmd/cmd_xor_r_adr__s/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/XOR/xor_r_adr__s.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r_adr__z/Makefile b/test/system/comet2_cmd/cmd_xor_r_adr__z/Makefile
index b6dac59..c1e4cf0 100644
--- a/test/system/comet2_cmd/cmd_xor_r_adr__z/Makefile
+++ b/test/system/comet2_cmd/cmd_xor_r_adr__z/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/XOR/xor_r_adr__z.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r_adr__z/cmd b/test/system/comet2_cmd/cmd_xor_r_adr__z/cmd
index 10dbfe4..2d38e38 100755
--- a/test/system/comet2_cmd/cmd_xor_r_adr__z/cmd
+++ b/test/system/comet2_cmd/cmd_xor_r_adr__z/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/XOR/xor_r_adr__z.casl
../../../../comet2 -td -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r_adr_x/Makefile b/test/system/comet2_cmd/cmd_xor_r_adr_x/Makefile
index b6dac59..5a88f27 100644
--- a/test/system/comet2_cmd/cmd_xor_r_adr_x/Makefile
+++ b/test/system/comet2_cmd/cmd_xor_r_adr_x/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/XOR/xor_r_adr_x.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_cmd/cmd_xor_r_adr_x/cmd b/test/system/comet2_cmd/cmd_xor_r_adr_x/cmd
index f98ffde..371301e 100755
--- a/test/system/comet2_cmd/cmd_xor_r_adr_x/cmd
+++ b/test/system/comet2_cmd/cmd_xor_r_adr_x/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/XOR/xor_r_adr_x.casl
../../../../comet2 -td -M16 a.o
-rm -f a.o
diff --git a/test/system/comet2_err/err_201/Makefile b/test/system/comet2_err/err_201/Makefile
index b6dac59..f7d613d 100644
--- a/test/system/comet2_err/err_201/Makefile
+++ b/test/system/comet2_err/err_201/Makefile
@@ -1,2 +1,10 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/err/err_201.casl
+ ../../../../casl2 -O $<
+
+cleanobj:
+ rm -f a.o
diff --git a/test/system/comet2_err/err_201/cmd b/test/system/comet2_err/err_201/cmd
index 61f1c82..7a1074b 100755
--- a/test/system/comet2_err/err_201/cmd
+++ b/test/system/comet2_err/err_201/cmd
@@ -1,4 +1 @@
-YACASL2DIR=../../../..
-$YACASL2DIR/casl2 -O $YACASL2DIR/as/err/err_201.casl
-$YACASL2DIR/comet2 -M8 a.o
-rm -f a.o
+../../../../comet2 -M8 a.o
diff --git a/test/system/comet2_err/err_202/Makefile b/test/system/comet2_err/err_202/Makefile
index b6dac59..3f8e39f 100644
--- a/test/system/comet2_err/err_202/Makefile
+++ b/test/system/comet2_err/err_202/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/err/err_202.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ rm -f a.o
diff --git a/test/system/comet2_err/err_202/cmd b/test/system/comet2_err/err_202/cmd
index 2483303..a3ede62 100755
--- a/test/system/comet2_err/err_202/cmd
+++ b/test/system/comet2_err/err_202/cmd
@@ -1,4 +1 @@
-YACASL2DIR=../../../..
-$YACASL2DIR/casl2 -O $YACASL2DIR/as/err/err_202.casl
-$YACASL2DIR/comet2 -M32 a.o
-rm -f a.o
+../../../../comet2 -M32 a.o
diff --git a/test/system/comet2_err/err_203/Makefile b/test/system/comet2_err/err_203/Makefile
index b6dac59..712d037 100644
--- a/test/system/comet2_err/err_203/Makefile
+++ b/test/system/comet2_err/err_203/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/err/err_203.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_err/err_203/cmd b/test/system/comet2_err/err_203/cmd
index 283dbb5..7a1074b 100755
--- a/test/system/comet2_err/err_203/cmd
+++ b/test/system/comet2_err/err_203/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/err/err_203.casl
../../../../comet2 -M8 a.o
-rm -f a.o
diff --git a/test/system/comet2_err/err_204/cmd b/test/system/comet2_err/err_204/cmd
index 960a2a6..9faf9b8 100755
--- a/test/system/comet2_err/err_204/cmd
+++ b/test/system/comet2_err/err_204/cmd
@@ -1,2 +1 @@
-make a.o >/dev/null
../../../../comet2 a.o
diff --git a/test/system/comet2_err/err_205/Makefile b/test/system/comet2_err/err_205/Makefile
index 4bfe864..ac449d7 100644
--- a/test/system/comet2_err/err_205/Makefile
+++ b/test/system/comet2_err/err_205/Makefile
@@ -1,22 +1,18 @@
include ../Define.mk
include ../Test.mk
-CC := gcc
-CFLAGS := -Wall
INCLUDEDIR := ../../../../include
+CC := gcc
+CFLAGS := -Wall -Wextra -I$(INCLUDEDIR)
-.INTERMEDIATE: create_a a.o
+.INTERMEDIATE: create_a
-a.o: create_a
- ./$^
+cmd: a.o
-create_a: create_a.c
- $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
-
-$(CMD_FILE): a.o
+a.o: create_a
+ ./$<
-clean: clean0
+clean: cleanobj
-clean0:
- @rm -f create_a
- @rm -f a.o
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_err/err_205/cmd b/test/system/comet2_err/err_205/cmd
index 960a2a6..9faf9b8 100755
--- a/test/system/comet2_err/err_205/cmd
+++ b/test/system/comet2_err/err_205/cmd
@@ -1,2 +1 @@
-make a.o >/dev/null
../../../../comet2 a.o
diff --git a/test/system/comet2_err/err_205/create_a.c b/test/system/comet2_err/err_205/create_a.c
index 3f86464..c4e8068 100644
--- a/test/system/comet2_err/err_205/create_a.c
+++ b/test/system/comet2_err/err_205/create_a.c
@@ -4,7 +4,7 @@
#include "word.h"
/**
- * å¼æ°ã§æå®ãããã¡ã¤ã«ã«ã¢ã»ã³ãã«çµæãæ¸è¾¼
+ * ãã¡ã¤ã«a.oã«ã¢ã»ã³ãã«çµæãæ¸è¾¼
*/
int main()
{
diff --git a/test/system/comet2_err/err_206/Makefile b/test/system/comet2_err/err_206/Makefile
index 4bfe864..1139a3f 100644
--- a/test/system/comet2_err/err_206/Makefile
+++ b/test/system/comet2_err/err_206/Makefile
@@ -1,22 +1,19 @@
include ../Define.mk
include ../Test.mk
-CC := gcc
-CFLAGS := -Wall
INCLUDEDIR := ../../../../include
+CC := gcc
+CFLAGS := -Wall -Wextra -I$(INCLUDEDIR)
-.INTERMEDIATE: create_a a.o
+.INTERMEDIATE: create_a
-a.o: create_a
- ./$^
+cmd: a.o
-create_a: create_a.c
- $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
+a.o: create_a
+ ./$<
-$(CMD_FILE): a.o
+clean: cleanobj
-clean: clean0
+cleanobj:
+ $(RM) a.o
-clean0:
- @rm -f create_a
- @rm -f a.o
diff --git a/test/system/comet2_err/err_206/cmd b/test/system/comet2_err/err_206/cmd
index 960a2a6..9faf9b8 100755
--- a/test/system/comet2_err/err_206/cmd
+++ b/test/system/comet2_err/err_206/cmd
@@ -1,2 +1 @@
-make a.o >/dev/null
../../../../comet2 a.o
diff --git a/test/system/comet2_err/err_206/create_a.c b/test/system/comet2_err/err_206/create_a.c
index b63a28c..7aafc03 100644
--- a/test/system/comet2_err/err_206/create_a.c
+++ b/test/system/comet2_err/err_206/create_a.c
@@ -4,7 +4,7 @@
#include "word.h"
/**
- * å¼æ°ã§æå®ãããã¡ã¤ã«ã«ã¢ã»ã³ãã«çµæãæ¸è¾¼
+ * ãã¡ã¤ã«a.oã«ã¢ã»ã³ãã«çµæãæ¸è¾¼
*/
int main()
{
diff --git a/test/system/comet2_err/err_207/Makefile b/test/system/comet2_err/err_207/Makefile
index b6dac59..5d70540 100644
--- a/test/system/comet2_err/err_207/Makefile
+++ b/test/system/comet2_err/err_207/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o:../../../../as/err/err_207.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_err/err_207/cmd b/test/system/comet2_err/err_207/cmd
index fc8b8dc..7a1074b 100755
--- a/test/system/comet2_err/err_207/cmd
+++ b/test/system/comet2_err/err_207/cmd
@@ -1,4 +1 @@
-YACASL2DIR=../../../..
-$YACASL2DIR/casl2 -O $YACASL2DIR/as/err/err_207.casl
-$YACASL2DIR/comet2 -M8 a.o
-rm -f a.o
+../../../../comet2 -M8 a.o
diff --git a/test/system/comet2_err/err_208/Makefile b/test/system/comet2_err/err_208/Makefile
index b6dac59..b53b0a8 100644
--- a/test/system/comet2_err/err_208/Makefile
+++ b/test/system/comet2_err/err_208/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o teststr.txt
+
+a.o: ../../../../as/err/err_208.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_err/err_208/cmd b/test/system/comet2_err/err_208/cmd
index 37159b8..2f863ca 100755
--- a/test/system/comet2_err/err_208/cmd
+++ b/test/system/comet2_err/err_208/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/err/err_208.casl
../../../../comet2 -M32 a.o <teststr.txt
-rm -f a.o
diff --git a/test/system/comet2_err/err_209/Makefile b/test/system/comet2_err/err_209/Makefile
index b6dac59..489e150 100644
--- a/test/system/comet2_err/err_209/Makefile
+++ b/test/system/comet2_err/err_209/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/err/err_209.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_err/err_209/cmd b/test/system/comet2_err/err_209/cmd
index 5a552e3..a3ede62 100755
--- a/test/system/comet2_err/err_209/cmd
+++ b/test/system/comet2_err/err_209/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/err/err_209.casl
../../../../comet2 -M32 a.o
-rm -f a.o
diff --git a/test/system/comet2_err/err_210/Makefile b/test/system/comet2_err/err_210/Makefile
index b6dac59..b04df6d 100644
--- a/test/system/comet2_err/err_210/Makefile
+++ b/test/system/comet2_err/err_210/Makefile
@@ -1,2 +1,13 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/cmd/ADDA/adda_r_adr.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
+
diff --git a/test/system/comet2_err/err_210/cmd b/test/system/comet2_err/err_210/cmd
index c7b7eb5..ca5cbe6 100755
--- a/test/system/comet2_err/err_210/cmd
+++ b/test/system/comet2_err/err_210/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/cmd/ADDA/adda_r_adr.casl
../../../../comet2 -M2 a.o
-rm -f a.o
diff --git a/test/system/comet2_err/err_211/cmd b/test/system/comet2_err/err_211/cmd
index 530ea30..c93a2b9 100755
--- a/test/system/comet2_err/err_211/cmd
+++ b/test/system/comet2_err/err_211/cmd
@@ -1,2 +1 @@
../../../../comet2 -M8
-rm -f a.o
diff --git a/test/system/comet2_opt/opt__T/Makefile b/test/system/comet2_opt/opt__T/Makefile
index b6dac59..4a847c5 100644
--- a/test/system/comet2_opt/opt__T/Makefile
+++ b/test/system/comet2_opt/opt__T/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/sample/sum_10.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_opt/opt__T/cmd b/test/system/comet2_opt/opt__T/cmd
index bfa0e21..4ce5233 100755
--- a/test/system/comet2_opt/opt__T/cmd
+++ b/test/system/comet2_opt/opt__T/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/sample/sum_10.casl
../../../../comet2 -T a.o
-rm -f a.o
diff --git a/test/system/comet2_opt/opt_opterr/0.txt b/test/system/comet2_opt/opt_opterr/0.txt
index ad4ad38..f939ca6 100644
--- a/test/system/comet2_opt/opt_opterr/0.txt
+++ b/test/system/comet2_opt/opt_opterr/0.txt
@@ -1 +1,2 @@
+../../../../comet2: invalid option -- 'z'
Usage: ../../../../comet2 [-tTdmvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE
diff --git a/test/system/comet2_opt/opt_opterr/Makefile b/test/system/comet2_opt/opt_opterr/Makefile
index b6dac59..5d6623e 100644
--- a/test/system/comet2_opt/opt_opterr/Makefile
+++ b/test/system/comet2_opt/opt_opterr/Makefile
@@ -1,2 +1,7 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/sample/sum_10.casl
+ ../../../../casl2 -O $<
diff --git a/test/system/comet2_opt/opt_opterr/cmd b/test/system/comet2_opt/opt_opterr/cmd
index 101eebd..313abba 100755
--- a/test/system/comet2_opt/opt_opterr/cmd
+++ b/test/system/comet2_opt/opt_opterr/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/sample/sum_10.casl
-../../../../comet2 -z a.o 2>&1 | tail -1 1>&2
-rm -f a.o
+../../../../comet2 -z a.o
diff --git a/test/system/comet2_opt/opt_t/Makefile b/test/system/comet2_opt/opt_t/Makefile
index b6dac59..5d6623e 100644
--- a/test/system/comet2_opt/opt_t/Makefile
+++ b/test/system/comet2_opt/opt_t/Makefile
@@ -1,2 +1,7 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/sample/sum_10.casl
+ ../../../../casl2 -O $<
diff --git a/test/system/comet2_opt/opt_t/cmd b/test/system/comet2_opt/opt_t/cmd
index b43f198..57aa087 100755
--- a/test/system/comet2_opt/opt_t/cmd
+++ b/test/system/comet2_opt/opt_t/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/sample/sum_10.casl
../../../../comet2 -t a.o
-rm -f a.o
diff --git a/test/system/comet2_opt/opt_td/Makefile b/test/system/comet2_opt/opt_td/Makefile
index b6dac59..4a847c5 100644
--- a/test/system/comet2_opt/opt_td/Makefile
+++ b/test/system/comet2_opt/opt_td/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/sample/sum_10.casl
+ ../../../../casl2 -O $<
+
+clean: cleanobj
+
+cleanobj:
+ $(RM) a.o
diff --git a/test/system/comet2_opt/opt_td/cmd b/test/system/comet2_opt/opt_td/cmd
index dbe5503..39b9316 100755
--- a/test/system/comet2_opt/opt_td/cmd
+++ b/test/system/comet2_opt/opt_td/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/sample/sum_10.casl
../../../../comet2 -td a.o
-rm -f a.o
diff --git a/test/system/comet2_smoke/direct/Makefile b/test/system/comet2_smoke/direct/Makefile
index 4bfe864..3c19995 100644
--- a/test/system/comet2_smoke/direct/Makefile
+++ b/test/system/comet2_smoke/direct/Makefile
@@ -2,10 +2,10 @@ include ../Define.mk
include ../Test.mk
CC := gcc
-CFLAGS := -Wall
+CFLAGS := -Wall -Wextra
INCLUDEDIR := ../../../../include
-.INTERMEDIATE: create_a a.o
+cmd: a.o
a.o: create_a
./$^
@@ -13,10 +13,8 @@ a.o: create_a
create_a: create_a.c
$(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
-$(CMD_FILE): a.o
+clean: cleanobj
-clean: clean0
-
-clean0:
- @rm -f create_a
- @rm -f a.o
+cleanobj:
+ rm -f create_a
+ rm -f a.o
diff --git a/test/system/comet2_smoke/direct/cmd b/test/system/comet2_smoke/direct/cmd
index cc627ac..39b9316 100755
--- a/test/system/comet2_smoke/direct/cmd
+++ b/test/system/comet2_smoke/direct/cmd
@@ -1,2 +1 @@
-make a.o >/dev/null
../../../../comet2 -td a.o
diff --git a/test/system/comet2_smoke/direct/create_a b/test/system/comet2_smoke/direct/create_a
new file mode 100755
index 0000000..5cf95fd
Binary files /dev/null and b/test/system/comet2_smoke/direct/create_a differ
diff --git a/test/system/comet2_smoke/direct/create_a.c b/test/system/comet2_smoke/direct/create_a.c
index b8fa5b7..021e430 100644
--- a/test/system/comet2_smoke/direct/create_a.c
+++ b/test/system/comet2_smoke/direct/create_a.c
@@ -8,7 +8,7 @@
*/
int main()
{
- FILE *fp;
+ FILE *fp = NULL;
const WORD w[] = {0x1010, 0x0005, 0x2210, 0x0006, 0x8100, 0x0003, 0x0001};
const char *f = "a.o";
@@ -18,5 +18,6 @@ int main()
}
fwrite(w, sizeof(WORD), ARRAYSIZE(w), fp);
fclose(fp);
+ FREE(fp);
return 0;
}
diff --git a/test/system/comet2_smoke/hello/Makefile b/test/system/comet2_smoke/hello/Makefile
index b6dac59..59bcd53 100644
--- a/test/system/comet2_smoke/hello/Makefile
+++ b/test/system/comet2_smoke/hello/Makefile
@@ -1,2 +1,12 @@
include ../Define.mk
include ../Test.mk
+
+cmd: a.o
+
+a.o: ../../../../as/sample/hello.casl
+ ../../../../casl2 -O $<
+
+clean: objclean
+
+objclean:
+ $(RM) a.o
diff --git a/test/system/comet2_smoke/hello/cmd b/test/system/comet2_smoke/hello/cmd
index f679005..9faf9b8 100755
--- a/test/system/comet2_smoke/hello/cmd
+++ b/test/system/comet2_smoke/hello/cmd
@@ -1,3 +1 @@
-../../../../casl2 -O ../../../../as/sample/hello.casl
../../../../comet2 a.o
-rm -f a.o
diff --git a/test/system/comet2monitor/break_help/break_help.monitor b/test/system/comet2monitor/break_help/break_help.monitor
new file mode 120000
index 0000000..e93a56d
--- /dev/null
+++ b/test/system/comet2monitor/break_help/break_help.monitor
@@ -0,0 +1 @@
+../../../../monitor/break_help.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/break_help/cmd b/test/system/comet2monitor/break_help/cmd
index 03875a9..2dc3119 100755
--- a/test/system/comet2monitor/break_help/cmd
+++ b/test/system/comet2monitor/break_help/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/break_help.monitor
+../../../../comet2monitor <break_help.monitor
diff --git a/test/system/comet2monitor/break_help_2/break_help_2.monitor b/test/system/comet2monitor/break_help_2/break_help_2.monitor
new file mode 120000
index 0000000..6f929eb
--- /dev/null
+++ b/test/system/comet2monitor/break_help_2/break_help_2.monitor
@@ -0,0 +1 @@
+../../../../monitor/break_help_2.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/break_help_2/cmd b/test/system/comet2monitor/break_help_2/cmd
index a4ee477..f82d4fc 100755
--- a/test/system/comet2monitor/break_help_2/cmd
+++ b/test/system/comet2monitor/break_help_2/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/break_help_2.monitor
+../../../../comet2monitor <break_help_2.monitor
diff --git a/test/system/comet2monitor/dump_0/0.txt b/test/system/comet2monitor/dump_0/0.txt
index 4604c5a..0e8b09b 100644
--- a/test/system/comet2monitor/dump_0/0.txt
+++ b/test/system/comet2monitor/dump_0/0.txt
@@ -1,5 +1,5 @@
COMET II machine code monitor. Type ? for help.
-(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) l sum_10.o
(comet2 monitor) d
#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-------------------------------------------------------------------------------------
diff --git a/test/system/comet2monitor/dump_0/cmd b/test/system/comet2monitor/dump_0/cmd
index 71536a4..26061c2 100755
--- a/test/system/comet2monitor/dump_0/cmd
+++ b/test/system/comet2monitor/dump_0/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/dump_0.monitor
+../../../../comet2monitor <dump_0.monitor
diff --git a/test/system/comet2monitor/dump_0/dump_0.monitor b/test/system/comet2monitor/dump_0/dump_0.monitor
new file mode 120000
index 0000000..aefc521
--- /dev/null
+++ b/test/system/comet2monitor/dump_0/dump_0.monitor
@@ -0,0 +1 @@
+../../../../monitor/dump_0.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/dump_1/0.txt b/test/system/comet2monitor/dump_1/0.txt
index 1147123..dcc5141 100644
--- a/test/system/comet2monitor/dump_1/0.txt
+++ b/test/system/comet2monitor/dump_1/0.txt
@@ -1,5 +1,5 @@
COMET II machine code monitor. Type ? for help.
-(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) l sum_10.o
(comet2 monitor) d 0
#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-------------------------------------------------------------------------------------
diff --git a/test/system/comet2monitor/dump_1/cmd b/test/system/comet2monitor/dump_1/cmd
index 5e998f0..8618ea3 100755
--- a/test/system/comet2monitor/dump_1/cmd
+++ b/test/system/comet2monitor/dump_1/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/dump_1.monitor
+../../../../comet2monitor <dump_1.monitor
diff --git a/test/system/comet2monitor/dump_1/dump_1.monitor b/test/system/comet2monitor/dump_1/dump_1.monitor
new file mode 120000
index 0000000..6478d84
--- /dev/null
+++ b/test/system/comet2monitor/dump_1/dump_1.monitor
@@ -0,0 +1 @@
+../../../../monitor/dump_1.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/dump_2/0.txt b/test/system/comet2monitor/dump_2/0.txt
index ceaa504..f805a00 100644
--- a/test/system/comet2monitor/dump_2/0.txt
+++ b/test/system/comet2monitor/dump_2/0.txt
@@ -1,5 +1,5 @@
COMET II machine code monitor. Type ? for help.
-(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) l sum_10.o
(comet2 monitor) d 0 #20
#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-------------------------------------------------------------------------------------
diff --git a/test/system/comet2monitor/dump_2/cmd b/test/system/comet2monitor/dump_2/cmd
index 3c4614c..b88c014 100755
--- a/test/system/comet2monitor/dump_2/cmd
+++ b/test/system/comet2monitor/dump_2/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/dump_2.monitor
+../../../../comet2monitor <dump_2.monitor
diff --git a/test/system/comet2monitor/dump_2/dump_2.monitor b/test/system/comet2monitor/dump_2/dump_2.monitor
new file mode 120000
index 0000000..b3a3e19
--- /dev/null
+++ b/test/system/comet2monitor/dump_2/dump_2.monitor
@@ -0,0 +1 @@
+../../../../monitor/dump_2.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/dump_3/0.txt b/test/system/comet2monitor/dump_3/0.txt
index 3804f53..4e9d74a 100644
--- a/test/system/comet2monitor/dump_3/0.txt
+++ b/test/system/comet2monitor/dump_3/0.txt
@@ -1,5 +1,5 @@
COMET II machine code monitor. Type ? for help.
-(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) l sum_10.o
(comet2 monitor) d 0 #20 #40
#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-------------------------------------------------------------------------------------
diff --git a/test/system/comet2monitor/dump_3/cmd b/test/system/comet2monitor/dump_3/cmd
index 964742e..e2832b5 100755
--- a/test/system/comet2monitor/dump_3/cmd
+++ b/test/system/comet2monitor/dump_3/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/dump_3.monitor
+../../../../comet2monitor <dump_3.monitor
diff --git a/test/system/comet2monitor/dump_3/dump_3.monitor b/test/system/comet2monitor/dump_3/dump_3.monitor
new file mode 120000
index 0000000..bbcc463
--- /dev/null
+++ b/test/system/comet2monitor/dump_3/dump_3.monitor
@@ -0,0 +1 @@
+../../../../monitor/dump_3.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/dump_plus/0.txt b/test/system/comet2monitor/dump_plus/0.txt
index cd908e6..5a86a4c 100644
--- a/test/system/comet2monitor/dump_plus/0.txt
+++ b/test/system/comet2monitor/dump_plus/0.txt
@@ -1,5 +1,5 @@
COMET II machine code monitor. Type ? for help.
-(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) l sum_10.o
(comet2 monitor) d 0 +#20
#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-------------------------------------------------------------------------------------
diff --git a/test/system/comet2monitor/dump_plus/cmd b/test/system/comet2monitor/dump_plus/cmd
index ef72b21..dd7280d 100755
--- a/test/system/comet2monitor/dump_plus/cmd
+++ b/test/system/comet2monitor/dump_plus/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/dump_plus.monitor
+../../../../comet2monitor <dump_plus.monitor
diff --git a/test/system/comet2monitor/dump_plus/dump_plus.monitor b/test/system/comet2monitor/dump_plus/dump_plus.monitor
new file mode 120000
index 0000000..bb6b5c9
--- /dev/null
+++ b/test/system/comet2monitor/dump_plus/dump_plus.monitor
@@ -0,0 +1 @@
+../../../../monitor/dump_plus.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/help/cmd b/test/system/comet2monitor/help/cmd
index 98598c1..e53b6c4 100755
--- a/test/system/comet2monitor/help/cmd
+++ b/test/system/comet2monitor/help/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/help.monitor
+../../../../comet2monitor <help.monitor
diff --git a/test/system/comet2monitor/help/help.monitor b/test/system/comet2monitor/help/help.monitor
new file mode 120000
index 0000000..32188ba
--- /dev/null
+++ b/test/system/comet2monitor/help/help.monitor
@@ -0,0 +1 @@
+../../../../monitor/help.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/load/0.txt b/test/system/comet2monitor/load/0.txt
index 4604c5a..0e8b09b 100644
--- a/test/system/comet2monitor/load/0.txt
+++ b/test/system/comet2monitor/load/0.txt
@@ -1,5 +1,5 @@
COMET II machine code monitor. Type ? for help.
-(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) l sum_10.o
(comet2 monitor) d
#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-------------------------------------------------------------------------------------
diff --git a/test/system/comet2monitor/load/cmd b/test/system/comet2monitor/load/cmd
index d4e3551..6ec7507 100755
--- a/test/system/comet2monitor/load/cmd
+++ b/test/system/comet2monitor/load/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/load.monitor
+../../../../comet2monitor <load.monitor
diff --git a/test/system/comet2monitor/load/load.monitor b/test/system/comet2monitor/load/load.monitor
new file mode 120000
index 0000000..e195e68
--- /dev/null
+++ b/test/system/comet2monitor/load/load.monitor
@@ -0,0 +1 @@
+../../../../monitor/load.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/quit/cmd b/test/system/comet2monitor/quit/cmd
index 1acd83b..0dfb9be 100755
--- a/test/system/comet2monitor/quit/cmd
+++ b/test/system/comet2monitor/quit/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/quit.monitor
+../../../../comet2monitor <quit.monitor
diff --git a/test/system/comet2monitor/quit/quit.monitor b/test/system/comet2monitor/quit/quit.monitor
new file mode 120000
index 0000000..48a505f
--- /dev/null
+++ b/test/system/comet2monitor/quit/quit.monitor
@@ -0,0 +1 @@
+../../../../monitor/quit.monitor
\ No newline at end of file
diff --git a/test/system/comet2monitor/revert_hello/0.txt b/test/system/comet2monitor/revert_hello/0.txt
index da5b1d9..1630519 100644
--- a/test/system/comet2monitor/revert_hello/0.txt
+++ b/test/system/comet2monitor/revert_hello/0.txt
@@ -1,5 +1,5 @@
COMET II machine code monitor. Type ? for help.
-(comet2 monitor) l as/sample/hello.o
+(comet2 monitor) l hello.o
(comet2 monitor) d a 0 #22
#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
-------------------------------------------------------------------------------------
diff --git a/test/system/comet2monitor/revert_hello/cmd b/test/system/comet2monitor/revert_hello/cmd
index 6df0c0d..e858200 100755
--- a/test/system/comet2monitor/revert_hello/cmd
+++ b/test/system/comet2monitor/revert_hello/cmd
@@ -1 +1 @@
-cd ../../../.. && ./comet2monitor <monitor/revert_hello.monitor
+../../../../comet2monitor <revert_hello.monitor
diff --git a/test/system/comet2monitor/revert_hello/revert_hello.monitor b/test/system/comet2monitor/revert_hello/revert_hello.monitor
new file mode 120000
index 0000000..e99f0e1
--- /dev/null
+++ b/test/system/comet2monitor/revert_hello/revert_hello.monitor
@@ -0,0 +1 @@
+../../../../monitor/revert_hello.monitor
\ No newline at end of file
diff --git a/test/system/dumpword/0/0.txt b/test/system/dumpword/0/0.txt
new file mode 100644
index 0000000..951d070
--- /dev/null
+++ b/test/system/dumpword/0/0.txt
@@ -0,0 +1 @@
+ 0: 0 = #0000 = 0000000000000000
diff --git a/test/system/dumpword/l/Makefile b/test/system/dumpword/0/Makefile
similarity index 100%
rename from test/system/dumpword/l/Makefile
rename to test/system/dumpword/0/Makefile
diff --git a/test/system/dumpword/0/cmd b/test/system/dumpword/0/cmd
new file mode 100755
index 0000000..44d357e
--- /dev/null
+++ b/test/system/dumpword/0/cmd
@@ -0,0 +1 @@
+../../../../dumpword 0
diff --git a/test/system/dumpword/1/0.txt b/test/system/dumpword/1/0.txt
new file mode 100644
index 0000000..f7f761f
--- /dev/null
+++ b/test/system/dumpword/1/0.txt
@@ -0,0 +1 @@
+ 1: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/noopt/Makefile b/test/system/dumpword/1/Makefile
similarity index 100%
rename from test/system/dumpword/noopt/Makefile
rename to test/system/dumpword/1/Makefile
diff --git a/test/system/dumpword/1/cmd b/test/system/dumpword/1/cmd
new file mode 100755
index 0000000..eef85c3
--- /dev/null
+++ b/test/system/dumpword/1/cmd
@@ -0,0 +1 @@
+../../../../dumpword 1
diff --git a/test/system/dumpword/10/0.txt b/test/system/dumpword/10/0.txt
new file mode 100644
index 0000000..e1a8c46
--- /dev/null
+++ b/test/system/dumpword/10/0.txt
@@ -0,0 +1 @@
+ 10: 10 = #000A = 0000000000001010 = '\n'
diff --git a/test/system/dumpword/10/Makefile b/test/system/dumpword/10/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/10/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/10/cmd b/test/system/dumpword/10/cmd
new file mode 100755
index 0000000..b0fc6a8
--- /dev/null
+++ b/test/system/dumpword/10/cmd
@@ -0,0 +1 @@
+../../../../dumpword 10
diff --git a/test/system/dumpword/32767/0.txt b/test/system/dumpword/32767/0.txt
new file mode 100644
index 0000000..f733518
--- /dev/null
+++ b/test/system/dumpword/32767/0.txt
@@ -0,0 +1 @@
+ 32767: 32767 = #7FFF = 0111111111111111
diff --git a/test/system/dumpword/32767/Makefile b/test/system/dumpword/32767/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/32767/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/32767/cmd b/test/system/dumpword/32767/cmd
new file mode 100755
index 0000000..311e061
--- /dev/null
+++ b/test/system/dumpword/32767/cmd
@@ -0,0 +1 @@
+../../../../dumpword 32767
diff --git a/test/system/dumpword/32768/0.txt b/test/system/dumpword/32768/0.txt
new file mode 100644
index 0000000..455e946
--- /dev/null
+++ b/test/system/dumpword/32768/0.txt
@@ -0,0 +1 @@
+ 32768: -32768 = #8000 = 1000000000000000
diff --git a/test/system/dumpword/32768/Makefile b/test/system/dumpword/32768/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/32768/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/32768/cmd b/test/system/dumpword/32768/cmd
new file mode 100755
index 0000000..60af968
--- /dev/null
+++ b/test/system/dumpword/32768/cmd
@@ -0,0 +1 @@
+../../../../dumpword 32768
diff --git a/test/system/dumpword/65535/0.txt b/test/system/dumpword/65535/0.txt
new file mode 100644
index 0000000..8a23073
--- /dev/null
+++ b/test/system/dumpword/65535/0.txt
@@ -0,0 +1 @@
+ 65535: -1 = #FFFF = 1111111111111111
diff --git a/test/system/dumpword/65535/Makefile b/test/system/dumpword/65535/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/65535/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/65535/cmd b/test/system/dumpword/65535/cmd
new file mode 100755
index 0000000..132155d
--- /dev/null
+++ b/test/system/dumpword/65535/cmd
@@ -0,0 +1 @@
+../../../../dumpword 65535
diff --git a/test/system/dumpword/65536/0.txt b/test/system/dumpword/65536/0.txt
new file mode 100644
index 0000000..c776bf3
--- /dev/null
+++ b/test/system/dumpword/65536/0.txt
@@ -0,0 +1 @@
+ 65536: 0 = #0000 = 0000000000000000
diff --git a/test/system/dumpword/65536/Makefile b/test/system/dumpword/65536/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/65536/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/65536/cmd b/test/system/dumpword/65536/cmd
new file mode 100755
index 0000000..0aec9ee
--- /dev/null
+++ b/test/system/dumpword/65536/cmd
@@ -0,0 +1 @@
+../../../../dumpword 65536
diff --git a/test/system/dumpword/65537/0.txt b/test/system/dumpword/65537/0.txt
new file mode 100644
index 0000000..45e5998
--- /dev/null
+++ b/test/system/dumpword/65537/0.txt
@@ -0,0 +1 @@
+ 65537: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/65537/Makefile b/test/system/dumpword/65537/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/65537/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/65537/cmd b/test/system/dumpword/65537/cmd
new file mode 100755
index 0000000..ac1370b
--- /dev/null
+++ b/test/system/dumpword/65537/cmd
@@ -0,0 +1 @@
+../../../../dumpword 65537
diff --git a/test/system/dumpword/G/0.txt b/test/system/dumpword/G/0.txt
new file mode 100644
index 0000000..cbdb890
--- /dev/null
+++ b/test/system/dumpword/G/0.txt
@@ -0,0 +1 @@
+Dumpword Error - 114: G: not integer
diff --git a/test/system/dumpword/G/Makefile b/test/system/dumpword/G/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/G/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/G/cmd b/test/system/dumpword/G/cmd
new file mode 100755
index 0000000..c82bc19
--- /dev/null
+++ b/test/system/dumpword/G/cmd
@@ -0,0 +1 @@
+../../../../dumpword G
diff --git a/test/system/dumpword/a/0.txt b/test/system/dumpword/a/0.txt
deleted file mode 100644
index 6e3cb47..0000000
--- a/test/system/dumpword/a/0.txt
+++ /dev/null
@@ -1,27 +0,0 @@
- 0: 0 = #0000 = 0000000000000000
- 1: 1 = #0001 = 0000000000000001
- 10: 10 = #000A = 0000000000001010 = '\n'
- 32767: 32767 = #7FFF = 0111111111111111
- 32768: -32768 = #8000 = 1000000000000000
- 65535: -1 = #FFFF = 1111111111111111
- 65536: 0 = #0000 = 0000000000000000
- 65537: 1 = #0001 = 0000000000000001
- -1: -1 = #FFFF = 1111111111111111
- -10: -10 = #FFF6 = 1111111111110110
--32767: -32767 = #8001 = 1000000000000001
--32768: -32768 = #8000 = 1000000000000000
--32769: 32767 = #7FFF = 0111111111111111
- #0: 0 = #0000 = 0000000000000000
- #1: 1 = #0001 = 0000000000000001
- #01: 1 = #0001 = 0000000000000001
- #001: 1 = #0001 = 0000000000000001
- #0001: 1 = #0001 = 0000000000000001
- #10: 16 = #0010 = 0000000000010000
- #11: 17 = #0011 = 0000000000010001
- #F: 15 = #000F = 0000000000001111
- #000F: 15 = #000F = 0000000000001111
- #FFFF: -1 = #FFFF = 1111111111111111
-Dumpword Error - 116: #00001: out of hex range
-Dumpword Error - 115: #G: not hex
-Dumpword Error - 114: G: not integer
-Dumpword Error - 114: g: not integer
diff --git a/test/system/dumpword/a/cmd b/test/system/dumpword/a/cmd
deleted file mode 100755
index ba070fd..0000000
--- a/test/system/dumpword/a/cmd
+++ /dev/null
@@ -1,27 +0,0 @@
-../../../../dumpword -a 0
-../../../../dumpword -a 1
-../../../../dumpword -a 10
-../../../../dumpword -a 32767
-../../../../dumpword -a 32768
-../../../../dumpword -a 65535
-../../../../dumpword -a 65536
-../../../../dumpword -a 65537
-../../../../dumpword -a -- -1
-../../../../dumpword -a -- -10
-../../../../dumpword -a -- -32767
-../../../../dumpword -a -- -32768
-../../../../dumpword -a -- -32769
-../../../../dumpword -a '#0'
-../../../../dumpword -a '#1'
-../../../../dumpword -a '#01'
-../../../../dumpword -a '#001'
-../../../../dumpword -a '#0001'
-../../../../dumpword -a '#10'
-../../../../dumpword -a '#11'
-../../../../dumpword -a '#F'
-../../../../dumpword -a '#000F'
-../../../../dumpword -a '#FFFF'
-../../../../dumpword -a '#00001'
-../../../../dumpword -a '#G'
-../../../../dumpword -a G
-../../../../dumpword -a g
diff --git a/test/system/dumpword/a_0/0.txt b/test/system/dumpword/a_0/0.txt
new file mode 100644
index 0000000..951d070
--- /dev/null
+++ b/test/system/dumpword/a_0/0.txt
@@ -0,0 +1 @@
+ 0: 0 = #0000 = 0000000000000000
diff --git a/test/system/dumpword/a_0/Makefile b/test/system/dumpword/a_0/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_0/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_0/cmd b/test/system/dumpword/a_0/cmd
new file mode 100755
index 0000000..dfec58c
--- /dev/null
+++ b/test/system/dumpword/a_0/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a 0
diff --git a/test/system/dumpword/a_1/0.txt b/test/system/dumpword/a_1/0.txt
new file mode 100644
index 0000000..f7f761f
--- /dev/null
+++ b/test/system/dumpword/a_1/0.txt
@@ -0,0 +1 @@
+ 1: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/a_1/Makefile b/test/system/dumpword/a_1/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_1/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_1/cmd b/test/system/dumpword/a_1/cmd
new file mode 100755
index 0000000..4e8f6ab
--- /dev/null
+++ b/test/system/dumpword/a_1/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a 1
diff --git a/test/system/dumpword/a_10/0.txt b/test/system/dumpword/a_10/0.txt
new file mode 100644
index 0000000..e1a8c46
--- /dev/null
+++ b/test/system/dumpword/a_10/0.txt
@@ -0,0 +1 @@
+ 10: 10 = #000A = 0000000000001010 = '\n'
diff --git a/test/system/dumpword/a_10/Makefile b/test/system/dumpword/a_10/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_10/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_10/cmd b/test/system/dumpword/a_10/cmd
new file mode 100755
index 0000000..713b088
--- /dev/null
+++ b/test/system/dumpword/a_10/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a 10
diff --git a/test/system/dumpword/a_32767/0.txt b/test/system/dumpword/a_32767/0.txt
new file mode 100644
index 0000000..f733518
--- /dev/null
+++ b/test/system/dumpword/a_32767/0.txt
@@ -0,0 +1 @@
+ 32767: 32767 = #7FFF = 0111111111111111
diff --git a/test/system/dumpword/a_32767/Makefile b/test/system/dumpword/a_32767/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_32767/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_32767/cmd b/test/system/dumpword/a_32767/cmd
new file mode 100755
index 0000000..d5f37d5
--- /dev/null
+++ b/test/system/dumpword/a_32767/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a 32767
diff --git a/test/system/dumpword/a_32768/0.txt b/test/system/dumpword/a_32768/0.txt
new file mode 100644
index 0000000..455e946
--- /dev/null
+++ b/test/system/dumpword/a_32768/0.txt
@@ -0,0 +1 @@
+ 32768: -32768 = #8000 = 1000000000000000
diff --git a/test/system/dumpword/a_32768/Makefile b/test/system/dumpword/a_32768/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_32768/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_32768/cmd b/test/system/dumpword/a_32768/cmd
new file mode 100755
index 0000000..6e9d991
--- /dev/null
+++ b/test/system/dumpword/a_32768/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a 32768
diff --git a/test/system/dumpword/a_65535/0.txt b/test/system/dumpword/a_65535/0.txt
new file mode 100644
index 0000000..8a23073
--- /dev/null
+++ b/test/system/dumpword/a_65535/0.txt
@@ -0,0 +1 @@
+ 65535: -1 = #FFFF = 1111111111111111
diff --git a/test/system/dumpword/a_65535/Makefile b/test/system/dumpword/a_65535/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_65535/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_65535/cmd b/test/system/dumpword/a_65535/cmd
new file mode 100755
index 0000000..933f54c
--- /dev/null
+++ b/test/system/dumpword/a_65535/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a 65535
diff --git a/test/system/dumpword/a_65536/0.txt b/test/system/dumpword/a_65536/0.txt
new file mode 100644
index 0000000..c776bf3
--- /dev/null
+++ b/test/system/dumpword/a_65536/0.txt
@@ -0,0 +1 @@
+ 65536: 0 = #0000 = 0000000000000000
diff --git a/test/system/dumpword/a_65536/Makefile b/test/system/dumpword/a_65536/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_65536/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_65536/cmd b/test/system/dumpword/a_65536/cmd
new file mode 100755
index 0000000..9ff6c37
--- /dev/null
+++ b/test/system/dumpword/a_65536/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a 65536
diff --git a/test/system/dumpword/a_65537/0.txt b/test/system/dumpword/a_65537/0.txt
new file mode 100644
index 0000000..45e5998
--- /dev/null
+++ b/test/system/dumpword/a_65537/0.txt
@@ -0,0 +1 @@
+ 65537: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/a_65537/Makefile b/test/system/dumpword/a_65537/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_65537/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_65537/cmd b/test/system/dumpword/a_65537/cmd
new file mode 100755
index 0000000..54a04e4
--- /dev/null
+++ b/test/system/dumpword/a_65537/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a 65537
diff --git a/test/system/dumpword/a_G/0.txt b/test/system/dumpword/a_G/0.txt
new file mode 100644
index 0000000..cbdb890
--- /dev/null
+++ b/test/system/dumpword/a_G/0.txt
@@ -0,0 +1 @@
+Dumpword Error - 114: G: not integer
diff --git a/test/system/dumpword/a_G/Makefile b/test/system/dumpword/a_G/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_G/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_G/cmd b/test/system/dumpword/a_G/cmd
new file mode 100755
index 0000000..a45ee8a
--- /dev/null
+++ b/test/system/dumpword/a_G/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a G
diff --git a/test/system/dumpword/a_minus1/0.txt b/test/system/dumpword/a_minus1/0.txt
new file mode 100644
index 0000000..55742a3
--- /dev/null
+++ b/test/system/dumpword/a_minus1/0.txt
@@ -0,0 +1 @@
+ -1: -1 = #FFFF = 1111111111111111
diff --git a/test/system/dumpword/a_minus1/Makefile b/test/system/dumpword/a_minus1/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_minus1/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_minus1/cmd b/test/system/dumpword/a_minus1/cmd
new file mode 100755
index 0000000..c8b3a69
--- /dev/null
+++ b/test/system/dumpword/a_minus1/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a -- -1
diff --git a/test/system/dumpword/a_minus10/0.txt b/test/system/dumpword/a_minus10/0.txt
new file mode 100644
index 0000000..d6c7bf2
--- /dev/null
+++ b/test/system/dumpword/a_minus10/0.txt
@@ -0,0 +1 @@
+ -10: -10 = #FFF6 = 1111111111110110
diff --git a/test/system/dumpword/a_minus10/Makefile b/test/system/dumpword/a_minus10/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_minus10/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_minus10/cmd b/test/system/dumpword/a_minus10/cmd
new file mode 100755
index 0000000..1fec527
--- /dev/null
+++ b/test/system/dumpword/a_minus10/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a -- -10
diff --git a/test/system/dumpword/a_minus32767/0.txt b/test/system/dumpword/a_minus32767/0.txt
new file mode 100644
index 0000000..4b2f683
--- /dev/null
+++ b/test/system/dumpword/a_minus32767/0.txt
@@ -0,0 +1 @@
+-32767: -32767 = #8001 = 1000000000000001
diff --git a/test/system/dumpword/a_minus32767/Makefile b/test/system/dumpword/a_minus32767/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_minus32767/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_minus32767/cmd b/test/system/dumpword/a_minus32767/cmd
new file mode 100755
index 0000000..a8a2e2d
--- /dev/null
+++ b/test/system/dumpword/a_minus32767/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a -- -32767
diff --git a/test/system/dumpword/a_minus32768/0.txt b/test/system/dumpword/a_minus32768/0.txt
new file mode 100644
index 0000000..9da6059
--- /dev/null
+++ b/test/system/dumpword/a_minus32768/0.txt
@@ -0,0 +1 @@
+-32768: -32768 = #8000 = 1000000000000000
diff --git a/test/system/dumpword/a_minus32768/Makefile b/test/system/dumpword/a_minus32768/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_minus32768/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_minus32768/cmd b/test/system/dumpword/a_minus32768/cmd
new file mode 100755
index 0000000..4a8187c
--- /dev/null
+++ b/test/system/dumpword/a_minus32768/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a -- -32768
diff --git a/test/system/dumpword/a_minus32769/0.txt b/test/system/dumpword/a_minus32769/0.txt
new file mode 100644
index 0000000..1fc0cd1
--- /dev/null
+++ b/test/system/dumpword/a_minus32769/0.txt
@@ -0,0 +1 @@
+-32769: 32767 = #7FFF = 0111111111111111
diff --git a/test/system/dumpword/a_minus32769/Makefile b/test/system/dumpword/a_minus32769/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_minus32769/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_minus32769/cmd b/test/system/dumpword/a_minus32769/cmd
new file mode 100755
index 0000000..2c55f09
--- /dev/null
+++ b/test/system/dumpword/a_minus32769/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a -- -32769
diff --git a/test/system/dumpword/a_sharp0/0.txt b/test/system/dumpword/a_sharp0/0.txt
new file mode 100644
index 0000000..a295978
--- /dev/null
+++ b/test/system/dumpword/a_sharp0/0.txt
@@ -0,0 +1 @@
+ #0: 0 = #0000 = 0000000000000000
diff --git a/test/system/dumpword/a_sharp0/Makefile b/test/system/dumpword/a_sharp0/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharp0/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharp0/cmd b/test/system/dumpword/a_sharp0/cmd
new file mode 100755
index 0000000..92135b8
--- /dev/null
+++ b/test/system/dumpword/a_sharp0/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#0'
diff --git a/test/system/dumpword/a_sharp00001/0.txt b/test/system/dumpword/a_sharp00001/0.txt
new file mode 100644
index 0000000..97c47a3
--- /dev/null
+++ b/test/system/dumpword/a_sharp00001/0.txt
@@ -0,0 +1 @@
+Dumpword Error - 116: #00001: out of hex range
diff --git a/test/system/dumpword/a_sharp00001/Makefile b/test/system/dumpword/a_sharp00001/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharp00001/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharp00001/cmd b/test/system/dumpword/a_sharp00001/cmd
new file mode 100755
index 0000000..7878e86
--- /dev/null
+++ b/test/system/dumpword/a_sharp00001/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#00001'
diff --git a/test/system/dumpword/a_sharp0001/0.txt b/test/system/dumpword/a_sharp0001/0.txt
new file mode 100644
index 0000000..26ea8be
--- /dev/null
+++ b/test/system/dumpword/a_sharp0001/0.txt
@@ -0,0 +1 @@
+ #0001: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/a_sharp0001/Makefile b/test/system/dumpword/a_sharp0001/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharp0001/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharp0001/cmd b/test/system/dumpword/a_sharp0001/cmd
new file mode 100755
index 0000000..4ccaaa3
--- /dev/null
+++ b/test/system/dumpword/a_sharp0001/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#0001'
diff --git a/test/system/dumpword/a_sharp000F/0.txt b/test/system/dumpword/a_sharp000F/0.txt
new file mode 100644
index 0000000..7f21e7f
--- /dev/null
+++ b/test/system/dumpword/a_sharp000F/0.txt
@@ -0,0 +1 @@
+ #000F: 15 = #000F = 0000000000001111
diff --git a/test/system/dumpword/a_sharp000F/Makefile b/test/system/dumpword/a_sharp000F/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharp000F/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharp000F/cmd b/test/system/dumpword/a_sharp000F/cmd
new file mode 100755
index 0000000..93a7056
--- /dev/null
+++ b/test/system/dumpword/a_sharp000F/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#000F'
diff --git a/test/system/dumpword/a_sharp001/0.txt b/test/system/dumpword/a_sharp001/0.txt
new file mode 100644
index 0000000..bc02fd1
--- /dev/null
+++ b/test/system/dumpword/a_sharp001/0.txt
@@ -0,0 +1 @@
+ #001: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/a_sharp001/Makefile b/test/system/dumpword/a_sharp001/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharp001/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharp001/cmd b/test/system/dumpword/a_sharp001/cmd
new file mode 100755
index 0000000..e205012
--- /dev/null
+++ b/test/system/dumpword/a_sharp001/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#001'
diff --git a/test/system/dumpword/a_sharp01/0.txt b/test/system/dumpword/a_sharp01/0.txt
new file mode 100644
index 0000000..e3c496e
--- /dev/null
+++ b/test/system/dumpword/a_sharp01/0.txt
@@ -0,0 +1 @@
+ #01: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/a_sharp01/Makefile b/test/system/dumpword/a_sharp01/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharp01/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharp01/cmd b/test/system/dumpword/a_sharp01/cmd
new file mode 100755
index 0000000..65ce198
--- /dev/null
+++ b/test/system/dumpword/a_sharp01/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#01'
diff --git a/test/system/dumpword/a_sharp1/0.txt b/test/system/dumpword/a_sharp1/0.txt
new file mode 100644
index 0000000..e96de20
--- /dev/null
+++ b/test/system/dumpword/a_sharp1/0.txt
@@ -0,0 +1 @@
+ #1: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/a_sharp1/Makefile b/test/system/dumpword/a_sharp1/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharp1/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharp1/cmd b/test/system/dumpword/a_sharp1/cmd
new file mode 100755
index 0000000..47325e8
--- /dev/null
+++ b/test/system/dumpword/a_sharp1/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#1'
diff --git a/test/system/dumpword/a_sharp10/0.txt b/test/system/dumpword/a_sharp10/0.txt
new file mode 100644
index 0000000..af06184
--- /dev/null
+++ b/test/system/dumpword/a_sharp10/0.txt
@@ -0,0 +1 @@
+ #10: 16 = #0010 = 0000000000010000
diff --git a/test/system/dumpword/a_sharp10/Makefile b/test/system/dumpword/a_sharp10/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharp10/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharp10/cmd b/test/system/dumpword/a_sharp10/cmd
new file mode 100755
index 0000000..c0b9992
--- /dev/null
+++ b/test/system/dumpword/a_sharp10/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#10'
diff --git a/test/system/dumpword/a_sharp11/0.txt b/test/system/dumpword/a_sharp11/0.txt
new file mode 100644
index 0000000..538432d
--- /dev/null
+++ b/test/system/dumpword/a_sharp11/0.txt
@@ -0,0 +1 @@
+ #11: 17 = #0011 = 0000000000010001
diff --git a/test/system/dumpword/a_sharp11/Makefile b/test/system/dumpword/a_sharp11/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharp11/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharp11/cmd b/test/system/dumpword/a_sharp11/cmd
new file mode 100755
index 0000000..dbe7e1d
--- /dev/null
+++ b/test/system/dumpword/a_sharp11/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#11'
diff --git a/test/system/dumpword/a_sharpF/0.txt b/test/system/dumpword/a_sharpF/0.txt
new file mode 100644
index 0000000..ea558fd
--- /dev/null
+++ b/test/system/dumpword/a_sharpF/0.txt
@@ -0,0 +1 @@
+ #F: 15 = #000F = 0000000000001111
diff --git a/test/system/dumpword/a_sharpF/Makefile b/test/system/dumpword/a_sharpF/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharpF/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharpF/cmd b/test/system/dumpword/a_sharpF/cmd
new file mode 100755
index 0000000..4b6e014
--- /dev/null
+++ b/test/system/dumpword/a_sharpF/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#F'
diff --git a/test/system/dumpword/a_sharpFFFF/0.txt b/test/system/dumpword/a_sharpFFFF/0.txt
new file mode 100644
index 0000000..9c3ef77
--- /dev/null
+++ b/test/system/dumpword/a_sharpFFFF/0.txt
@@ -0,0 +1 @@
+ #FFFF: -1 = #FFFF = 1111111111111111
diff --git a/test/system/dumpword/a_sharpFFFF/Makefile b/test/system/dumpword/a_sharpFFFF/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharpFFFF/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharpFFFF/cmd b/test/system/dumpword/a_sharpFFFF/cmd
new file mode 100755
index 0000000..1ec6e29
--- /dev/null
+++ b/test/system/dumpword/a_sharpFFFF/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#FFFF'
diff --git a/test/system/dumpword/a_sharpG/0.txt b/test/system/dumpword/a_sharpG/0.txt
new file mode 100644
index 0000000..2d30a9b
--- /dev/null
+++ b/test/system/dumpword/a_sharpG/0.txt
@@ -0,0 +1 @@
+Dumpword Error - 115: #G: not hex
diff --git a/test/system/dumpword/a_sharpG/Makefile b/test/system/dumpword/a_sharpG/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/a_sharpG/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/a_sharpG/cmd b/test/system/dumpword/a_sharpG/cmd
new file mode 100755
index 0000000..a8f24e6
--- /dev/null
+++ b/test/system/dumpword/a_sharpG/cmd
@@ -0,0 +1 @@
+../../../../dumpword -a '#G'
diff --git a/test/system/dumpword/chars/cmd b/test/system/dumpword/chars/cmd
index 9dda803..19ae667 100755
--- a/test/system/dumpword/chars/cmd
+++ b/test/system/dumpword/chars/cmd
@@ -1,128 +1 @@
-../../../../dumpword 0
-../../../../dumpword 1
-../../../../dumpword 2
-../../../../dumpword 3
-../../../../dumpword 4
-../../../../dumpword 5
-../../../../dumpword 6
-../../../../dumpword 7
-../../../../dumpword 8
-../../../../dumpword 9
-../../../../dumpword 10
-../../../../dumpword 11
-../../../../dumpword 12
-../../../../dumpword 13
-../../../../dumpword 14
-../../../../dumpword 15
-../../../../dumpword 16
-../../../../dumpword 17
-../../../../dumpword 18
-../../../../dumpword 19
-../../../../dumpword 20
-../../../../dumpword 21
-../../../../dumpword 22
-../../../../dumpword 23
-../../../../dumpword 24
-../../../../dumpword 25
-../../../../dumpword 26
-../../../../dumpword 27
-../../../../dumpword 28
-../../../../dumpword 29
-../../../../dumpword 30
-../../../../dumpword 31
-../../../../dumpword 32
-../../../../dumpword 33
-../../../../dumpword 34
-../../../../dumpword 35
-../../../../dumpword 36
-../../../../dumpword 37
-../../../../dumpword 38
-../../../../dumpword 39
-../../../../dumpword 40
-../../../../dumpword 41
-../../../../dumpword 42
-../../../../dumpword 43
-../../../../dumpword 44
-../../../../dumpword 45
-../../../../dumpword 46
-../../../../dumpword 47
-../../../../dumpword 48
-../../../../dumpword 49
-../../../../dumpword 50
-../../../../dumpword 51
-../../../../dumpword 52
-../../../../dumpword 53
-../../../../dumpword 54
-../../../../dumpword 55
-../../../../dumpword 56
-../../../../dumpword 57
-../../../../dumpword 58
-../../../../dumpword 59
-../../../../dumpword 60
-../../../../dumpword 61
-../../../../dumpword 62
-../../../../dumpword 63
-../../../../dumpword 64
-../../../../dumpword 65
-../../../../dumpword 66
-../../../../dumpword 67
-../../../../dumpword 68
-../../../../dumpword 69
-../../../../dumpword 70
-../../../../dumpword 71
-../../../../dumpword 72
-../../../../dumpword 73
-../../../../dumpword 74
-../../../../dumpword 75
-../../../../dumpword 76
-../../../../dumpword 77
-../../../../dumpword 78
-../../../../dumpword 79
-../../../../dumpword 80
-../../../../dumpword 81
-../../../../dumpword 82
-../../../../dumpword 83
-../../../../dumpword 84
-../../../../dumpword 85
-../../../../dumpword 86
-../../../../dumpword 87
-../../../../dumpword 88
-../../../../dumpword 89
-../../../../dumpword 90
-../../../../dumpword 91
-../../../../dumpword 92
-../../../../dumpword 93
-../../../../dumpword 94
-../../../../dumpword 95
-../../../../dumpword 96
-../../../../dumpword 97
-../../../../dumpword 98
-../../../../dumpword 99
-../../../../dumpword 100
-../../../../dumpword 101
-../../../../dumpword 102
-../../../../dumpword 103
-../../../../dumpword 104
-../../../../dumpword 105
-../../../../dumpword 106
-../../../../dumpword 107
-../../../../dumpword 108
-../../../../dumpword 109
-../../../../dumpword 110
-../../../../dumpword 111
-../../../../dumpword 112
-../../../../dumpword 113
-../../../../dumpword 114
-../../../../dumpword 115
-../../../../dumpword 116
-../../../../dumpword 117
-../../../../dumpword 118
-../../../../dumpword 119
-../../../../dumpword 120
-../../../../dumpword 121
-../../../../dumpword 122
-../../../../dumpword 123
-../../../../dumpword 124
-../../../../dumpword 125
-../../../../dumpword 126
-../../../../dumpword 127
+for i in `seq 0 127`; do ../../../../dumpword ${i}; done
diff --git a/test/system/dumpword/chars/cmd_valgrind b/test/system/dumpword/chars/cmd_valgrind
new file mode 100644
index 0000000..bef4995
--- /dev/null
+++ b/test/system/dumpword/chars/cmd_valgrind
@@ -0,0 +1 @@
+../../../../dumpword 33
diff --git a/test/system/dumpword/l/0.txt b/test/system/dumpword/l/0.txt
deleted file mode 100644
index 0522b5d..0000000
--- a/test/system/dumpword/l/0.txt
+++ /dev/null
@@ -1,27 +0,0 @@
- 0: 0 = #0000 = 0000000000000000
- 1: 1 = #0001 = 0000000000000001
- 10: 10 = #000A = 0000000000001010 = '\n'
- 32767: 32767 = #7FFF = 0111111111111111
- 32768: 32768 = #8000 = 1000000000000000
- 65535: 65535 = #FFFF = 1111111111111111
- 65536: 0 = #0000 = 0000000000000000
- 65537: 1 = #0001 = 0000000000000001
- -1: 65535 = #FFFF = 1111111111111111
- -10: 65526 = #FFF6 = 1111111111110110
--32767: 32769 = #8001 = 1000000000000001
--32768: 32768 = #8000 = 1000000000000000
--32769: 32767 = #7FFF = 0111111111111111
- #0: 0 = #0000 = 0000000000000000
- #1: 1 = #0001 = 0000000000000001
- #01: 1 = #0001 = 0000000000000001
- #001: 1 = #0001 = 0000000000000001
- #0001: 1 = #0001 = 0000000000000001
- #10: 16 = #0010 = 0000000000010000
- #11: 17 = #0011 = 0000000000010001
- #F: 15 = #000F = 0000000000001111
- #000F: 15 = #000F = 0000000000001111
- #FFFF: 65535 = #FFFF = 1111111111111111
-Dumpword Error - 116: #00001: out of hex range
-Dumpword Error - 115: #G: not hex
-Dumpword Error - 114: G: not integer
-Dumpword Error - 114: g: not integer
diff --git a/test/system/dumpword/l/cmd b/test/system/dumpword/l/cmd
deleted file mode 100755
index 08cd375..0000000
--- a/test/system/dumpword/l/cmd
+++ /dev/null
@@ -1,27 +0,0 @@
-../../../../dumpword -l 0
-../../../../dumpword -l 1
-../../../../dumpword -l 10
-../../../../dumpword -l 32767
-../../../../dumpword -l 32768
-../../../../dumpword -l 65535
-../../../../dumpword -l 65536
-../../../../dumpword -l 65537
-../../../../dumpword -l -- -1
-../../../../dumpword -l -- -10
-../../../../dumpword -l -- -32767
-../../../../dumpword -l -- -32768
-../../../../dumpword -l -- -32769
-../../../../dumpword -l '#0'
-../../../../dumpword -l '#1'
-../../../../dumpword -l '#01'
-../../../../dumpword -l '#001'
-../../../../dumpword -l '#0001'
-../../../../dumpword -l '#10'
-../../../../dumpword -l '#11'
-../../../../dumpword -l '#F'
-../../../../dumpword -l '#000F'
-../../../../dumpword -l '#FFFF'
-../../../../dumpword -l '#00001'
-../../../../dumpword -l '#G'
-../../../../dumpword -l G
-../../../../dumpword -l g
diff --git a/test/system/dumpword/l_0/0.txt b/test/system/dumpword/l_0/0.txt
new file mode 100644
index 0000000..951d070
--- /dev/null
+++ b/test/system/dumpword/l_0/0.txt
@@ -0,0 +1 @@
+ 0: 0 = #0000 = 0000000000000000
diff --git a/test/system/dumpword/l_0/Makefile b/test/system/dumpword/l_0/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_0/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_0/cmd b/test/system/dumpword/l_0/cmd
new file mode 100755
index 0000000..713d26c
--- /dev/null
+++ b/test/system/dumpword/l_0/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l 0
diff --git a/test/system/dumpword/l_1/0.txt b/test/system/dumpword/l_1/0.txt
new file mode 100644
index 0000000..f7f761f
--- /dev/null
+++ b/test/system/dumpword/l_1/0.txt
@@ -0,0 +1 @@
+ 1: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/l_1/Makefile b/test/system/dumpword/l_1/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_1/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_1/cmd b/test/system/dumpword/l_1/cmd
new file mode 100755
index 0000000..dd4b6ba
--- /dev/null
+++ b/test/system/dumpword/l_1/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l 1
diff --git a/test/system/dumpword/l_10/0.txt b/test/system/dumpword/l_10/0.txt
new file mode 100644
index 0000000..e1a8c46
--- /dev/null
+++ b/test/system/dumpword/l_10/0.txt
@@ -0,0 +1 @@
+ 10: 10 = #000A = 0000000000001010 = '\n'
diff --git a/test/system/dumpword/l_10/Makefile b/test/system/dumpword/l_10/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_10/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_10/cmd b/test/system/dumpword/l_10/cmd
new file mode 100755
index 0000000..c15211a
--- /dev/null
+++ b/test/system/dumpword/l_10/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l 10
diff --git a/test/system/dumpword/l_32767/0.txt b/test/system/dumpword/l_32767/0.txt
new file mode 100644
index 0000000..f733518
--- /dev/null
+++ b/test/system/dumpword/l_32767/0.txt
@@ -0,0 +1 @@
+ 32767: 32767 = #7FFF = 0111111111111111
diff --git a/test/system/dumpword/l_32767/Makefile b/test/system/dumpword/l_32767/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_32767/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_32767/cmd b/test/system/dumpword/l_32767/cmd
new file mode 100755
index 0000000..a92fd0d
--- /dev/null
+++ b/test/system/dumpword/l_32767/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l 32767
diff --git a/test/system/dumpword/l_32768/0.txt b/test/system/dumpword/l_32768/0.txt
new file mode 100644
index 0000000..24b6442
--- /dev/null
+++ b/test/system/dumpword/l_32768/0.txt
@@ -0,0 +1 @@
+ 32768: 32768 = #8000 = 1000000000000000
diff --git a/test/system/dumpword/l_32768/Makefile b/test/system/dumpword/l_32768/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_32768/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_32768/cmd b/test/system/dumpword/l_32768/cmd
new file mode 100755
index 0000000..44dbf58
--- /dev/null
+++ b/test/system/dumpword/l_32768/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l 32768
diff --git a/test/system/dumpword/l_65535/0.txt b/test/system/dumpword/l_65535/0.txt
new file mode 100644
index 0000000..52513e8
--- /dev/null
+++ b/test/system/dumpword/l_65535/0.txt
@@ -0,0 +1 @@
+ 65535: 65535 = #FFFF = 1111111111111111
diff --git a/test/system/dumpword/l_65535/Makefile b/test/system/dumpword/l_65535/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_65535/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_65535/cmd b/test/system/dumpword/l_65535/cmd
new file mode 100755
index 0000000..0d02618
--- /dev/null
+++ b/test/system/dumpword/l_65535/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l 65535
diff --git a/test/system/dumpword/l_65536/0.txt b/test/system/dumpword/l_65536/0.txt
new file mode 100644
index 0000000..c776bf3
--- /dev/null
+++ b/test/system/dumpword/l_65536/0.txt
@@ -0,0 +1 @@
+ 65536: 0 = #0000 = 0000000000000000
diff --git a/test/system/dumpword/l_65536/Makefile b/test/system/dumpword/l_65536/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_65536/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_65536/cmd b/test/system/dumpword/l_65536/cmd
new file mode 100755
index 0000000..ddc28e9
--- /dev/null
+++ b/test/system/dumpword/l_65536/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l 65536
diff --git a/test/system/dumpword/l_65537/0.txt b/test/system/dumpword/l_65537/0.txt
new file mode 100644
index 0000000..45e5998
--- /dev/null
+++ b/test/system/dumpword/l_65537/0.txt
@@ -0,0 +1 @@
+ 65537: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/l_65537/Makefile b/test/system/dumpword/l_65537/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_65537/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_65537/cmd b/test/system/dumpword/l_65537/cmd
new file mode 100755
index 0000000..e463af2
--- /dev/null
+++ b/test/system/dumpword/l_65537/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l 65537
diff --git a/test/system/dumpword/l_G/0.txt b/test/system/dumpword/l_G/0.txt
new file mode 100644
index 0000000..cbdb890
--- /dev/null
+++ b/test/system/dumpword/l_G/0.txt
@@ -0,0 +1 @@
+Dumpword Error - 114: G: not integer
diff --git a/test/system/dumpword/l_G/Makefile b/test/system/dumpword/l_G/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_G/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_G/cmd b/test/system/dumpword/l_G/cmd
new file mode 100755
index 0000000..5b77bde
--- /dev/null
+++ b/test/system/dumpword/l_G/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l G
diff --git a/test/system/dumpword/l_minus1/0.txt b/test/system/dumpword/l_minus1/0.txt
new file mode 100644
index 0000000..d046da4
--- /dev/null
+++ b/test/system/dumpword/l_minus1/0.txt
@@ -0,0 +1 @@
+ -1: 65535 = #FFFF = 1111111111111111
diff --git a/test/system/dumpword/l_minus1/Makefile b/test/system/dumpword/l_minus1/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_minus1/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_minus1/cmd b/test/system/dumpword/l_minus1/cmd
new file mode 100755
index 0000000..960fd09
--- /dev/null
+++ b/test/system/dumpword/l_minus1/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l -- -1
diff --git a/test/system/dumpword/l_minus10/0.txt b/test/system/dumpword/l_minus10/0.txt
new file mode 100644
index 0000000..4ee1ba2
--- /dev/null
+++ b/test/system/dumpword/l_minus10/0.txt
@@ -0,0 +1 @@
+ -10: 65526 = #FFF6 = 1111111111110110
diff --git a/test/system/dumpword/l_minus10/Makefile b/test/system/dumpword/l_minus10/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_minus10/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_minus10/cmd b/test/system/dumpword/l_minus10/cmd
new file mode 100755
index 0000000..fe64cd1
--- /dev/null
+++ b/test/system/dumpword/l_minus10/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l -- -10
diff --git a/test/system/dumpword/l_minus32767/0.txt b/test/system/dumpword/l_minus32767/0.txt
new file mode 100644
index 0000000..577378e
--- /dev/null
+++ b/test/system/dumpword/l_minus32767/0.txt
@@ -0,0 +1 @@
+-32767: 32769 = #8001 = 1000000000000001
diff --git a/test/system/dumpword/l_minus32767/Makefile b/test/system/dumpword/l_minus32767/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_minus32767/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_minus32767/cmd b/test/system/dumpword/l_minus32767/cmd
new file mode 100755
index 0000000..ce5635e
--- /dev/null
+++ b/test/system/dumpword/l_minus32767/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l -- -32767
diff --git a/test/system/dumpword/l_minus32768/0.txt b/test/system/dumpword/l_minus32768/0.txt
new file mode 100644
index 0000000..ff639ba
--- /dev/null
+++ b/test/system/dumpword/l_minus32768/0.txt
@@ -0,0 +1 @@
+-32768: 32768 = #8000 = 1000000000000000
diff --git a/test/system/dumpword/l_minus32768/Makefile b/test/system/dumpword/l_minus32768/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_minus32768/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_minus32768/cmd b/test/system/dumpword/l_minus32768/cmd
new file mode 100755
index 0000000..fd4f7ec
--- /dev/null
+++ b/test/system/dumpword/l_minus32768/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l -- -32768
diff --git a/test/system/dumpword/l_minus32769/0.txt b/test/system/dumpword/l_minus32769/0.txt
new file mode 100644
index 0000000..1fc0cd1
--- /dev/null
+++ b/test/system/dumpword/l_minus32769/0.txt
@@ -0,0 +1 @@
+-32769: 32767 = #7FFF = 0111111111111111
diff --git a/test/system/dumpword/l_minus32769/Makefile b/test/system/dumpword/l_minus32769/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_minus32769/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_minus32769/cmd b/test/system/dumpword/l_minus32769/cmd
new file mode 100755
index 0000000..7c554f3
--- /dev/null
+++ b/test/system/dumpword/l_minus32769/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l -- -32769
diff --git a/test/system/dumpword/l_sharp0/0.txt b/test/system/dumpword/l_sharp0/0.txt
new file mode 100644
index 0000000..a295978
--- /dev/null
+++ b/test/system/dumpword/l_sharp0/0.txt
@@ -0,0 +1 @@
+ #0: 0 = #0000 = 0000000000000000
diff --git a/test/system/dumpword/l_sharp0/Makefile b/test/system/dumpword/l_sharp0/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharp0/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharp0/cmd b/test/system/dumpword/l_sharp0/cmd
new file mode 100755
index 0000000..9ad8601
--- /dev/null
+++ b/test/system/dumpword/l_sharp0/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#0'
diff --git a/test/system/dumpword/l_sharp00001/0.txt b/test/system/dumpword/l_sharp00001/0.txt
new file mode 100644
index 0000000..97c47a3
--- /dev/null
+++ b/test/system/dumpword/l_sharp00001/0.txt
@@ -0,0 +1 @@
+Dumpword Error - 116: #00001: out of hex range
diff --git a/test/system/dumpword/l_sharp00001/Makefile b/test/system/dumpword/l_sharp00001/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharp00001/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharp00001/cmd b/test/system/dumpword/l_sharp00001/cmd
new file mode 100755
index 0000000..97d3a6f
--- /dev/null
+++ b/test/system/dumpword/l_sharp00001/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#00001'
diff --git a/test/system/dumpword/l_sharp0001/0.txt b/test/system/dumpword/l_sharp0001/0.txt
new file mode 100644
index 0000000..26ea8be
--- /dev/null
+++ b/test/system/dumpword/l_sharp0001/0.txt
@@ -0,0 +1 @@
+ #0001: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/l_sharp0001/Makefile b/test/system/dumpword/l_sharp0001/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharp0001/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharp0001/cmd b/test/system/dumpword/l_sharp0001/cmd
new file mode 100755
index 0000000..8dea1d3
--- /dev/null
+++ b/test/system/dumpword/l_sharp0001/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#0001'
diff --git a/test/system/dumpword/l_sharp000F/0.txt b/test/system/dumpword/l_sharp000F/0.txt
new file mode 100644
index 0000000..7f21e7f
--- /dev/null
+++ b/test/system/dumpword/l_sharp000F/0.txt
@@ -0,0 +1 @@
+ #000F: 15 = #000F = 0000000000001111
diff --git a/test/system/dumpword/l_sharp000F/Makefile b/test/system/dumpword/l_sharp000F/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharp000F/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharp000F/cmd b/test/system/dumpword/l_sharp000F/cmd
new file mode 100755
index 0000000..8a6494b
--- /dev/null
+++ b/test/system/dumpword/l_sharp000F/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#000F'
diff --git a/test/system/dumpword/l_sharp001/0.txt b/test/system/dumpword/l_sharp001/0.txt
new file mode 100644
index 0000000..bc02fd1
--- /dev/null
+++ b/test/system/dumpword/l_sharp001/0.txt
@@ -0,0 +1 @@
+ #001: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/l_sharp001/Makefile b/test/system/dumpword/l_sharp001/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharp001/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharp001/cmd b/test/system/dumpword/l_sharp001/cmd
new file mode 100755
index 0000000..1729366
--- /dev/null
+++ b/test/system/dumpword/l_sharp001/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#001'
diff --git a/test/system/dumpword/l_sharp01/0.txt b/test/system/dumpword/l_sharp01/0.txt
new file mode 100644
index 0000000..e3c496e
--- /dev/null
+++ b/test/system/dumpword/l_sharp01/0.txt
@@ -0,0 +1 @@
+ #01: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/l_sharp01/Makefile b/test/system/dumpword/l_sharp01/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharp01/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharp01/cmd b/test/system/dumpword/l_sharp01/cmd
new file mode 100755
index 0000000..b066ddc
--- /dev/null
+++ b/test/system/dumpword/l_sharp01/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#01'
diff --git a/test/system/dumpword/l_sharp1/0.txt b/test/system/dumpword/l_sharp1/0.txt
new file mode 100644
index 0000000..e96de20
--- /dev/null
+++ b/test/system/dumpword/l_sharp1/0.txt
@@ -0,0 +1 @@
+ #1: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/l_sharp1/Makefile b/test/system/dumpword/l_sharp1/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharp1/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharp1/cmd b/test/system/dumpword/l_sharp1/cmd
new file mode 100755
index 0000000..0c18a28
--- /dev/null
+++ b/test/system/dumpword/l_sharp1/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#1'
diff --git a/test/system/dumpword/l_sharp10/0.txt b/test/system/dumpword/l_sharp10/0.txt
new file mode 100644
index 0000000..af06184
--- /dev/null
+++ b/test/system/dumpword/l_sharp10/0.txt
@@ -0,0 +1 @@
+ #10: 16 = #0010 = 0000000000010000
diff --git a/test/system/dumpword/l_sharp10/Makefile b/test/system/dumpword/l_sharp10/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharp10/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharp10/cmd b/test/system/dumpword/l_sharp10/cmd
new file mode 100755
index 0000000..182a497
--- /dev/null
+++ b/test/system/dumpword/l_sharp10/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#10'
diff --git a/test/system/dumpword/l_sharp11/0.txt b/test/system/dumpword/l_sharp11/0.txt
new file mode 100644
index 0000000..538432d
--- /dev/null
+++ b/test/system/dumpword/l_sharp11/0.txt
@@ -0,0 +1 @@
+ #11: 17 = #0011 = 0000000000010001
diff --git a/test/system/dumpword/l_sharp11/Makefile b/test/system/dumpword/l_sharp11/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharp11/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharp11/cmd b/test/system/dumpword/l_sharp11/cmd
new file mode 100755
index 0000000..06c4de9
--- /dev/null
+++ b/test/system/dumpword/l_sharp11/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#11'
diff --git a/test/system/dumpword/l_sharpF/0.txt b/test/system/dumpword/l_sharpF/0.txt
new file mode 100644
index 0000000..ea558fd
--- /dev/null
+++ b/test/system/dumpword/l_sharpF/0.txt
@@ -0,0 +1 @@
+ #F: 15 = #000F = 0000000000001111
diff --git a/test/system/dumpword/l_sharpF/Makefile b/test/system/dumpword/l_sharpF/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharpF/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharpF/cmd b/test/system/dumpword/l_sharpF/cmd
new file mode 100755
index 0000000..88c4744
--- /dev/null
+++ b/test/system/dumpword/l_sharpF/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#F'
diff --git a/test/system/dumpword/l_sharpFFFF/0.txt b/test/system/dumpword/l_sharpFFFF/0.txt
new file mode 100644
index 0000000..0e96291
--- /dev/null
+++ b/test/system/dumpword/l_sharpFFFF/0.txt
@@ -0,0 +1 @@
+ #FFFF: 65535 = #FFFF = 1111111111111111
diff --git a/test/system/dumpword/l_sharpFFFF/Makefile b/test/system/dumpword/l_sharpFFFF/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharpFFFF/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharpFFFF/cmd b/test/system/dumpword/l_sharpFFFF/cmd
new file mode 100755
index 0000000..151d3cd
--- /dev/null
+++ b/test/system/dumpword/l_sharpFFFF/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#FFFF'
diff --git a/test/system/dumpword/l_sharpG/0.txt b/test/system/dumpword/l_sharpG/0.txt
new file mode 100644
index 0000000..2d30a9b
--- /dev/null
+++ b/test/system/dumpword/l_sharpG/0.txt
@@ -0,0 +1 @@
+Dumpword Error - 115: #G: not hex
diff --git a/test/system/dumpword/l_sharpG/Makefile b/test/system/dumpword/l_sharpG/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/l_sharpG/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/l_sharpG/cmd b/test/system/dumpword/l_sharpG/cmd
new file mode 100755
index 0000000..3215e83
--- /dev/null
+++ b/test/system/dumpword/l_sharpG/cmd
@@ -0,0 +1 @@
+../../../../dumpword -l '#G'
diff --git a/test/system/dumpword/minus1/0.txt b/test/system/dumpword/minus1/0.txt
new file mode 100644
index 0000000..55742a3
--- /dev/null
+++ b/test/system/dumpword/minus1/0.txt
@@ -0,0 +1 @@
+ -1: -1 = #FFFF = 1111111111111111
diff --git a/test/system/dumpword/minus1/Makefile b/test/system/dumpword/minus1/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/minus1/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/minus1/cmd b/test/system/dumpword/minus1/cmd
new file mode 100755
index 0000000..515a728
--- /dev/null
+++ b/test/system/dumpword/minus1/cmd
@@ -0,0 +1 @@
+../../../../dumpword -- -1
diff --git a/test/system/dumpword/minus10/0.txt b/test/system/dumpword/minus10/0.txt
new file mode 100644
index 0000000..d6c7bf2
--- /dev/null
+++ b/test/system/dumpword/minus10/0.txt
@@ -0,0 +1 @@
+ -10: -10 = #FFF6 = 1111111111110110
diff --git a/test/system/dumpword/minus10/Makefile b/test/system/dumpword/minus10/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/minus10/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/minus10/cmd b/test/system/dumpword/minus10/cmd
new file mode 100755
index 0000000..7d9beb7
--- /dev/null
+++ b/test/system/dumpword/minus10/cmd
@@ -0,0 +1 @@
+../../../../dumpword -- -10
diff --git a/test/system/dumpword/minus32767/0.txt b/test/system/dumpword/minus32767/0.txt
new file mode 100644
index 0000000..4b2f683
--- /dev/null
+++ b/test/system/dumpword/minus32767/0.txt
@@ -0,0 +1 @@
+-32767: -32767 = #8001 = 1000000000000001
diff --git a/test/system/dumpword/minus32767/Makefile b/test/system/dumpword/minus32767/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/minus32767/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/minus32767/cmd b/test/system/dumpword/minus32767/cmd
new file mode 100755
index 0000000..8fe8c9d
--- /dev/null
+++ b/test/system/dumpword/minus32767/cmd
@@ -0,0 +1 @@
+../../../../dumpword -- -32767
diff --git a/test/system/dumpword/minus32768/0.txt b/test/system/dumpword/minus32768/0.txt
new file mode 100644
index 0000000..9da6059
--- /dev/null
+++ b/test/system/dumpword/minus32768/0.txt
@@ -0,0 +1 @@
+-32768: -32768 = #8000 = 1000000000000000
diff --git a/test/system/dumpword/minus32768/Makefile b/test/system/dumpword/minus32768/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/minus32768/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/minus32768/cmd b/test/system/dumpword/minus32768/cmd
new file mode 100755
index 0000000..fd80c4a
--- /dev/null
+++ b/test/system/dumpword/minus32768/cmd
@@ -0,0 +1 @@
+../../../../dumpword -- -32768
diff --git a/test/system/dumpword/minus32769/0.txt b/test/system/dumpword/minus32769/0.txt
new file mode 100644
index 0000000..1fc0cd1
--- /dev/null
+++ b/test/system/dumpword/minus32769/0.txt
@@ -0,0 +1 @@
+-32769: 32767 = #7FFF = 0111111111111111
diff --git a/test/system/dumpword/minus32769/Makefile b/test/system/dumpword/minus32769/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/minus32769/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/minus32769/cmd b/test/system/dumpword/minus32769/cmd
new file mode 100755
index 0000000..6e1b562
--- /dev/null
+++ b/test/system/dumpword/minus32769/cmd
@@ -0,0 +1 @@
+../../../../dumpword -- -32769
diff --git a/test/system/dumpword/noopt/0.txt b/test/system/dumpword/noopt/0.txt
deleted file mode 100644
index 6e3cb47..0000000
--- a/test/system/dumpword/noopt/0.txt
+++ /dev/null
@@ -1,27 +0,0 @@
- 0: 0 = #0000 = 0000000000000000
- 1: 1 = #0001 = 0000000000000001
- 10: 10 = #000A = 0000000000001010 = '\n'
- 32767: 32767 = #7FFF = 0111111111111111
- 32768: -32768 = #8000 = 1000000000000000
- 65535: -1 = #FFFF = 1111111111111111
- 65536: 0 = #0000 = 0000000000000000
- 65537: 1 = #0001 = 0000000000000001
- -1: -1 = #FFFF = 1111111111111111
- -10: -10 = #FFF6 = 1111111111110110
--32767: -32767 = #8001 = 1000000000000001
--32768: -32768 = #8000 = 1000000000000000
--32769: 32767 = #7FFF = 0111111111111111
- #0: 0 = #0000 = 0000000000000000
- #1: 1 = #0001 = 0000000000000001
- #01: 1 = #0001 = 0000000000000001
- #001: 1 = #0001 = 0000000000000001
- #0001: 1 = #0001 = 0000000000000001
- #10: 16 = #0010 = 0000000000010000
- #11: 17 = #0011 = 0000000000010001
- #F: 15 = #000F = 0000000000001111
- #000F: 15 = #000F = 0000000000001111
- #FFFF: -1 = #FFFF = 1111111111111111
-Dumpword Error - 116: #00001: out of hex range
-Dumpword Error - 115: #G: not hex
-Dumpword Error - 114: G: not integer
-Dumpword Error - 114: g: not integer
diff --git a/test/system/dumpword/noopt/cmd b/test/system/dumpword/noopt/cmd
deleted file mode 100755
index 77a7bf6..0000000
--- a/test/system/dumpword/noopt/cmd
+++ /dev/null
@@ -1,27 +0,0 @@
-../../../../dumpword 0
-../../../../dumpword 1
-../../../../dumpword 10
-../../../../dumpword 32767
-../../../../dumpword 32768
-../../../../dumpword 65535
-../../../../dumpword 65536
-../../../../dumpword 65537
-../../../../dumpword -- -1
-../../../../dumpword -- -10
-../../../../dumpword -- -32767
-../../../../dumpword -- -32768
-../../../../dumpword -- -32769
-../../../../dumpword '#0'
-../../../../dumpword '#1'
-../../../../dumpword '#01'
-../../../../dumpword '#001'
-../../../../dumpword '#0001'
-../../../../dumpword '#10'
-../../../../dumpword '#11'
-../../../../dumpword '#F'
-../../../../dumpword '#000F'
-../../../../dumpword '#FFFF'
-../../../../dumpword '#00001'
-../../../../dumpword '#G'
-../../../../dumpword G
-../../../../dumpword g
diff --git a/test/system/dumpword/sharp0/0.txt b/test/system/dumpword/sharp0/0.txt
new file mode 100644
index 0000000..a295978
--- /dev/null
+++ b/test/system/dumpword/sharp0/0.txt
@@ -0,0 +1 @@
+ #0: 0 = #0000 = 0000000000000000
diff --git a/test/system/dumpword/sharp0/Makefile b/test/system/dumpword/sharp0/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharp0/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharp0/cmd b/test/system/dumpword/sharp0/cmd
new file mode 100755
index 0000000..a252d7b
--- /dev/null
+++ b/test/system/dumpword/sharp0/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#0'
diff --git a/test/system/dumpword/sharp00001/0.txt b/test/system/dumpword/sharp00001/0.txt
new file mode 100644
index 0000000..97c47a3
--- /dev/null
+++ b/test/system/dumpword/sharp00001/0.txt
@@ -0,0 +1 @@
+Dumpword Error - 116: #00001: out of hex range
diff --git a/test/system/dumpword/sharp00001/Makefile b/test/system/dumpword/sharp00001/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharp00001/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharp00001/cmd b/test/system/dumpword/sharp00001/cmd
new file mode 100755
index 0000000..660372c
--- /dev/null
+++ b/test/system/dumpword/sharp00001/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#00001'
diff --git a/test/system/dumpword/sharp0001/0.txt b/test/system/dumpword/sharp0001/0.txt
new file mode 100644
index 0000000..26ea8be
--- /dev/null
+++ b/test/system/dumpword/sharp0001/0.txt
@@ -0,0 +1 @@
+ #0001: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/sharp0001/Makefile b/test/system/dumpword/sharp0001/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharp0001/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharp0001/cmd b/test/system/dumpword/sharp0001/cmd
new file mode 100755
index 0000000..9765031
--- /dev/null
+++ b/test/system/dumpword/sharp0001/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#0001'
diff --git a/test/system/dumpword/sharp000F/0.txt b/test/system/dumpword/sharp000F/0.txt
new file mode 100644
index 0000000..7f21e7f
--- /dev/null
+++ b/test/system/dumpword/sharp000F/0.txt
@@ -0,0 +1 @@
+ #000F: 15 = #000F = 0000000000001111
diff --git a/test/system/dumpword/sharp000F/Makefile b/test/system/dumpword/sharp000F/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharp000F/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharp000F/cmd b/test/system/dumpword/sharp000F/cmd
new file mode 100755
index 0000000..67702d9
--- /dev/null
+++ b/test/system/dumpword/sharp000F/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#000F'
diff --git a/test/system/dumpword/sharp001/0.txt b/test/system/dumpword/sharp001/0.txt
new file mode 100644
index 0000000..bc02fd1
--- /dev/null
+++ b/test/system/dumpword/sharp001/0.txt
@@ -0,0 +1 @@
+ #001: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/sharp001/Makefile b/test/system/dumpword/sharp001/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharp001/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharp001/cmd b/test/system/dumpword/sharp001/cmd
new file mode 100755
index 0000000..c85d5aa
--- /dev/null
+++ b/test/system/dumpword/sharp001/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#001'
diff --git a/test/system/dumpword/sharp01/0.txt b/test/system/dumpword/sharp01/0.txt
new file mode 100644
index 0000000..e3c496e
--- /dev/null
+++ b/test/system/dumpword/sharp01/0.txt
@@ -0,0 +1 @@
+ #01: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/sharp01/Makefile b/test/system/dumpword/sharp01/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharp01/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharp01/cmd b/test/system/dumpword/sharp01/cmd
new file mode 100755
index 0000000..d343904
--- /dev/null
+++ b/test/system/dumpword/sharp01/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#01'
diff --git a/test/system/dumpword/sharp1/0.txt b/test/system/dumpword/sharp1/0.txt
new file mode 100644
index 0000000..e96de20
--- /dev/null
+++ b/test/system/dumpword/sharp1/0.txt
@@ -0,0 +1 @@
+ #1: 1 = #0001 = 0000000000000001
diff --git a/test/system/dumpword/sharp1/Makefile b/test/system/dumpword/sharp1/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharp1/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharp1/cmd b/test/system/dumpword/sharp1/cmd
new file mode 100755
index 0000000..08e8a3d
--- /dev/null
+++ b/test/system/dumpword/sharp1/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#1'
diff --git a/test/system/dumpword/sharp10/0.txt b/test/system/dumpword/sharp10/0.txt
new file mode 100644
index 0000000..af06184
--- /dev/null
+++ b/test/system/dumpword/sharp10/0.txt
@@ -0,0 +1 @@
+ #10: 16 = #0010 = 0000000000010000
diff --git a/test/system/dumpword/sharp10/Makefile b/test/system/dumpword/sharp10/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharp10/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharp10/cmd b/test/system/dumpword/sharp10/cmd
new file mode 100755
index 0000000..30667ae
--- /dev/null
+++ b/test/system/dumpword/sharp10/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#10'
diff --git a/test/system/dumpword/sharp11/0.txt b/test/system/dumpword/sharp11/0.txt
new file mode 100644
index 0000000..538432d
--- /dev/null
+++ b/test/system/dumpword/sharp11/0.txt
@@ -0,0 +1 @@
+ #11: 17 = #0011 = 0000000000010001
diff --git a/test/system/dumpword/sharp11/Makefile b/test/system/dumpword/sharp11/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharp11/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharp11/cmd b/test/system/dumpword/sharp11/cmd
new file mode 100755
index 0000000..01d05bd
--- /dev/null
+++ b/test/system/dumpword/sharp11/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#11'
diff --git a/test/system/dumpword/sharpF/0.txt b/test/system/dumpword/sharpF/0.txt
new file mode 100644
index 0000000..ea558fd
--- /dev/null
+++ b/test/system/dumpword/sharpF/0.txt
@@ -0,0 +1 @@
+ #F: 15 = #000F = 0000000000001111
diff --git a/test/system/dumpword/sharpF/Makefile b/test/system/dumpword/sharpF/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharpF/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharpF/cmd b/test/system/dumpword/sharpF/cmd
new file mode 100755
index 0000000..3810a01
--- /dev/null
+++ b/test/system/dumpword/sharpF/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#F'
diff --git a/test/system/dumpword/sharpFFFF/0.txt b/test/system/dumpword/sharpFFFF/0.txt
new file mode 100644
index 0000000..9c3ef77
--- /dev/null
+++ b/test/system/dumpword/sharpFFFF/0.txt
@@ -0,0 +1 @@
+ #FFFF: -1 = #FFFF = 1111111111111111
diff --git a/test/system/dumpword/sharpFFFF/Makefile b/test/system/dumpword/sharpFFFF/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharpFFFF/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharpFFFF/cmd b/test/system/dumpword/sharpFFFF/cmd
new file mode 100755
index 0000000..16c2e82
--- /dev/null
+++ b/test/system/dumpword/sharpFFFF/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#FFFF'
diff --git a/test/system/dumpword/sharpG/0.txt b/test/system/dumpword/sharpG/0.txt
new file mode 100644
index 0000000..2d30a9b
--- /dev/null
+++ b/test/system/dumpword/sharpG/0.txt
@@ -0,0 +1 @@
+Dumpword Error - 115: #G: not hex
diff --git a/test/system/dumpword/sharpG/Makefile b/test/system/dumpword/sharpG/Makefile
new file mode 100644
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/dumpword/sharpG/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk
diff --git a/test/system/dumpword/sharpG/cmd b/test/system/dumpword/sharpG/cmd
new file mode 100755
index 0000000..d667920
--- /dev/null
+++ b/test/system/dumpword/sharpG/cmd
@@ -0,0 +1 @@
+../../../../dumpword '#G'