From 03832f246ce06d0dae29f96c087b94c7086bb993 Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Sat, 2 Jun 2018 16:36:44 +0900
Subject: [PATCH] =?utf8?q?casl2lib=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA?=
 =?utf8?q?=E3=81=99=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E3=80=81test?=
 =?utf8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E3=81=8B=E3=82=89as/casl2li?=
 =?utf8?q?b/sample=E3=81=AB=E7=A7=BB=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 as/{ => sample}/addl.casl                    |  0
 as/{ => sample}/addl_outl.casl               |  0
 as/{ => sample}/call_l2str.casl              |  0
 as/{ => sample}/hello.casl                   |  0
 as/{ => sample}/sum_10.casl                  |  0
 test/system/casl2/lib_abs/abs.casl           | 27 ------------
 test/system/casl2/lib_abs/cmd                |  2 +-
 test/system/casl2/lib_addl32/addl32.casl     | 13 ------
 test/system/casl2/lib_addl32/cmd             |  2 +-
 test/system/casl2/lib_divl/cmd               |  2 +-
 test/system/casl2/lib_divl/divl.casl         | 38 -----------------
 test/system/casl2/lib_inl/cmd                |  2 +-
 test/system/casl2/lib_inl/inl.casl           | 25 -----------
 test/system/casl2/lib_minim/cmd              |  2 +-
 test/system/casl2/lib_minim/minim.casl       | 11 -----
 test/system/casl2/lib_mula/cmd               |  2 +-
 test/system/casl2/lib_mula/mula.casl         | 37 ----------------
 test/system/casl2/lib_mull/cmd               |  2 +-
 test/system/casl2/lib_mull/mull.casl         | 45 --------------------
 test/system/casl2/lib_outa/cmd               |  2 +-
 test/system/casl2/lib_outa/outa.casl         | 23 ----------
 test/system/casl2/lib_outa_q15/cmd           |  2 +-
 test/system/casl2/lib_outa_q15/outa_q15.casl | 21 ---------
 test/system/casl2/lib_outb/cmd               |  2 +-
 test/system/casl2/lib_outb/outb.casl         | 22 ----------
 test/system/casl2/lib_outb_w/cmd             |  2 +-
 test/system/casl2/lib_outb_w/cmd0            |  1 -
 test/system/casl2/lib_outb_w/outb_w.casl     | 22 ----------
 test/system/casl2/lib_outb_w/outb_w0.casl    | 13 ------
 test/system/casl2/lib_outl/cmd               |  2 +-
 test/system/casl2/lib_outl/outl.casl         | 22 ----------
 test/system/casl2/lib_outl_q15/cmd           |  2 +-
 test/system/casl2/lib_outl_q15/outl_q15.casl | 21 ---------
 test/system/casl2/lib_rev/cmd                |  2 +-
 test/system/casl2/lib_rev/rev.casl           | 10 -----
 35 files changed, 14 insertions(+), 365 deletions(-)
 rename as/{ => sample}/addl.casl (100%)
 rename as/{ => sample}/addl_outl.casl (100%)
 rename as/{ => sample}/call_l2str.casl (100%)
 rename as/{ => sample}/hello.casl (100%)
 rename as/{ => sample}/sum_10.casl (100%)
 delete mode 100644 test/system/casl2/lib_abs/abs.casl
 delete mode 100644 test/system/casl2/lib_addl32/addl32.casl
 delete mode 100644 test/system/casl2/lib_divl/divl.casl
 delete mode 100644 test/system/casl2/lib_inl/inl.casl
 delete mode 100644 test/system/casl2/lib_minim/minim.casl
 delete mode 100644 test/system/casl2/lib_mula/mula.casl
 delete mode 100644 test/system/casl2/lib_mull/mull.casl
 delete mode 100644 test/system/casl2/lib_outa/outa.casl
 delete mode 100644 test/system/casl2/lib_outa_q15/outa_q15.casl
 delete mode 100644 test/system/casl2/lib_outb/outb.casl
 delete mode 100755 test/system/casl2/lib_outb_w/cmd0
 delete mode 100644 test/system/casl2/lib_outb_w/outb_w.casl
 delete mode 100644 test/system/casl2/lib_outb_w/outb_w0.casl
 delete mode 100644 test/system/casl2/lib_outl/outl.casl
 delete mode 100644 test/system/casl2/lib_outl_q15/outl_q15.casl
 delete mode 100644 test/system/casl2/lib_rev/rev.casl

diff --git a/as/addl.casl b/as/sample/addl.casl
similarity index 100%
rename from as/addl.casl
rename to as/sample/addl.casl
diff --git a/as/addl_outl.casl b/as/sample/addl_outl.casl
similarity index 100%
rename from as/addl_outl.casl
rename to as/sample/addl_outl.casl
diff --git a/as/call_l2str.casl b/as/sample/call_l2str.casl
similarity index 100%
rename from as/call_l2str.casl
rename to as/sample/call_l2str.casl
diff --git a/as/hello.casl b/as/sample/hello.casl
similarity index 100%
rename from as/hello.casl
rename to as/sample/hello.casl
diff --git a/as/sum_10.casl b/as/sample/sum_10.casl
similarity index 100%
rename from as/sum_10.casl
rename to as/sample/sum_10.casl
diff --git a/test/system/casl2/lib_abs/abs.casl b/test/system/casl2/lib_abs/abs.casl
deleted file mode 100644
index e16585b..0000000
--- a/test/system/casl2/lib_abs/abs.casl
+++ /dev/null
@@ -1,27 +0,0 @@
-;;; ABSを呼び出す
-MAIN    START
-        LAD     GR2,0
-MLOOP   CPA     GR2,MLEN
-        JZE     MFIN
-        LD      GR1,MVAL,GR2
-        CALL    OUTA
-        CALL    ABS
-        JOV     PUTOV
-        JMI     PUTM
-        OUT     PLUS,=1
-        JUMP    PUTD
-PUTM    OUT     MINUS,=1
-        JUMP    PUTD
-PUTOV   OUT     OV,=2
-PUTD    CALL    OUTA
-        OUT     SEP,MLEN
-        LAD     GR2,1,GR2
-        JUMP    MLOOP
-MFIN    RET
-MVAL    DC      12,-12,1,-1,32767,-32767,0,-32768
-MLEN    DC      8
-SEP     DC      '--------'
-PLUS    DC      '+'
-MINUS   DC      '-'
-OV      DC      'OV'
-        END
diff --git a/test/system/casl2/lib_abs/cmd b/test/system/casl2/lib_abs/cmd
index b96e675..88071d7 100755
--- a/test/system/casl2/lib_abs/cmd
+++ b/test/system/casl2/lib_abs/cmd
@@ -1 +1 @@
-../../../../casl2 abs.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_abs.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_addl32/addl32.casl b/test/system/casl2/lib_addl32/addl32.casl
deleted file mode 100644
index 6072b8b..0000000
--- a/test/system/casl2/lib_addl32/addl32.casl
+++ /dev/null
@@ -1,13 +0,0 @@
-MAIN    START
-        LAD     GR1,A
-        LAD     GR2,B
-        CALL    ADDL32
-        LD      GR2,GR0
-        LD      GR1,1,GR2
-        CALL    OUTL
-        LD      GR1,0,GR2
-        CALL    OUTL
-        RET
-A       DC      6,10
-B       DC      2,65530
-        END
diff --git a/test/system/casl2/lib_addl32/cmd b/test/system/casl2/lib_addl32/cmd
index 3c45656..3753bcf 100755
--- a/test/system/casl2/lib_addl32/cmd
+++ b/test/system/casl2/lib_addl32/cmd
@@ -1 +1 @@
-../../../../casl2 addl32.casl ../../../../as/casl2lib/addl32.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_addl32.casl ../../../../as/casl2lib/addl32.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_divl/cmd b/test/system/casl2/lib_divl/cmd
index f5cbb75..d7d1ed6 100755
--- a/test/system/casl2/lib_divl/cmd
+++ b/test/system/casl2/lib_divl/cmd
@@ -1 +1 @@
-../../../../casl2 -M640 divl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
+../../../../casl2 -M640 ../../../../as/casl2lib/sample/call_divl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_divl/divl.casl b/test/system/casl2/lib_divl/divl.casl
deleted file mode 100644
index e988bea..0000000
--- a/test/system/casl2/lib_divl/divl.casl
+++ /dev/null
@@ -1,38 +0,0 @@
-MAIN    START
-        LD      GR1,XMAX
-LOOPX   CPA     GR1,XMIN
-        JMI     FIN
-        OUT     SEP,SLEN
-        LD      GR2,YMIN
-LOOPY   CPL     GR2,YMAX
-        JPL     XNEXT
-        CALL    OUTL
-        PUSH    0,GR1
-        LD      GR1,GR2
-        CALL    OUTL
-        POP     GR1
-        CALL    DIVL
-        JOV     WOV
-        PUSH    0,GR1
-        LD      GR1,GR0
-        CALL    OUTL
-        LD      GR1,GR3
-        CALL    OUTL
-        POP     GR1
-YNEXT   OUT     SEP,SLEN
-        LAD     GR2,1,GR2
-        JUMP    LOOPY
-WOV     OUT     Y0MSG,YLEN
-        JUMP    YNEXT
-XNEXT   LAD     GR1,-1,GR1
-        JUMP    LOOPX
-FIN     RET
-XMAX    DC      100
-XMIN    DC      0
-YMAX    DC      10
-YMIN    DC      0
-SEP     DC      '--------------------'
-SLEN    DC      20
-Y0MSG   DC      'Error: div by 0'
-YLEN    DC      15
-        END
diff --git a/test/system/casl2/lib_inl/cmd b/test/system/casl2/lib_inl/cmd
index f68c159..3fa40ab 100755
--- a/test/system/casl2/lib_inl/cmd
+++ b/test/system/casl2/lib_inl/cmd
@@ -1 +1 @@
-../../../../casl2 -M720 inl.casl ../../../../as/casl2lib/inl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/str2l.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl  <teststr.txt
+../../../../casl2 -M720 ../../../../as/casl2lib/sample/call_inl.casl ../../../../as/casl2lib/inl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/str2l.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl  <teststr.txt
diff --git a/test/system/casl2/lib_inl/inl.casl b/test/system/casl2/lib_inl/inl.casl
deleted file mode 100644
index 28c6a9c..0000000
--- a/test/system/casl2/lib_inl/inl.casl
+++ /dev/null
@@ -1,25 +0,0 @@
-;;; casl2 inl.casl ../casl2lib/inl.casl ../casl2lib/outl.casl
-MAIN    START
-LOOP    CALL    INL             ; GR1に数値、GR0に文字列の長さ
-        JOV     OV
-        AND     GR0,GR0
-        JZE     FIN
-        CPL     GR0,=#FFFF
-        JZE     NAN
-        CALL    OUTL
-        JUMP    LOOP
-OV      CPL     GR0,=#FFFF
-        JZE     LENOV
-        OUT     OVMSG,MLEN1
-        JUMP    LOOP
-NAN     OUT     NANMSG,MLEN2
-        JUMP    LOOP
-LENOV   OUT     LENOVMSG,MLEN3
-FIN     RET
-OVMSG   DC      'Over 65535'
-MLEN1   DC      10
-NANMSG  DC      'Not A Number'
-MLEN2   DC      12
-LENOVMSG DC     'Str too long. Stop'
-MLEN3   DC      18
-        END
diff --git a/test/system/casl2/lib_minim/cmd b/test/system/casl2/lib_minim/cmd
index bcbbcd6..dc51b7c 100755
--- a/test/system/casl2/lib_minim/cmd
+++ b/test/system/casl2/lib_minim/cmd
@@ -1 +1 @@
-../../../../casl2 minim.casl ../../../../as/casl2lib/minim.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl ../../../../as/casl2lib/abs.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_minim.casl ../../../../as/casl2lib/minim.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl ../../../../as/casl2lib/abs.casl
diff --git a/test/system/casl2/lib_minim/minim.casl b/test/system/casl2/lib_minim/minim.casl
deleted file mode 100644
index d74aa34..0000000
--- a/test/system/casl2/lib_minim/minim.casl
+++ /dev/null
@@ -1,11 +0,0 @@
-;;; casl2 minim.casl $(LIBDIR)/minim.casl $(LIBDIR)/outa.casl
-MAIN    START
-        LAD     GR1,DATA
-        LD      GR2,CNT
-        CALL    MINIM
-        LD      GR1,GR0
-        CALL    OUTA
-        RET
-DATA    DC      23,78,2,45,67,-39,86
-CNT     DC      7
-        END
diff --git a/test/system/casl2/lib_mula/cmd b/test/system/casl2/lib_mula/cmd
index 7571a28..6a14b4c 100755
--- a/test/system/casl2/lib_mula/cmd
+++ b/test/system/casl2/lib_mula/cmd
@@ -1 +1 @@
-../../../../casl2 -M640 mula.casl ../../../../as/casl2lib/mula.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
\ No newline at end of file
+../../../../casl2 -M640 ../../../../as/casl2lib/sample/call_mula.casl ../../../../as/casl2lib/mula.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_mula/mula.casl b/test/system/casl2/lib_mula/mula.casl
deleted file mode 100644
index 6fa37b6..0000000
--- a/test/system/casl2/lib_mula/mula.casl
+++ /dev/null
@@ -1,37 +0,0 @@
-MAIN    START
-        LAD     GR3,0           ; Xのインデックス
-LOOPX   CPA     GR3,XCNT
-        JZE     FIN
-        LD      GR1,X,GR3
-        LAD     GR4,0           ; Yのインデックス
-LOOPY   CPA     GR4,YCNT
-        JZE     XNEXT
-        LD      GR2,Y,GR4
-        CALL    OUTA
-        PUSH    0,GR1
-        LD      GR1,GR2
-        CALL    OUTA
-        POP     GR1
-        CALL    MULA
-        JOV     WOV
-        PUSH    0,GR1
-        LD      GR1,GR0
-        CALL    OUTA
-        POP     GR1
-YNEXT   OUT     SEP,SLEN
-        LAD     GR4,1,GR4
-        JUMP    LOOPY
-WOV     OUT     YOMSG,YLEN
-        JUMP    YNEXT
-XNEXT   LAD     GR3,1,GR3
-        JUMP    LOOPX
-FIN     RET
-X       DC      0,1,2,127,128,151,217,255,256,257,32767,-32768,-32767,-257,-256,-255,-217,-151,-128,-127,-2,-1
-Y       DC      0,1,2,127,128,151,217,255,256,257,32767,-32768,-32767,-257,-256,-255,-217,-151,-128,-127,-2,-1
-XCNT    DC      22
-YCNT    DC      22
-SEP     DC      '--------------------'
-SLEN    DC      20
-YOMSG   DC      'Warning: overflow'
-YLEN    DC      17
-        END
diff --git a/test/system/casl2/lib_mull/cmd b/test/system/casl2/lib_mull/cmd
index bd6a01a..9331e1a 100755
--- a/test/system/casl2/lib_mull/cmd
+++ b/test/system/casl2/lib_mull/cmd
@@ -1 +1 @@
-../../../../casl2 -M4096 mull.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl 
+../../../../casl2 -M4096 ../../../../as/casl2lib/sample/call_mull.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl 
diff --git a/test/system/casl2/lib_mull/mull.casl b/test/system/casl2/lib_mull/mull.casl
deleted file mode 100644
index 6085ce1..0000000
--- a/test/system/casl2/lib_mull/mull.casl
+++ /dev/null
@@ -1,45 +0,0 @@
-MAIN    START
-        LAD     GR4,0           ; Xのインデックス
-LOOPX   CPA     GR4,XCNT        ; (GR4 = XCNT)の場合、ループ脱出
-        JZE     FIN             ; ↓
-        LD      GR1,X,GR4       ; GR1に、(X+GR4)番地の値を転送
-        LAD     GR5,0           ; Yのインデックス
-LOOPY   CPA     GR5,YCNT        ; (GR5 = YCNT)の場合、ループ脱出
-        JZE     XNEXT           ; ↓
-        LD      GR2,Y,GR5       ; GR2に、(X+GR5)番地の値を転送
-        CALL    OUTL            ; GR1の数値を出力
-        PUSH    0,GR1           ; GR2の数値を出力
-        LD      GR1,GR2         ; ↓
-        CALL    OUTL            ; ↓
-        POP     GR1             ; ↓
-        CALL    MULL            ; GR0 <- GR1 * GR2
-        JOV     WOV             ; オーバーフローの場合は、WOVへジャンプ
-        PUSH    0,GR1           ; GR0の数値を出力
-        LD      GR1,GR0         ; ↓
-        CALL    OUTL            ; ↓
-        POP     GR1             ; ↓
-YNEXT   OUT     SEP,SLEN        ; 区切り線を出力
-        LAD     GR5,1,GR5       ; GR5 <- GR5 + 1
-        JUMP    LOOPY           ; LOOPYへジャンプ
-WOV     OUT     YOMSG,YLEN      ; オーバーフローした場合のメッセージを表示
-        PUSH    0,GR1           ; GR0の数値を出力
-        LD      GR1,GR0         ; ↓
-        CALL    OUTL            ; ↓
-        POP     GR1             ; ↓
-        PUSH    0,GR1           ; GR3の数値を出力
-        LD      GR1,GR3         ; ↓
-        CALL    OUTL            ; ↓
-        POP     GR3             ; ↓
-        JUMP    YNEXT           ; YNEXTへジャンプ
-XNEXT   LAD     GR4,1,GR4       ; GR4 <- GR4 + 1
-        JUMP    LOOPX           ; LOOPXへジャンプ
-FIN     RET
-X       DC      0,1,2,127,128,255,256,257,32767,#8000,#FFFF
-Y       DC      0,1,2,127,128,255,256,257,32767,#8000,#FFFF
-XCNT    DC      11
-YCNT    DC      11
-SEP     DC      '--------------------'
-SLEN    DC      20
-YOMSG   DC      'overflow'
-YLEN    DC      8
-        END
diff --git a/test/system/casl2/lib_outa/cmd b/test/system/casl2/lib_outa/cmd
index 020c437..a168225 100755
--- a/test/system/casl2/lib_outa/cmd
+++ b/test/system/casl2/lib_outa/cmd
@@ -1 +1 @@
-../../../../casl2 outa.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/rev.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_outa.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_outa/outa.casl b/test/system/casl2/lib_outa/outa.casl
deleted file mode 100644
index b2aaf05..0000000
--- a/test/system/casl2/lib_outa/outa.casl
+++ /dev/null
@@ -1,23 +0,0 @@
-;; casl2 outi_call.casl outi.casl
-MAIN    START
-        LAD     GR1,VAL
-        LAD     GR2,0
-LOOP    CPA     GR2,CNT
-        JZE     FIN
-        LD      GR1,VAL,GR2
-        CALL    OUTA
-        LAD     GR2,1,GR2
-        JUMP    LOOP
-FIN     RET
-VAL     DC      0
-        DC      #0001,#0002,#0004,#0008
-        DC      #0010,#0020,#0040,#0080
-        DC      #0100,#0200,#0400,#0800
-        DC      #1000,#2000,#4000,#7FFF
-        DC      #8000
-        DC      #8001,#C000,#E000,#F000
-        DC      #F800,#FC00,#FE00,#FF00
-        DC      #FF80,#FFC0,#FFE0,#FFF0
-        DC      #FFF8,#FFFC,#FFFE,#FFFF
-CNT     DC      34
-        END
diff --git a/test/system/casl2/lib_outa_q15/cmd b/test/system/casl2/lib_outa_q15/cmd
index d2b6a5b..b4f8a7e 100755
--- a/test/system/casl2/lib_outa_q15/cmd
+++ b/test/system/casl2/lib_outa_q15/cmd
@@ -1 +1 @@
-../../../../casl2 outa_q15.casl ../../../../as/casl2lib/outa_q15.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/abs.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_outa_q15.casl ../../../../as/casl2lib/outa_q15.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/abs.casl
diff --git a/test/system/casl2/lib_outa_q15/outa_q15.casl b/test/system/casl2/lib_outa_q15/outa_q15.casl
deleted file mode 100644
index 1ea1f12..0000000
--- a/test/system/casl2/lib_outa_q15/outa_q15.casl
+++ /dev/null
@@ -1,21 +0,0 @@
-;; outd_q15.caslを呼び出し、33個の数値を表示する
-MAIN    START
-        LAD     GR2,0
-LOOP    LD      GR1,VAL,GR2
-        CALL    OUTAQ15
-        LAD     GR2,1,GR2
-        CPA     GR2,CNT
-        JZE     FIN
-        JUMP    LOOP
-FIN     RET
-VAL     DC      #7FFF,#4000,#2000,#1000
-        DC      #0800,#0400,#0200,#0100
-        DC      #0080,#0040,#0020,#0010
-        DC      #0008,#0004,#0002,#0001
-        DC      #8000
-        DC      #8001,#C000,#E000,#F000
-        DC      #F800,#FC00,#FE00,#FF00
-        DC      #FF80,#FFC0,#FFE0,#FFF0
-        DC      #FFF8,#FFFC,#FFFE,#FFFF
-CNT     DC      33
-        END
diff --git a/test/system/casl2/lib_outb/cmd b/test/system/casl2/lib_outb/cmd
index d81cd1f..72d9c8f 100755
--- a/test/system/casl2/lib_outb/cmd
+++ b/test/system/casl2/lib_outb/cmd
@@ -1 +1 @@
-../../../../casl2 outb.casl ../../../../as/casl2lib/outb.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_outb.casl ../../../../as/casl2lib/outb.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_outb/outb.casl b/test/system/casl2/lib_outb/outb.casl
deleted file mode 100644
index 9ba7189..0000000
--- a/test/system/casl2/lib_outb/outb.casl
+++ /dev/null
@@ -1,22 +0,0 @@
-;;; casl2 outb_call.casl outb.casl
-MAIN    START
-        LAD     GR2,0
-LOOP    LD      GR1,VAL,GR2
-        CALL    OUTB
-        LAD     GR2,1,GR2
-        CPA     GR2,CNT
-        JZE     FIN
-        JUMP    LOOP
-FIN     RET
-VAL     DC      0
-        DC      #0001,#0002,#0004,#0008
-        DC      #0010,#0020,#0040,#0080
-        DC      #0100,#0200,#0400,#0800
-        DC      #1000,#2000,#4000,#7FFF
-        DC      #8000
-        DC      #8001,#C000,#E000,#F000
-        DC      #F800,#FC00,#FE00,#FF00
-        DC      #FF80,#FFC0,#FFE0,#FFF0
-        DC      #FFF8,#FFFC,#FFFE,#FFFF
-CNT     DC      34
-        END
diff --git a/test/system/casl2/lib_outb_w/cmd b/test/system/casl2/lib_outb_w/cmd
index 1ad83b2..c222225 100755
--- a/test/system/casl2/lib_outb_w/cmd
+++ b/test/system/casl2/lib_outb_w/cmd
@@ -1 +1 @@
-../../../../casl2 outb_w.casl ../../../../as/casl2lib/outb_w.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_outb_w.casl ../../../../as/casl2lib/outb_w.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_outb_w/cmd0 b/test/system/casl2/lib_outb_w/cmd0
deleted file mode 100755
index f153b05..0000000
--- a/test/system/casl2/lib_outb_w/cmd0
+++ /dev/null
@@ -1 +0,0 @@
-../../../../casl2 outb_w0.casl ../../../../as/casl2lib/outb_w.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_outb_w/outb_w.casl b/test/system/casl2/lib_outb_w/outb_w.casl
deleted file mode 100644
index 9ba7189..0000000
--- a/test/system/casl2/lib_outb_w/outb_w.casl
+++ /dev/null
@@ -1,22 +0,0 @@
-;;; casl2 outb_call.casl outb.casl
-MAIN    START
-        LAD     GR2,0
-LOOP    LD      GR1,VAL,GR2
-        CALL    OUTB
-        LAD     GR2,1,GR2
-        CPA     GR2,CNT
-        JZE     FIN
-        JUMP    LOOP
-FIN     RET
-VAL     DC      0
-        DC      #0001,#0002,#0004,#0008
-        DC      #0010,#0020,#0040,#0080
-        DC      #0100,#0200,#0400,#0800
-        DC      #1000,#2000,#4000,#7FFF
-        DC      #8000
-        DC      #8001,#C000,#E000,#F000
-        DC      #F800,#FC00,#FE00,#FF00
-        DC      #FF80,#FFC0,#FFE0,#FFF0
-        DC      #FFF8,#FFFC,#FFFE,#FFFF
-CNT     DC      34
-        END
diff --git a/test/system/casl2/lib_outb_w/outb_w0.casl b/test/system/casl2/lib_outb_w/outb_w0.casl
deleted file mode 100644
index ad8c17f..0000000
--- a/test/system/casl2/lib_outb_w/outb_w0.casl
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; casl2 outb_call.casl outb.casl
-MAIN    START
-        LAD     GR2,0
-LOOP    LD      GR1,VAL,GR2
-        CALL    OUTB
-        LAD     GR2,1,GR2
-        CPA     GR2,CNT
-        JZE     FIN
-        JUMP    LOOP
-FIN     RET
-VAL     DC      #0001,#8000
-CNT     DC      2
-        END
diff --git a/test/system/casl2/lib_outl/cmd b/test/system/casl2/lib_outl/cmd
index cd11286..39824f8 100755
--- a/test/system/casl2/lib_outl/cmd
+++ b/test/system/casl2/lib_outl/cmd
@@ -1 +1 @@
-../../../../casl2 outl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_outl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_outl/outl.casl b/test/system/casl2/lib_outl/outl.casl
deleted file mode 100644
index d20214e..0000000
--- a/test/system/casl2/lib_outl/outl.casl
+++ /dev/null
@@ -1,22 +0,0 @@
-;;; casl2 outl_call.casl outl.casl
-MAIN    START
-        LAD     GR2,0
-LOOP    LD      GR1,VAL,GR2
-        CALL    OUTL
-        LAD     GR2,1,GR2
-        CPA     GR2,CNT
-        JZE     FIN
-        JUMP    LOOP
-FIN     RET
-VAL     DC      0
-        DC      #0001,#0002,#0004,#0008
-        DC      #0010,#0020,#0040,#0080
-        DC      #0100,#0200,#0400,#0800
-        DC      #1000,#2000,#4000,#7FFF
-        DC      #8000
-        DC      #8001,#C000,#E000,#F000
-        DC      #F800,#FC00,#FE00,#FF00
-        DC      #FF80,#FFC0,#FFE0,#FFF0
-        DC      #FFF8,#FFFC,#FFFE,#FFFF
-CNT     DC      34
-        END
diff --git a/test/system/casl2/lib_outl_q15/cmd b/test/system/casl2/lib_outl_q15/cmd
index b43bed6..9c600a8 100755
--- a/test/system/casl2/lib_outl_q15/cmd
+++ b/test/system/casl2/lib_outl_q15/cmd
@@ -1 +1 @@
-../../../../casl2 outl_q15.casl ../../../../as/casl2lib/outl_q15.casl ../../../../as/casl2lib/mull.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_outl_q15.casl ../../../../as/casl2lib/outl_q15.casl ../../../../as/casl2lib/mull.casl
diff --git a/test/system/casl2/lib_outl_q15/outl_q15.casl b/test/system/casl2/lib_outl_q15/outl_q15.casl
deleted file mode 100644
index dd06ee0..0000000
--- a/test/system/casl2/lib_outl_q15/outl_q15.casl
+++ /dev/null
@@ -1,21 +0,0 @@
-;; outd_q15.caslを呼び出し、33個の数値を表示する
-MAIN    START
-        LAD     GR2,0
-LOOP    LD      GR1,VAL,GR2
-        CALL    OUTLQ15
-        LAD     GR2,1,GR2
-        CPA     GR2,CNT
-        JZE     FIN
-        JUMP    LOOP
-FIN     RET
-VAL     DC      #0001,#0002,#0004,#0008
-        DC      #0010,#0020,#0040,#0080
-        DC      #0100,#0200,#0400,#0800
-        DC      #1000,#2000,#4000,#7FFF
-        DC      #8000
-        DC      #8001,#C000,#E000,#F000
-        DC      #F800,#FC00,#FE00,#FF00
-        DC      #FF80,#FFC0,#FFE0,#FFF0
-        DC      #FFF8,#FFFC,#FFFE,#FFFF
-CNT     DC      33
-        END
diff --git a/test/system/casl2/lib_rev/cmd b/test/system/casl2/lib_rev/cmd
index 3aea87a..71b0964 100755
--- a/test/system/casl2/lib_rev/cmd
+++ b/test/system/casl2/lib_rev/cmd
@@ -1 +1 @@
-../../../../casl2 rev.casl ../../../../as/casl2lib/rev.casl
+../../../../casl2 ../../../../as/casl2lib/sample/call_rev.casl ../../../../as/casl2lib/rev.casl
diff --git a/test/system/casl2/lib_rev/rev.casl b/test/system/casl2/lib_rev/rev.casl
deleted file mode 100644
index 58252c2..0000000
--- a/test/system/casl2/lib_rev/rev.casl
+++ /dev/null
@@ -1,10 +0,0 @@
-MAIN    START
-        OUT     STR,LEN
-        LAD     GR1,STR
-        LD      GR2,LEN
-        CALL    REV
-        OUT     STR,LEN
-        RET
-STR     DC      '12345'
-LEN     DC      5
-        END
-- 
2.18.0