From: j8takagi Date: Sat, 2 Jun 2018 10:46:36 +0000 (+0900) Subject: casl2libとtestを整理 X-Git-Tag: v0.2p45 X-Git-Url: https://j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05715980c2d89d29f131eb92c5d9470cec0068f5;p=YACASL2.git casl2libとtestを整理 --- diff --git a/VERSION b/VERSION index 8669312..b5c41d8 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -v0.2p43 +v0.2p45 diff --git a/as/casl2lib/Makefile b/as/casl2lib/Makefile index 1392daa..526fae1 100644 --- a/as/casl2lib/Makefile +++ b/as/casl2lib/Makefile @@ -1,6 +1,7 @@ -.PHONY: all install-casl2lib uninstall-casl2lib +.PHONY: all libfiles install-casl2lib uninstall-casl2lib CAT := cat +CASL2OUT := casl2 -M4096 -O RMF := rm -f RMDIR := rmdir ECHO := echo @@ -9,11 +10,14 @@ INSTALL := install prefix ?= ~ casl2libdir ?= $(prefix)/share/casl2lib -all: stdlib.casl abs.casl addl32.casl diva.casl divl.casl inl.casl l2str.casl max.casl minim.casl mula.casl mull.casl outa.casl outa_q15.casl outb.casl outb_w.casl outl.casl outl_q15.casl outpbm.casl pbm16.casl str2l.casl +all: stdlib.casl libfiles %.casl: src/%.casl $(CAT) $^ >$@ +%.o: %.casl + $(CASL2OUT)$< $@ + include casl2lib.dep clean: diff --git a/as/casl2lib/casl2lib.dep b/as/casl2lib/casl2lib.dep index 9bb2032..ae4751b 100644 --- a/as/casl2lib/casl2lib.dep +++ b/as/casl2lib/casl2lib.dep @@ -1,4 +1,6 @@ -stdlib.casl: src/stdlib.casl src/abs.casl src/addl32.casl src/diva.casl src/divl.casl src/inl.casl src/l2str.casl src/max.casl src/minim.casl src/mula.casl src/mull.casl src/outa.casl src/outa_q15.casl src/outb.casl src/outb_w.casl src/outl.casl src/outl_q15.casl src/outpbm.casl src/pbm16.casl src/rev.casl src/str2l.casl +stdlib.casl: src/stdlib.casl src/abs.casl src/addl32.casl src/diva.casl src/divl.casl src/inl.casl src/l2str.casl src/max.casl src/minim.casl src/mula.casl src/mull.casl src/outa.casl src/outaq15.casl src/outb.casl src/outbw.casl src/outl.casl src/outlq15.casl src/outpbm.casl src/pbm16.casl src/rev.casl src/str2l.casl + +libfiles: abs.casl addl32.casl diva.casl divl.casl inl.casl l2str.casl max.casl minim.casl mula.casl mull.casl outa.casl outaq15.casl outb.casl outbw.casl outl.casl outlq15.casl outpbm.casl pbm16.casl str2l.casl abs.casl: src/abs.casl @@ -20,20 +22,22 @@ mula.casl: src/mula.casl mull.casl mull.casl: src/mull.casl -outa.casl: src/outa.casl abs.casl divl.casl +outa.casl: src/outa.casl abs.casl divl.casl rev.casl -outa_q15.casl: src/outa_q15.casl abs.casl mull.casl +outaq15.casl: src/outaq15.casl abs.casl mull.casl outb.casl: src/outb.casl divl.casl rev.casl -outb_w.casl: src/outb_w.casl divl.casl rev.casl +outbw.casl: src/outbw.casl divl.casl rev.casl outl.casl: src/outl.casl divl.casl rev.casl -outl_q15.casl: src/outl_q15.casl mull.casl +outlq15.casl: src/outlq15.casl mull.casl outpbm.casl: src/outpbm.casl l2str.casl pbm16.casl: src/pbm16.casl outb.casl +rev.casl: src/rev.casl + str2l.casl: src/str2l.casl mull.casl diff --git a/as/casl2lib/inl.casl b/as/casl2lib/inl.casl index ec8bd8b..3b88321 100644 --- a/as/casl2lib/inl.casl +++ b/as/casl2lib/inl.casl @@ -20,47 +20,68 @@ ILEN DS 1 LENMAX DC 5 IBUF DS 5 END -;;; 0〜65535の範囲にある正数のかけ算（筆算方式）を行う -;;; 入力 GR1:被乗数 GR2:乗数 -;;; 出力 GR0:積の下位WORD GR3:積の上位WORD -;;; 積が65535より大きい場合は、オーバーフロー -MULL START +;;; 10進数の整数を表す文字列を数値に変換 +;;; 数値の範囲は、0から65535 +;;; 入力 GR1: 文字列を格納するアドレス +;;; GR2: 文字列の長さ。最大5けた +;;; 出力 GR0: 数値 +;;; 文字列が最大長より大きい場合や数値以外の場合は、GR0は#FFFF、OFは1 +;;; 依存プログラム: MULL +STR2L START PUSH 0,GR4 PUSH 0,GR5 - XOR GR0,GR0 ; 積 - XOR GR3,GR3 ; 上位word - XOR GR5,GR5 ; 上位wordの一時値 - AND GR1,GR1 ; (GR1 = 0)の場合、終了 - JZE CHKOV ; ↓ - AND GR2,GR2 ; (GR2 = 0)の場合、終了 - JZE CHKOV ; ↓ - LAD GR4,1 ; 対象ビット -LOOP PUSH 0,GR4 ; ループ先頭。GR2のビット中でGR4が示すビットが0の場合、NEXTへジャンプ - AND GR4,GR2 ; ↓ - POP GR4 ; ↓ - JZE NEXT1 ; ↓ - ADDL GR3,GR5 ; GR3 <- GR3 + GR5 - ADDL GR0,GR1 ; GR0 <- GR0 + GR1 - JOV AHB1 ; GR0がオーバーフローした場合、AHB1へジャンプ - JUMP NEXT1 ; ↓ -AHB1 LAD GR3,1,GR3 ; GR3 <- GR3 + 1 -NEXT1 SLL GR4,1 ; GR4を1回左シフト - JOV CHKOV ; ↓ - SLL GR5,1 ; GR5を1回左シフト - CPL GR4,GR2 ; (GR4 > GR2)の場合、CHKOVへジャンプ - JPL CHKOV ; ↓ - SLL GR1,1 ; GR1を1回左シフト - JOV AHB2 ; GR1がオーバーフローした場合、AHBへジャンプ - JUMP NEXT2 ; ↓ -AHB2 LAD GR5,1,GR5 ; GR5 <- GR5 + 1 -NEXT2 JUMP LOOP ; ループ終端 -CHKOV AND GR3,GR3 ; GR3 = 0の場合、終了 + XOR GR0,GR0 ; GR0:初期化 + AND GR2,GR2 ; (GR2 = 0)の場合、FINへジャンプ JZE FIN ; ↓ - LAD GR4,#FFFF ; GR3 <> 0の場合、オーバーフロー - SLL GR4,1 ; ↓ + CPL GR2,MAXLEN ; (GR2 > MAXLEN)の場合、LENOVへジャンプ + JPL LENOV ; ↓ + ST GR1,STR ; STR <- GR1 文字列の開始アドレス + ST GR2,LEN ; LEN <- GR2 + LAD GR2,10 ; GR2:10進数の「10」 + XOR GR4,GR4 ; GR4:値の一時格納 + XOR GR5,GR5 ; GR5:インデックス +STOL CPL GR5,LEN ; ループ先頭。(GR5 = LEN)の場合、ループ脱出 + JZE CP ; ↓ + LD GR1,STR ; GR1に、入力文字列中の次の桁を格納 + ADDL GR1,GR5 ; ↓ + LD GR1,0,GR1 ; ↓ + CPL GR1,ZERO ; (GR1 < '0')の場合、NANへジャンプ + JMI NAN ; ↓ + CPL GR1,NINE ; (GR1 > '9')の場合、NANへジャンプ + JPL NAN ; ↓ + SUBL GR1,ZERO ; GR1の文字を、対応する数値に変換 + ST GR5,NLEN ; GR5 <- LEN - NLEN - 1 + LD GR5,LEN ; ↓ + SUBA GR5,NLEN ; ↓ +MUL10 CPA GR5,=1 ; ループ先頭。GR1 <- 10 ** GR5 + JZE NEXT ; (GR5 = 1)の場合、ループ脱出 + JMI NEXT ; ↓ + CALL MULL ; MULLを呼び出し、GR0 <- GR1 * GR2 + JOV FIN ; ↓ オーバーフロー時は、プログラム終端へジャンプ + LD GR1,GR0 ; GR1 <- GR0 + LAD GR5,-1,GR5 ; GR5 <- GR5 -1 + JUMP MUL10 ; ループ終端へジャンプ +NEXT LD GR5,NLEN ; GR5 <- NLEN。復元 + ADDL GR4,GR1 ; GR4 <- GR4 + GR1 + JOV FIN ; ↓ + LAD GR5,1,GR5 ; GR5 <- GR5 + 1 + JUMP STOL ; ループ終端 +NAN LAD GR2,#FFFF ; GR2 <- #FFFF + JUMP FIN ; FINへジャンプ +CP LD GR1,GR4 ; GR0 <- GR4 + LD GR0,LEN ; GR0 <- LEN + JUMP FIN ; プログラム終端へジャンプ +LENOV LAD GR0,#FFFF ; 文字列が最大長より大きい場合、GR0 <- #FFFF + SRA GR0,1 ; ↓ オーバーフロー発生 FIN POP GR5 POP GR4 RET +ZERO DC '0' +NINE DC '9' +MAXLEN DC 5 ; 文字列の最大長 +STR DS 1 +LEN DS 1 +NLEN DS 1 END ;;; 0〜65535の範囲にある正数のかけ算（筆算方式）を行う ;;; 入力 GR1:被乗数 GR2:乗数 diff --git a/as/casl2lib/outa.casl b/as/casl2lib/outa.casl index baf71c9..c5ee7d1 100644 --- a/as/casl2lib/outa.casl +++ b/as/casl2lib/outa.casl @@ -106,3 +106,30 @@ FIN POP GR4 Y DS 1 TMP DS 1 END +;;; メモリー上にある指定されたアドレス、長さの文字列を逆順に並べ替える +;;; 例: 12345 -> 54321、54321- -> -12345 +;;; 入力 GR1:文字列のアドレス GR2:文字列の長さ +;;; 出力 （同上） +REV START + RPUSH + LAD GR3,0 ; GR3の初期化 +PU CPL GR3,GR2 ; ループ先頭。(GR3 = GR2)の場合、ループ脱出 + JZE NEXT ; ↓ + LD GR4,GR1 ; GR4 <- GR1 + ADDL GR4,GR3 ; GR4 <- GR4 + GR3 + LD GR5,0,GR4 ; GR5 <- GR4アドレスの値 + PUSH 0,GR5 ; GR5をプッシュ + LAD GR3,1,GR3 ; GR3 <- GR3 + 1 + JUMP PU ; ループ終端 +NEXT LAD GR3,0 ; GR3の初期化 +PO CPL GR3,GR2 ; ループ先頭。(GR3 = GR2)の場合、ループ脱出 + JZE FIN ; ↓ + POP GR5 ; GR5にポップ + LD GR4,GR1 ; GR4にGR1の値をコピー + ADDL GR4,GR3 ; GR4 <- GR4 + GR3 + ST GR5,0,GR4 ; GR4のアドレス <- GR5の値 + LAD GR3,1,GR3 ; GR3 <- GR3 + 1 + JUMP PO ; ループ終端 +FIN RPOP + RET + END diff --git a/as/casl2lib/outa_q15.casl b/as/casl2lib/outa_q15.casl deleted file mode 100644 index 74b1e2d..0000000 --- a/as/casl2lib/outa_q15.casl +++ /dev/null @@ -1,105 +0,0 @@ -;; GR1に格納された値を、10進数の符号付き小数値として表示 -OUTAQ15 START - RPUSH - LAD GR2,10 ; GR2に10進数の「10」を格納 - XOR GR4,GR4 ; 整数値の長さ - XOR GR3,GR3 ; 出力する文字を一時的に格納 - AND GR1,GR1 ; GR1の符号をチェック - JPL STDN ; ↓ GR1が正数の場合、STDNにジャンプ - LD GR3,='-' ; ↓ GR1が負数の場合、「-」をSTR領域に格納 - ST GR3,STR ; ↓ ↓ - LAD GR4,1,GR4 ; ↓ ↓ GR4 <- GR4 + 1 - CPA GR1,=#8000 ; (GR1 = #8000)の場合、MINONEへジャンプ - JZE MINONE ; ↓ - CALL ABS ; GR1を正数に変換 -STDN LD GR3,='0' ; 「0」をSTR領域に格納 - ST GR3,STR,GR4 ; ↓ - AND GR1,GR1 ; GR1が0の場合、PRTへジャンプ - JZE PRT ; ↓ - LAD GR4,1,GR4 ; ↓ GR4 <- GR4 + 1 - LD GR3,='.' ; 「.」をSTR領域に格納 - ST GR3,STR,GR4 ; ↓ - LAD GR4,1,GR4 ; ↓ GR4 <- GR4 + 1 - SLL GR1,1 ; GR1を1回左シフト -;; GR1の内容を小数値と見なし、10進数の文字列に変換してSTRに格納 -TODIG AND GR1,GR1 ; GR1が0の場合は、ループを脱出 - JZE PRT ; ↓ - CALL MULL ; GR1とGR2の、積をGR1、オーバーフロー値をGR3に格納 - LD GR1,GR0 ; GR0をGR1にコピー - ADDA GR3,='0' ; GR1を文字に変換 - ST GR3,STR,GR4 ; (STR + GR4) <- GR1 - LAD GR4,1,GR4 ; GR4 <- GR4 + 1 - JUMP TODIG ; ループ -;; GR1 = -1の場合 -MINONE LD GR1,='1' ; GR1が#8000の場合、-1を出力 - ST GR1,STR,GR4 ; (STR + GR4) <- GR1 - LAD GR4,1,GR4 ; GR4 <- GR4 + 1 - JUMP PRT ; ↓ -;; 値を出力 -PRT ST GR4,LEN ; LEN <- GR4 - OUT STR,LEN ; ↓ - RPOP - RET -STR DS 20 -LEN DS 1 - END - -;;; GR1を符号付き整数とみなし、絶対値に変換 -;;; 入力 GR1: -32768から32767の整数 -;;; 出力 GR1: 入力された整数の絶対値 -;;; OF: 入力されたGR1が-32768の場合、1 -;;; SF: 入力されたGR1が負数(-32767〜-1)の場合、1 -ABS START - AND GR1,GR1 ; GR1が0以上の場合は、FINへジャンプ - JPL FIN ; ↓ - JZE FIN ; ↓ - XOR GR1,ALLON ; GR1のビットを反転 - ADDA GR1,ONE ; GR1に1を追加 - JOV FIN ; 足し算でオーバーフローの場合は、OF:1を保持してFINへジャンプ - CPL GR1,ALLON ; SF:1を設定 -FIN RET -ONE DC 1 -ALLON DC #FFFF - END -;;; 0〜65535の範囲にある正数のかけ算（筆算方式）を行う -;;; 入力 GR1:被乗数 GR2:乗数 -;;; 出力 GR0:積の下位WORD GR3:積の上位WORD -;;; 積が65535より大きい場合は、オーバーフロー -MULL START - PUSH 0,GR4 - PUSH 0,GR5 - XOR GR0,GR0 ; 積 - XOR GR3,GR3 ; 上位word - XOR GR5,GR5 ; 上位wordの一時値 - AND GR1,GR1 ; (GR1 = 0)の場合、終了 - JZE CHKOV ; ↓ - AND GR2,GR2 ; (GR2 = 0)の場合、終了 - JZE CHKOV ; ↓ - LAD GR4,1 ; 対象ビット -LOOP PUSH 0,GR4 ; ループ先頭。GR2のビット中でGR4が示すビットが0の場合、NEXTへジャンプ - AND GR4,GR2 ; ↓ - POP GR4 ; ↓ - JZE NEXT1 ; ↓ - ADDL GR3,GR5 ; GR3 <- GR3 + GR5 - ADDL GR0,GR1 ; GR0 <- GR0 + GR1 - JOV AHB1 ; GR0がオーバーフローした場合、AHB1へジャンプ - JUMP NEXT1 ; ↓ -AHB1 LAD GR3,1,GR3 ; GR3 <- GR3 + 1 -NEXT1 SLL GR4,1 ; GR4を1回左シフト - JOV CHKOV ; ↓ - SLL GR5,1 ; GR5を1回左シフト - CPL GR4,GR2 ; (GR4 > GR2)の場合、CHKOVへジャンプ - JPL CHKOV ; ↓ - SLL GR1,1 ; GR1を1回左シフト - JOV AHB2 ; GR1がオーバーフローした場合、AHBへジャンプ - JUMP NEXT2 ; ↓ -AHB2 LAD GR5,1,GR5 ; GR5 <- GR5 + 1 -NEXT2 JUMP LOOP ; ループ終端 -CHKOV AND GR3,GR3 ; GR3 = 0の場合、終了 - JZE FIN ; ↓ - LAD GR4,#FFFF ; GR3 <> 0の場合、オーバーフロー - SLL GR4,1 ; ↓ -FIN POP GR5 - POP GR4 - RET - END diff --git a/as/casl2lib/outb_w.casl b/as/casl2lib/outb_w.casl deleted file mode 100644 index cf709d6..0000000 --- a/as/casl2lib/outb_w.casl +++ /dev/null @@ -1,117 +0,0 @@ -;;; GR1に格納された値を、空白付きの2進数値として表示 -OUTB START - RPUSH - LD GR2,BIN ; GR2に2進数の「2」を格納。 - XOR GR4,GR4 ; GR4: 2進数値の長さ -STI CPL GR1,GR2 ; ループ先頭。(GR1 < GR2)の場合は、ループ脱出 - JMI STLST ; ↓ - CALL DIVL ; GR1とGR2の、商をGR0、剰余をGR3に格納 - LD GR1,GR3 ; GR1にGR3をコピー - LD GR1,NCHAR,GR1 ; GR1を文字に変換 - ST GR1,STR,GR4 ; (STR + GR4) <- GR1 - LAD GR4,1,GR4 ; GR4 <- GR4 + 1 - LD GR1,SPC ; GR1 <- SPC - ST GR1,STR,GR4 ; (STR + GR4) <- GR1 - LAD GR4,1,GR4 ; GR4 <- GR4 + 1 - LD GR1,GR0 ; GR0をGR1にコピー - JUMP STI ; ループ終端 -STLST LD GR1,NCHAR,GR1 ; GR1を文字に変換 - ST GR1,STR,GR4 ; (STR + GR4) <- GR1 - LAD GR4,1,GR4 ; GR4 <- GR4 + 1 -EMLOOP CPL GR4,DIG ; ループ先頭。(GR4 = DIG)の場合は、ループ脱出 - JZE PRT ; ↓ - LD GR1,SPC ; GR1 <- SPC - ST GR1,STR,GR4 ; (STR + GR4) <- GR1 - LAD GR4,1,GR4 ; GR4 <- GR4 + 1 - LD GR1,NCHAR ; GR1 <- NCHAR:'0' - ST GR1,STR,GR4 ; (STR + GR4) <- GR1 - LAD GR4,1,GR4 ; GR4 <- GR4 + 1 - JUMP EMLOOP ; ループ終端 -PRT ST GR4,LEN ; LEN <- GR4 - LD GR2,LEN ; GR2にLENの値を格納 - LAD GR1,STR ; GR1に文字列のアドレスを格納 - CALL REV ; 文字列を逆順に並べ替え - OUT STR,LEN ; 文字列を出力 - RPOP - RET -STR DS 32 -LEN DS 1 -BIN DC 2 -NCHAR DC '01' -SPC DC ' ' -DIG DC 31 - END -;;; 0〜65535の範囲にある正数の割算（筆算方式）を行う -;;; 入力 GR1:被除数 GR2:除数 -;;; 出力 GR0:商 GR3:剰余 -;;; (GR2 = 0)の場合、GR0 GR3とも0になり、オーバーフロー -DIVL START - PUSH 0,GR1 - PUSH 0,GR2 - PUSH 0,GR4 - XOR GR0,GR0 ; GR0:商 初期化 - XOR GR3,GR3 ; GR3:剰余 初期化 - AND GR2,GR2 ; (GR2 = 0)の場合、DIVZEROへジャンプ - JZE DIVZERO ; ↓ - AND GR1,GR1 ; (GR1 = 0)の場合、FINへジャンプ - JZE FIN ; ↓ - ST GR2,Y ; YにGR2の初期値を保存 - LAD GR4,1 ; GR4:対象ビットのインデックス 初期化 -SL CPL GR2,GR1 ; ループ先頭。(GR2 > GR1)の場合、LOOPへループ脱出 - JPL LOOP ; ↓ - SLL GR4,1 ; GR4を1回左シフト - ST GR2,TMP ; GR2の値をTMPに退避 - SLL GR2,1 ; GR2を1回左シフト - JOV YOV ; オーバーフローの場合は、YOVへジャンプ - JUMP SL ; ループ終端 -YOV LD GR2,TMP ; GR2の値をTMPから復元 - SRL GR4,1 ; GR4を1回右シフト - JUMP LPIN ; LPINへジャンプ -LOOP SRL GR4,1 ; ループ先頭。GR4を1回右シフト - JZE SETMOD ; (GR4 = 0)の場合、SETMODへループ脱出 - SRL GR2,1 ; GR2を1回右シフト - CPL GR1,Y ; (GR1 < Y)の場合、SETMODへループ脱出 - JMI SETMOD ; ↓ - CPL GR1,GR2 ; (GR1 < GR2)の場合、ループ先頭へジャンプ - JMI LOOP ; ↓ -LPIN SUBL GR1,GR2 ; GR1 <- GR1 - GR2 - ADDL GR0,GR4 ; GR0 <- GR0 + GR4 - JUMP LOOP ; ループ終端 -DIVZERO LAD GR3,#8000 ; 強制的にオーバーフローを発生させ、GR3 <- 0 - SLL GR3,1 ; ↓ - JUMP FIN ; FIN へジャンプ -SETMOD LD GR3,GR1 ; GR3 <- GR1。剰余の設定 -FIN POP GR4 - POP GR2 - POP GR1 - RET -Y DS 1 -TMP DS 1 - END -;;; メモリー上にある指定されたアドレス、長さの文字列を逆順に並べ替える -;;; 例: 12345 -> 54321、54321- -> -12345 -;;; 入力 GR1:文字列のアドレス GR2:文字列の長さ -;;; 出力 （同上） -REV START - RPUSH - LAD GR3,0 ; GR3の初期化 -PU CPL GR3,GR2 ; ループ先頭。(GR3 = GR2)の場合、ループ脱出 - JZE NEXT ; ↓ - LD GR4,GR1 ; GR4 <- GR1 - ADDL GR4,GR3 ; GR4 <- GR4 + GR3 - LD GR5,0,GR4 ; GR5 <- GR4アドレスの値 - PUSH 0,GR5 ; GR5をプッシュ - LAD GR3,1,GR3 ; GR3 <- GR3 + 1 - JUMP PU ; ループ終端 -NEXT LAD GR3,0 ; GR3の初期化 -PO CPL GR3,GR2 ; ループ先頭。(GR3 = GR2)の場合、ループ脱出 - JZE FIN ; ↓ - POP GR5 ; GR5にポップ - LD GR4,GR1 ; GR4にGR1の値をコピー - ADDL GR4,GR3 ; GR4 <- GR4 + GR3 - ST GR5,0,GR4 ; GR4のアドレス <- GR5の値 - LAD GR3,1,GR3 ; GR3 <- GR3 + 1 - JUMP PO ; ループ終端 -FIN RPOP - RET - END diff --git a/as/casl2lib/outl_q15.casl b/as/casl2lib/outl_q15.casl deleted file mode 100644 index 0355a6f..0000000 --- a/as/casl2lib/outl_q15.casl +++ /dev/null @@ -1,71 +0,0 @@ -;; GR1に格納された値を、10進数の符号なし小数値として表示 -OUTLQ15 START - RPUSH - LAD GR2,10 ; GR2に10進数の「10」を格納 - XOR GR4,GR4 ; 整数値の長さ -STDN LD GR3,='0' ; 「0」をSTR領域に格納 - ST GR3,STR,GR4 ; ↓ - AND GR1,GR1 ; GR1が0の場合、PRTへジャンプ - JZE PRT ; ↓ - LAD GR4,1,GR4 ; ↓ GR4 <- GR4 + 1 - LD GR3,='.' ; 「.」をSTR領域に格納 - ST GR3,STR,GR4 ; ↓ - LAD GR4,1,GR4 ; ↓ GR4 <- GR4 + 1 -;; GR1の内容を小数値と見なし、10進数の文字列に変換してSTRに格納 -TODIG AND GR1,GR1 ; GR1が0の場合は、ループを脱出 - JZE PRT ; ↓ - CALL MULL ; GR1とGR2の、積をGR0、オーバーフロー値をGR3に格納 - LD GR1,GR0 ; GR0をGR1にコピー - ADDA GR3,='0' ; GR3を文字に変換 - ST GR3,STR,GR4 ; (STR + GR3) <- GR1 - LAD GR4,1,GR4 ; GR4 <- GR4 + 1 - JUMP TODIG ; ループ -PRT ST GR4,LEN ; LEN <- GR4 - OUT STR,LEN ; 文字列を出力 - RPOP - RET -STR DS 20 -LEN DS 1 - END -;;; 0〜65535の範囲にある正数のかけ算（筆算方式）を行う -;;; 入力 GR1:被乗数 GR2:乗数 -;;; 出力 GR0:積の下位WORD GR3:積の上位WORD -;;; 積が65535より大きい場合は、オーバーフロー -MULL START - PUSH 0,GR4 - PUSH 0,GR5 - XOR GR0,GR0 ; 積 - XOR GR3,GR3 ; 上位word - XOR GR5,GR5 ; 上位wordの一時値 - AND GR1,GR1 ; (GR1 = 0)の場合、終了 - JZE CHKOV ; ↓ - AND GR2,GR2 ; (GR2 = 0)の場合、終了 - JZE CHKOV ; ↓ - LAD GR4,1 ; 対象ビット -LOOP PUSH 0,GR4 ; ループ先頭。GR2のビット中でGR4が示すビットが0の場合、NEXTへジャンプ - AND GR4,GR2 ; ↓ - POP GR4 ; ↓ - JZE NEXT1 ; ↓ - ADDL GR3,GR5 ; GR3 <- GR3 + GR5 - ADDL GR0,GR1 ; GR0 <- GR0 + GR1 - JOV AHB1 ; GR0がオーバーフローした場合、AHB1へジャンプ - JUMP NEXT1 ; ↓ -AHB1 LAD GR3,1,GR3 ; GR3 <- GR3 + 1 -NEXT1 SLL GR4,1 ; GR4を1回左シフト - JOV CHKOV ; ↓ - SLL GR5,1 ; GR5を1回左シフト - CPL GR4,GR2 ; (GR4 > GR2)の場合、CHKOVへジャンプ - JPL CHKOV ; ↓ - SLL GR1,1 ; GR1を1回左シフト - JOV AHB2 ; GR1がオーバーフローした場合、AHBへジャンプ - JUMP NEXT2 ; ↓ -AHB2 LAD GR5,1,GR5 ; GR5 <- GR5 + 1 -NEXT2 JUMP LOOP ; ループ終端 -CHKOV AND GR3,GR3 ; GR3 = 0の場合、終了 - JZE FIN ; ↓ - LAD GR4,#FFFF ; GR3 <> 0の場合、オーバーフロー - SLL GR4,1 ; ↓ -FIN POP GR5 - POP GR4 - RET - END diff --git a/as/casl2lib/str2l.casl b/as/casl2lib/str2l.casl index 591ef66..fb5e980 100644 --- a/as/casl2lib/str2l.casl +++ b/as/casl2lib/str2l.casl @@ -1,44 +1,65 @@ -;;; 0〜65535の範囲にある正数のかけ算（筆算方式）を行う -;;; 入力 GR1:被乗数 GR2:乗数 -;;; 出力 GR0:積の下位WORD GR3:積の上位WORD -;;; 積が65535より大きい場合は、オーバーフロー -MULL START +;;; 10進数の整数を表す文字列を数値に変換 +;;; 数値の範囲は、0から65535 +;;; 入力 GR1: 文字列を格納するアドレス +;;; GR2: 文字列の長さ。最大5けた +;;; 出力 GR0: 数値 +;;; 文字列が最大長より大きい場合や数値以外の場合は、GR0は#FFFF、OFは1 +;;; 依存プログラム: MULL +STR2L START PUSH 0,GR4 PUSH 0,GR5 - XOR GR0,GR0 ; 積 - XOR GR3,GR3 ; 上位word - XOR GR5,GR5 ; 上位wordの一時値 - AND GR1,GR1 ; (GR1 = 0)の場合、終了 - JZE CHKOV ; ↓ - AND GR2,GR2 ; (GR2 = 0)の場合、終了 - JZE CHKOV ; ↓ - LAD GR4,1 ; 対象ビット -LOOP PUSH 0,GR4 ; ループ先頭。GR2のビット中でGR4が示すビットが0の場合、NEXTへジャンプ - AND GR4,GR2 ; ↓ - POP GR4 ; ↓ - JZE NEXT1 ; ↓ - ADDL GR3,GR5 ; GR3 <- GR3 + GR5 - ADDL GR0,GR1 ; GR0 <- GR0 + GR1 - JOV AHB1 ; GR0がオーバーフローした場合、AHB1へジャンプ - JUMP NEXT1 ; ↓ -AHB1 LAD GR3,1,GR3 ; GR3 <- GR3 + 1 -NEXT1 SLL GR4,1 ; GR4を1回左シフト - JOV CHKOV ; ↓ - SLL GR5,1 ; GR5を1回左シフト - CPL GR4,GR2 ; (GR4 > GR2)の場合、CHKOVへジャンプ - JPL CHKOV ; ↓ - SLL GR1,1 ; GR1を1回左シフト - JOV AHB2 ; GR1がオーバーフローした場合、AHBへジャンプ - JUMP NEXT2 ; ↓ -AHB2 LAD GR5,1,GR5 ; GR5 <- GR5 + 1 -NEXT2 JUMP LOOP ; ループ終端 -CHKOV AND GR3,GR3 ; GR3 = 0の場合、終了 + XOR GR0,GR0 ; GR0:初期化 + AND GR2,GR2 ; (GR2 = 0)の場合、FINへジャンプ JZE FIN ; ↓ - LAD GR4,#FFFF ; GR3 <> 0の場合、オーバーフロー - SLL GR4,1 ; ↓ + CPL GR2,MAXLEN ; (GR2 > MAXLEN)の場合、LENOVへジャンプ + JPL LENOV ; ↓ + ST GR1,STR ; STR <- GR1 文字列の開始アドレス + ST GR2,LEN ; LEN <- GR2 + LAD GR2,10 ; GR2:10進数の「10」 + XOR GR4,GR4 ; GR4:値の一時格納 + XOR GR5,GR5 ; GR5:インデックス +STOL CPL GR5,LEN ; ループ先頭。(GR5 = LEN)の場合、ループ脱出 + JZE CP ; ↓ + LD GR1,STR ; GR1に、入力文字列中の次の桁を格納 + ADDL GR1,GR5 ; ↓ + LD GR1,0,GR1 ; ↓ + CPL GR1,ZERO ; (GR1 < '0')の場合、NANへジャンプ + JMI NAN ; ↓ + CPL GR1,NINE ; (GR1 > '9')の場合、NANへジャンプ + JPL NAN ; ↓ + SUBL GR1,ZERO ; GR1の文字を、対応する数値に変換 + ST GR5,NLEN ; GR5 <- LEN - NLEN - 1 + LD GR5,LEN ; ↓ + SUBA GR5,NLEN ; ↓ +MUL10 CPA GR5,=1 ; ループ先頭。GR1 <- 10 ** GR5 + JZE NEXT ; (GR5 = 1)の場合、ループ脱出 + JMI NEXT ; ↓ + CALL MULL ; MULLを呼び出し、GR0 <- GR1 * GR2 + JOV FIN ; ↓ オーバーフロー時は、プログラム終端へジャンプ + LD GR1,GR0 ; GR1 <- GR0 + LAD GR5,-1,GR5 ; GR5 <- GR5 -1 + JUMP MUL10 ; ループ終端へジャンプ +NEXT LD GR5,NLEN ; GR5 <- NLEN。復元 + ADDL GR4,GR1 ; GR4 <- GR4 + GR1 + JOV FIN ; ↓ + LAD GR5,1,GR5 ; GR5 <- GR5 + 1 + JUMP STOL ; ループ終端 +NAN LAD GR2,#FFFF ; GR2 <- #FFFF + JUMP FIN ; FINへジャンプ +CP LD GR1,GR4 ; GR0 <- GR4 + LD GR0,LEN ; GR0 <- LEN + JUMP FIN ; プログラム終端へジャンプ +LENOV LAD GR0,#FFFF ; 文字列が最大長より大きい場合、GR0 <- #FFFF + SRA GR0,1 ; ↓ オーバーフロー発生 FIN POP GR5 POP GR4 RET +ZERO DC '0' +NINE DC '9' +MAXLEN DC 5 ; 文字列の最大長 +STR DS 1 +LEN DS 1 +NLEN DS 1 END ;;; 0〜65535の範囲にある正数のかけ算（筆算方式）を行う ;;; 入力 GR1:被乗数 GR2:乗数 diff --git a/test/system/Makefile b/test/system/Makefile index 03a630e..cb6f2a9 100644 --- a/test/system/Makefile +++ b/test/system/Makefile @@ -1,5 +1,5 @@ # 複数の子ディレクトリーでmakeを実行 -CMD = casl2 comet2 dumpword +CMD = casl2_smoke casl2_opt casl2_cmd casl2_err casl2_lib comet2_smoke comet2_opt comet2_cmd comet2_err comet2_lib dumpword define make_dirs $(foreach d,$1,$(MAKE) -sC $d $2) endef diff --git a/test/system/casl2/hello/0.txt b/test/system/casl2/hello/0.txt deleted file mode 100644 index 59baef2..0000000 --- a/test/system/casl2/hello/0.txt +++ /dev/null @@ -1,63 +0,0 @@ -MAIN START - OUT OBUF,LEN - RET -OBUF DC 'Hello, World!' -LEN DC 13 - END - -Assemble ../../../../as/hello.casl (0) -../../../../as/hello.casl: 1:MAIN START -../../../../as/hello.casl: 2: OUT OBUF,LEN -../../../../as/hello.casl: 3: RET -../../../../as/hello.casl: 4:OBUF DC 'Hello, World!' -../../../../as/hello.casl: 5:LEN DC 13 -../../../../as/hello.casl: 6: END - -Label:::: -MAIN ---> #0000 -MAIN.OBUF ---> #0013 -MAIN.LEN ---> #0020 - -Assemble ../../../../as/hello.casl (1) -../../../../as/hello.casl: 1:MAIN START -../../../../as/hello.casl: 2: OUT OBUF,LEN - #0000 #7001 - #0001 #0000 - #0002 #7002 - #0003 #0000 - #0004 #1210 - #0005 #0013 - #0006 #1220 - #0007 #0020 - #0008 #F000 - #0009 #0002 - #0021 #000A - #000A #1210 - #000B #0021 - #0022 #0001 - #000C #1220 - #000D #0022 - #000E #F000 - #000F #0002 - #0010 #7120 - #0011 #7110 -../../../../as/hello.casl: 3: RET - #0012 #8100 -../../../../as/hello.casl: 4:OBUF DC 'Hello, World!' - #0013 #0048 - #0014 #0065 - #0015 #006C - #0016 #006C - #0017 #006F - #0018 #002C - #0019 #0020 - #001A #0057 - #001B #006F - #001C #0072 - #001D #006C - #001E #0064 - #001F #0021 -../../../../as/hello.casl: 5:LEN DC 13 - #0020 #000D -../../../../as/hello.casl: 6: END -Hello, World! diff --git a/test/system/casl2/hello/cmd b/test/system/casl2/hello/cmd deleted file mode 100755 index 8b628ee..0000000 --- a/test/system/casl2/hello/cmd +++ /dev/null @@ -1,2 +0,0 @@ -cat ../../../../as/hello.casl -../../../../casl2 -sla ../../../../as/hello.casl diff --git a/test/system/casl2/lib_abs/cmd b/test/system/casl2/lib_abs/cmd deleted file mode 100755 index 88071d7..0000000 --- a/test/system/casl2/lib_abs/cmd +++ /dev/null @@ -1 +0,0 @@ -../../../../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/cmd b/test/system/casl2/lib_addl32/cmd deleted file mode 100755 index 3753bcf..0000000 --- a/test/system/casl2/lib_addl32/cmd +++ /dev/null @@ -1 +0,0 @@ -../../../../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 deleted file mode 100755 index d7d1ed6..0000000 --- a/test/system/casl2/lib_divl/cmd +++ /dev/null @@ -1 +0,0 @@ -../../../../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_inl/cmd b/test/system/casl2/lib_inl/cmd deleted file mode 100755 index 3fa40ab..0000000 --- a/test/system/casl2/lib_inl/cmd +++ /dev/null @@ -1 +0,0 @@ -../../../../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 #0000 -MAIN.LOOP ---> #0006 -MAIN.FIN ---> #000F -MAIN.FST ---> #0011 -MAIN.LST ---> #0012 -MAIN.STEP ---> #0013 diff --git a/test/system/casl2/opt_sL/cmd b/test/system/casl2/opt_sL/cmd deleted file mode 100755 index 59c7e2e..0000000 --- a/test/system/casl2/opt_sL/cmd +++ /dev/null @@ -1,2 +0,0 @@ -cat ../../../../as/sum_10.casl -../../../../casl2 -sL ../../../../as/sum_10.casl diff --git a/test/system/casl2/opt_slA/0.txt b/test/system/casl2/opt_slA/0.txt deleted file mode 100644 index e80ca76..0000000 --- a/test/system/casl2/opt_slA/0.txt +++ /dev/null @@ -1,83 +0,0 @@ -;;; sum_10.casl -;;; 出力 GR0: 1から10までの整数をすべて加算した値 -MAIN START - PUSH 0,GR1 - LAD GR0,0 ; GR0を初期化 - LD GR1,FST ; GR1に初項を転送 -LOOP ADDL GR0,GR1 ; ループ先頭 - ADDL GR1,STEP ; GR1 <- GR1 + 公差 - CPL GR1,LST ; GR1が末項より大きい場合は終了 - JPL FIN ; ↓ - JUMP LOOP ; ループ終端 -FIN POP GR1 - RET -FST DC 1 ; 初項 -LST DC 10 ; 末項 -STEP DC 1 ; 公差 - END - -Assemble ../../../../as/sum_10.casl (0) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 -../../../../as/sum_10.casl: 12:FIN POP GR1 -../../../../as/sum_10.casl: 13: RET -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 -../../../../as/sum_10.casl: 17: END - -Label:::: -MAIN ---> #0000 -MAIN.LOOP ---> #0006 -MAIN.FIN ---> #000F -MAIN.FST ---> #0011 -MAIN.LST ---> #0012 -MAIN.STEP ---> #0013 - -Assemble ../../../../as/sum_10.casl (1) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 - #0000 #7001 - #0001 #0000 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 - #0002 #1200 - #0003 #0000 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 - #0004 #1010 - #0005 #0011 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 - #0006 #2601 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 - #0007 #2210 - #0008 #0013 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 - #0009 #4110 - #000A #0012 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ - #000B #6500 - #000C #000F -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 - #000D #6400 - #000E #0006 -../../../../as/sum_10.casl: 12:FIN POP GR1 - #000F #7110 -../../../../as/sum_10.casl: 13: RET - #0010 #8100 -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 - #0011 #0001 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 - #0012 #000A -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 - #0013 #0001 -../../../../as/sum_10.casl: 17: END diff --git a/test/system/casl2/opt_slA/cmd b/test/system/casl2/opt_slA/cmd deleted file mode 100755 index 9488307..0000000 --- a/test/system/casl2/opt_slA/cmd +++ /dev/null @@ -1,2 +0,0 @@ -cat ../../../../as/sum_10.casl -../../../../casl2 -slA ../../../../as/sum_10.casl diff --git a/test/system/casl2/opt_slaO/0.txt b/test/system/casl2/opt_slaO/0.txt deleted file mode 100644 index e80ca76..0000000 --- a/test/system/casl2/opt_slaO/0.txt +++ /dev/null @@ -1,83 +0,0 @@ -;;; sum_10.casl -;;; 出力 GR0: 1から10までの整数をすべて加算した値 -MAIN START - PUSH 0,GR1 - LAD GR0,0 ; GR0を初期化 - LD GR1,FST ; GR1に初項を転送 -LOOP ADDL GR0,GR1 ; ループ先頭 - ADDL GR1,STEP ; GR1 <- GR1 + 公差 - CPL GR1,LST ; GR1が末項より大きい場合は終了 - JPL FIN ; ↓ - JUMP LOOP ; ループ終端 -FIN POP GR1 - RET -FST DC 1 ; 初項 -LST DC 10 ; 末項 -STEP DC 1 ; 公差 - END - -Assemble ../../../../as/sum_10.casl (0) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 -../../../../as/sum_10.casl: 12:FIN POP GR1 -../../../../as/sum_10.casl: 13: RET -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 -../../../../as/sum_10.casl: 17: END - -Label:::: -MAIN ---> #0000 -MAIN.LOOP ---> #0006 -MAIN.FIN ---> #000F -MAIN.FST ---> #0011 -MAIN.LST ---> #0012 -MAIN.STEP ---> #0013 - -Assemble ../../../../as/sum_10.casl (1) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 - #0000 #7001 - #0001 #0000 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 - #0002 #1200 - #0003 #0000 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 - #0004 #1010 - #0005 #0011 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 - #0006 #2601 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 - #0007 #2210 - #0008 #0013 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 - #0009 #4110 - #000A #0012 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ - #000B #6500 - #000C #000F -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 - #000D #6400 - #000E #0006 -../../../../as/sum_10.casl: 12:FIN POP GR1 - #000F #7110 -../../../../as/sum_10.casl: 13: RET - #0010 #8100 -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 - #0011 #0001 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 - #0012 #000A -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 - #0013 #0001 -../../../../as/sum_10.casl: 17: END diff --git a/test/system/casl2/opt_slaO/cmd b/test/system/casl2/opt_slaO/cmd deleted file mode 100755 index 8855fbe..0000000 --- a/test/system/casl2/opt_slaO/cmd +++ /dev/null @@ -1,2 +0,0 @@ -cat ../../../../as/sum_10.casl -../../../../casl2 -sla -O ../../../../as/sum_10.casl diff --git a/test/system/casl2/opt_slaOn/0.txt b/test/system/casl2/opt_slaOn/0.txt deleted file mode 100644 index e80ca76..0000000 --- a/test/system/casl2/opt_slaOn/0.txt +++ /dev/null @@ -1,83 +0,0 @@ -;;; sum_10.casl -;;; 出力 GR0: 1から10までの整数をすべて加算した値 -MAIN START - PUSH 0,GR1 - LAD GR0,0 ; GR0を初期化 - LD GR1,FST ; GR1に初項を転送 -LOOP ADDL GR0,GR1 ; ループ先頭 - ADDL GR1,STEP ; GR1 <- GR1 + 公差 - CPL GR1,LST ; GR1が末項より大きい場合は終了 - JPL FIN ; ↓ - JUMP LOOP ; ループ終端 -FIN POP GR1 - RET -FST DC 1 ; 初項 -LST DC 10 ; 末項 -STEP DC 1 ; 公差 - END - -Assemble ../../../../as/sum_10.casl (0) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 -../../../../as/sum_10.casl: 12:FIN POP GR1 -../../../../as/sum_10.casl: 13: RET -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 -../../../../as/sum_10.casl: 17: END - -Label:::: -MAIN ---> #0000 -MAIN.LOOP ---> #0006 -MAIN.FIN ---> #000F -MAIN.FST ---> #0011 -MAIN.LST ---> #0012 -MAIN.STEP ---> #0013 - -Assemble ../../../../as/sum_10.casl (1) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 - #0000 #7001 - #0001 #0000 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 - #0002 #1200 - #0003 #0000 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 - #0004 #1010 - #0005 #0011 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 - #0006 #2601 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 - #0007 #2210 - #0008 #0013 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 - #0009 #4110 - #000A #0012 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ - #000B #6500 - #000C #000F -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 - #000D #6400 - #000E #0006 -../../../../as/sum_10.casl: 12:FIN POP GR1 - #000F #7110 -../../../../as/sum_10.casl: 13: RET - #0010 #8100 -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 - #0011 #0001 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 - #0012 #000A -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 - #0013 #0001 -../../../../as/sum_10.casl: 17: END diff --git a/test/system/casl2/opt_slaOn/cmd b/test/system/casl2/opt_slaOn/cmd deleted file mode 100755 index 2d051d4..0000000 --- a/test/system/casl2/opt_slaOn/cmd +++ /dev/null @@ -1,2 +0,0 @@ -cat ../../../../as/sum_10.casl -../../../../casl2 -sla -Oopt.o ../../../../as/sum_10.casl diff --git a/test/system/casl2/opt_slao_T/cmd b/test/system/casl2/opt_slao_T/cmd deleted file mode 100755 index 8deb1d2..0000000 --- a/test/system/casl2/opt_slao_T/cmd +++ /dev/null @@ -1,2 +0,0 @@ -cat ../../../../as/sum_10.casl -../../../../casl2 -slaTo ../../../../as/sum_10.casl diff --git a/test/system/casl2/opt_slaot/cmd b/test/system/casl2/opt_slaot/cmd deleted file mode 100755 index 306786a..0000000 --- a/test/system/casl2/opt_slaot/cmd +++ /dev/null @@ -1,2 +0,0 @@ -cat ../../../../as/sum_10.casl -../../../../casl2 -slat -o ../../../../as/sum_10.casl diff --git a/test/system/casl2/opt_slaotd/cmd b/test/system/casl2/opt_slaotd/cmd deleted file mode 100755 index 011e56b..0000000 --- a/test/system/casl2/opt_slaotd/cmd +++ /dev/null @@ -1,2 +0,0 @@ -cat ../../../../as/sum_10.casl -../../../../casl2 -slatdo ../../../../as/sum_10.casl diff --git a/test/system/casl2/Define.mk b/test/system/casl2_cmd/Define.mk similarity index 100% rename from test/system/casl2/Define.mk rename to test/system/casl2_cmd/Define.mk diff --git a/test/system/casl2/Makefile b/test/system/casl2_cmd/Makefile similarity index 100% rename from test/system/casl2/Makefile rename to test/system/casl2_cmd/Makefile diff --git a/test/system/casl2/Test.mk b/test/system/casl2_cmd/Test.mk similarity index 100% rename from test/system/casl2/Test.mk rename to test/system/casl2_cmd/Test.mk diff --git a/test/system/casl2/cmd_adda_r1_r2/0.txt b/test/system/casl2_cmd/cmd_adda_r1_r2/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r1_r2/0.txt rename to test/system/casl2_cmd/cmd_adda_r1_r2/0.txt diff --git a/test/system/casl2/cmd_adda_r1_r2/Makefile b/test/system/casl2_cmd/cmd_adda_r1_r2/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r1_r2/Makefile rename to test/system/casl2_cmd/cmd_adda_r1_r2/Makefile diff --git a/test/system/casl2/cmd_adda_r1_r2/cmd b/test/system/casl2_cmd/cmd_adda_r1_r2/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r1_r2/cmd rename to test/system/casl2_cmd/cmd_adda_r1_r2/cmd diff --git a/test/system/casl2/cmd_adda_r_adr/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr/0.txt rename to test/system/casl2_cmd/cmd_adda_r_adr/0.txt diff --git a/test/system/casl2/cmd_adda_r_adr/Makefile b/test/system/casl2_cmd/cmd_adda_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r_adr/Makefile rename to test/system/casl2_cmd/cmd_adda_r_adr/Makefile diff --git a/test/system/casl2/cmd_adda_r_adr/cmd b/test/system/casl2_cmd/cmd_adda_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r_adr/cmd rename to test/system/casl2_cmd/cmd_adda_r_adr/cmd diff --git a/test/system/casl2/cmd_adda_r_adr/desc.txt b/test/system/casl2_cmd/cmd_adda_r_adr/desc.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr/desc.txt rename to test/system/casl2_cmd/cmd_adda_r_adr/desc.txt diff --git a/test/system/casl2/cmd_adda_r_adr___o/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr___o/0.txt rename to test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt diff --git a/test/system/casl2/cmd_adda_r_adr___o/Makefile b/test/system/casl2_cmd/cmd_adda_r_adr___o/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r_adr___o/Makefile rename to test/system/casl2_cmd/cmd_adda_r_adr___o/Makefile diff --git a/test/system/casl2/cmd_adda_r_adr___o/cmd b/test/system/casl2_cmd/cmd_adda_r_adr___o/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r_adr___o/cmd rename to test/system/casl2_cmd/cmd_adda_r_adr___o/cmd diff --git a/test/system/casl2/cmd_adda_r_adr___o/desc.txt b/test/system/casl2_cmd/cmd_adda_r_adr___o/desc.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr___o/desc.txt rename to test/system/casl2_cmd/cmd_adda_r_adr___o/desc.txt diff --git a/test/system/casl2/cmd_adda_r_adr___z/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr___z/0.txt rename to test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt diff --git a/test/system/casl2/cmd_adda_r_adr___z/Makefile b/test/system/casl2_cmd/cmd_adda_r_adr___z/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r_adr___z/Makefile rename to test/system/casl2_cmd/cmd_adda_r_adr___z/Makefile diff --git a/test/system/casl2/cmd_adda_r_adr___z/cmd b/test/system/casl2_cmd/cmd_adda_r_adr___z/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r_adr___z/cmd rename to test/system/casl2_cmd/cmd_adda_r_adr___z/cmd diff --git a/test/system/casl2/cmd_adda_r_adr___z/desc.txt b/test/system/casl2_cmd/cmd_adda_r_adr___z/desc.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr___z/desc.txt rename to test/system/casl2_cmd/cmd_adda_r_adr___z/desc.txt diff --git a/test/system/casl2/cmd_adda_r_adr__ao/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__ao/0.txt rename to test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt diff --git a/test/system/casl2/cmd_adda_r_adr__ao/Makefile b/test/system/casl2_cmd/cmd_adda_r_adr__ao/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__ao/Makefile rename to test/system/casl2_cmd/cmd_adda_r_adr__ao/Makefile diff --git a/test/system/casl2/cmd_adda_r_adr__ao/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__ao/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__ao/cmd rename to test/system/casl2_cmd/cmd_adda_r_adr__ao/cmd diff --git a/test/system/casl2/cmd_adda_r_adr__ao/desc.txt b/test/system/casl2_cmd/cmd_adda_r_adr__ao/desc.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__ao/desc.txt rename to test/system/casl2_cmd/cmd_adda_r_adr__ao/desc.txt diff --git a/test/system/casl2/cmd_adda_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__as0/0.txt rename to test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt diff --git a/test/system/casl2/cmd_adda_r_adr__as0/Makefile b/test/system/casl2_cmd/cmd_adda_r_adr__as0/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__as0/Makefile rename to test/system/casl2_cmd/cmd_adda_r_adr__as0/Makefile diff --git a/test/system/casl2/cmd_adda_r_adr__as0/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__as0/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__as0/cmd rename to test/system/casl2_cmd/cmd_adda_r_adr__as0/cmd diff --git a/test/system/casl2/cmd_adda_r_adr__as0/desc.txt b/test/system/casl2_cmd/cmd_adda_r_adr__as0/desc.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__as0/desc.txt rename to test/system/casl2_cmd/cmd_adda_r_adr__as0/desc.txt diff --git a/test/system/casl2/cmd_adda_r_adr__as1/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__as1/0.txt rename to test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt diff --git a/test/system/casl2/cmd_adda_r_adr__as1/Makefile b/test/system/casl2_cmd/cmd_adda_r_adr__as1/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__as1/Makefile rename to test/system/casl2_cmd/cmd_adda_r_adr__as1/Makefile diff --git a/test/system/casl2/cmd_adda_r_adr__as1/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__as1/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__as1/cmd rename to test/system/casl2_cmd/cmd_adda_r_adr__as1/cmd diff --git a/test/system/casl2/cmd_adda_r_adr__az/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__az/0.txt rename to test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt diff --git a/test/system/casl2/cmd_adda_r_adr__az/Makefile b/test/system/casl2_cmd/cmd_adda_r_adr__az/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__az/Makefile rename to test/system/casl2_cmd/cmd_adda_r_adr__az/Makefile diff --git a/test/system/casl2/cmd_adda_r_adr__az/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__az/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__az/cmd rename to test/system/casl2_cmd/cmd_adda_r_adr__az/cmd diff --git a/test/system/casl2/cmd_adda_r_adr__az/desc.txt b/test/system/casl2_cmd/cmd_adda_r_adr__az/desc.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__az/desc.txt rename to test/system/casl2_cmd/cmd_adda_r_adr__az/desc.txt diff --git a/test/system/casl2/cmd_adda_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__lo/0.txt rename to test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt diff --git a/test/system/casl2/cmd_adda_r_adr__lo/Makefile b/test/system/casl2_cmd/cmd_adda_r_adr__lo/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__lo/Makefile rename to test/system/casl2_cmd/cmd_adda_r_adr__lo/Makefile diff --git a/test/system/casl2/cmd_adda_r_adr__lo/cmd b/test/system/casl2_cmd/cmd_adda_r_adr__lo/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r_adr__lo/cmd rename to test/system/casl2_cmd/cmd_adda_r_adr__lo/cmd diff --git a/test/system/casl2/cmd_adda_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_adda_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_adda_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_adda_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_adda_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_adda_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_adda_r_adr_x/cmd b/test/system/casl2_cmd/cmd_adda_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_adda_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_adda_r_adr_x/cmd diff --git a/test/system/casl2/cmd_addl_r1_r2/0.txt b/test/system/casl2_cmd/cmd_addl_r1_r2/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r1_r2/0.txt rename to test/system/casl2_cmd/cmd_addl_r1_r2/0.txt diff --git a/test/system/casl2/cmd_addl_r1_r2/Makefile b/test/system/casl2_cmd/cmd_addl_r1_r2/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r1_r2/Makefile rename to test/system/casl2_cmd/cmd_addl_r1_r2/Makefile diff --git a/test/system/casl2/cmd_addl_r1_r2/cmd b/test/system/casl2_cmd/cmd_addl_r1_r2/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r1_r2/cmd rename to test/system/casl2_cmd/cmd_addl_r1_r2/cmd diff --git a/test/system/casl2/cmd_addl_r_adr/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r_adr/0.txt rename to test/system/casl2_cmd/cmd_addl_r_adr/0.txt diff --git a/test/system/casl2/cmd_addl_r_adr/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r_adr/Makefile rename to test/system/casl2_cmd/cmd_addl_r_adr/Makefile diff --git a/test/system/casl2/cmd_addl_r_adr/cmd b/test/system/casl2_cmd/cmd_addl_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r_adr/cmd rename to test/system/casl2_cmd/cmd_addl_r_adr/cmd diff --git a/test/system/casl2/cmd_addl_r_adr__ao/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__ao/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__ao/0.txt rename to test/system/casl2_cmd/cmd_addl_r_adr__ao/0.txt diff --git a/test/system/casl2/cmd_addl_r_adr__ao/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr__ao/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__ao/Makefile rename to test/system/casl2_cmd/cmd_addl_r_adr__ao/Makefile diff --git a/test/system/casl2/cmd_addl_r_adr__ao/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__ao/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__ao/cmd rename to test/system/casl2_cmd/cmd_addl_r_adr__ao/cmd diff --git a/test/system/casl2/cmd_addl_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__as0/0.txt rename to test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt diff --git a/test/system/casl2/cmd_addl_r_adr__as0/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr__as0/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__as0/Makefile rename to test/system/casl2_cmd/cmd_addl_r_adr__as0/Makefile diff --git a/test/system/casl2/cmd_addl_r_adr__as0/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__as0/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__as0/cmd rename to test/system/casl2_cmd/cmd_addl_r_adr__as0/cmd diff --git a/test/system/casl2/cmd_addl_r_adr__as1/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__as1/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__as1/0.txt rename to test/system/casl2_cmd/cmd_addl_r_adr__as1/0.txt diff --git a/test/system/casl2/cmd_addl_r_adr__as1/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr__as1/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__as1/Makefile rename to test/system/casl2_cmd/cmd_addl_r_adr__as1/Makefile diff --git a/test/system/casl2/cmd_addl_r_adr__as1/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__as1/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__as1/cmd rename to test/system/casl2_cmd/cmd_addl_r_adr__as1/cmd diff --git a/test/system/casl2/cmd_addl_r_adr__az/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__az/0.txt rename to test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt diff --git a/test/system/casl2/cmd_addl_r_adr__az/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr__az/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__az/Makefile rename to test/system/casl2_cmd/cmd_addl_r_adr__az/Makefile diff --git a/test/system/casl2/cmd_addl_r_adr__az/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__az/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__az/cmd rename to test/system/casl2_cmd/cmd_addl_r_adr__az/cmd diff --git a/test/system/casl2/cmd_addl_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__lo/0.txt rename to test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt diff --git a/test/system/casl2/cmd_addl_r_adr__lo/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr__lo/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__lo/Makefile rename to test/system/casl2_cmd/cmd_addl_r_adr__lo/Makefile diff --git a/test/system/casl2/cmd_addl_r_adr__lo/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__lo/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__lo/cmd rename to test/system/casl2_cmd/cmd_addl_r_adr__lo/cmd diff --git a/test/system/casl2/cmd_addl_r_adr__o/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__o/0.txt rename to test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt diff --git a/test/system/casl2/cmd_addl_r_adr__o/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr__o/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__o/Makefile rename to test/system/casl2_cmd/cmd_addl_r_adr__o/Makefile diff --git a/test/system/casl2/cmd_addl_r_adr__o/cmd b/test/system/casl2_cmd/cmd_addl_r_adr__o/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r_adr__o/cmd rename to test/system/casl2_cmd/cmd_addl_r_adr__o/cmd diff --git a/test/system/casl2/cmd_addl_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_addl_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_addl_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_addl_r_adr_x/cmd b/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_addl_r_adr_x/cmd diff --git a/test/system/casl2/cmd_addl_r_adr_x/cmd_addl_r_adr__x/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/0.txt similarity index 100% rename from test/system/casl2/cmd_addl_r_adr_x/cmd_addl_r_adr__x/0.txt rename to test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/0.txt diff --git a/test/system/casl2/cmd_addl_r_adr_x/cmd_addl_r_adr__x/Makefile b/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/Makefile similarity index 100% rename from test/system/casl2/cmd_addl_r_adr_x/cmd_addl_r_adr__x/Makefile rename to test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/Makefile diff --git a/test/system/casl2/cmd_addl_r_adr_x/cmd_addl_r_adr__x/cmd b/test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/cmd similarity index 100% rename from test/system/casl2/cmd_addl_r_adr_x/cmd_addl_r_adr__x/cmd rename to test/system/casl2_cmd/cmd_addl_r_adr_x/cmd_addl_r_adr__x/cmd diff --git a/test/system/casl2/cmd_and_r1_r2/0.txt b/test/system/casl2_cmd/cmd_and_r1_r2/0.txt similarity index 100% rename from test/system/casl2/cmd_and_r1_r2/0.txt rename to test/system/casl2_cmd/cmd_and_r1_r2/0.txt diff --git a/test/system/casl2/cmd_and_r1_r2/Makefile b/test/system/casl2_cmd/cmd_and_r1_r2/Makefile similarity index 100% rename from test/system/casl2/cmd_and_r1_r2/Makefile rename to test/system/casl2_cmd/cmd_and_r1_r2/Makefile diff --git a/test/system/casl2/cmd_and_r1_r2/cmd b/test/system/casl2_cmd/cmd_and_r1_r2/cmd similarity index 100% rename from test/system/casl2/cmd_and_r1_r2/cmd rename to test/system/casl2_cmd/cmd_and_r1_r2/cmd diff --git a/test/system/casl2/cmd_and_r_adr/0.txt b/test/system/casl2_cmd/cmd_and_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_and_r_adr/0.txt rename to test/system/casl2_cmd/cmd_and_r_adr/0.txt diff --git a/test/system/casl2/cmd_and_r_adr/Makefile b/test/system/casl2_cmd/cmd_and_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_and_r_adr/Makefile rename to test/system/casl2_cmd/cmd_and_r_adr/Makefile diff --git a/test/system/casl2/cmd_and_r_adr/cmd b/test/system/casl2_cmd/cmd_and_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_and_r_adr/cmd rename to test/system/casl2_cmd/cmd_and_r_adr/cmd diff --git a/test/system/casl2/cmd_and_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_and_r_adr__s/0.txt similarity index 100% rename from test/system/casl2/cmd_and_r_adr__s/0.txt rename to test/system/casl2_cmd/cmd_and_r_adr__s/0.txt diff --git a/test/system/casl2/cmd_and_r_adr__s/Makefile b/test/system/casl2_cmd/cmd_and_r_adr__s/Makefile similarity index 100% rename from test/system/casl2/cmd_and_r_adr__s/Makefile rename to test/system/casl2_cmd/cmd_and_r_adr__s/Makefile diff --git a/test/system/casl2/cmd_and_r_adr__s/cmd b/test/system/casl2_cmd/cmd_and_r_adr__s/cmd similarity index 100% rename from test/system/casl2/cmd_and_r_adr__s/cmd rename to test/system/casl2_cmd/cmd_and_r_adr__s/cmd diff --git a/test/system/casl2/cmd_and_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_and_r_adr__z/0.txt similarity index 100% rename from test/system/casl2/cmd_and_r_adr__z/0.txt rename to test/system/casl2_cmd/cmd_and_r_adr__z/0.txt diff --git a/test/system/casl2/cmd_and_r_adr__z/Makefile b/test/system/casl2_cmd/cmd_and_r_adr__z/Makefile similarity index 100% rename from test/system/casl2/cmd_and_r_adr__z/Makefile rename to test/system/casl2_cmd/cmd_and_r_adr__z/Makefile diff --git a/test/system/casl2/cmd_and_r_adr__z/cmd b/test/system/casl2_cmd/cmd_and_r_adr__z/cmd similarity index 100% rename from test/system/casl2/cmd_and_r_adr__z/cmd rename to test/system/casl2_cmd/cmd_and_r_adr__z/cmd diff --git a/test/system/casl2/cmd_and_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_and_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_and_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_and_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_and_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_and_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_and_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_and_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_and_r_adr_x/cmd b/test/system/casl2_cmd/cmd_and_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_and_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_and_r_adr_x/cmd diff --git a/test/system/casl2/cmd_call__both/0.txt b/test/system/casl2_cmd/cmd_call__both/0.txt similarity index 100% rename from test/system/casl2/cmd_call__both/0.txt rename to test/system/casl2_cmd/cmd_call__both/0.txt diff --git a/test/system/casl2/cmd_call__both/Makefile b/test/system/casl2_cmd/cmd_call__both/Makefile similarity index 100% rename from test/system/casl2/cmd_call__both/Makefile rename to test/system/casl2_cmd/cmd_call__both/Makefile diff --git a/test/system/casl2/cmd_call__both/cmd b/test/system/casl2_cmd/cmd_call__both/cmd similarity index 100% rename from test/system/casl2/cmd_call__both/cmd rename to test/system/casl2_cmd/cmd_call__both/cmd diff --git a/test/system/casl2/cmd_call__inner/0.txt b/test/system/casl2_cmd/cmd_call__inner/0.txt similarity index 100% rename from test/system/casl2/cmd_call__inner/0.txt rename to test/system/casl2_cmd/cmd_call__inner/0.txt diff --git a/test/system/casl2/cmd_call__inner/Makefile b/test/system/casl2_cmd/cmd_call__inner/Makefile similarity index 100% rename from test/system/casl2/cmd_call__inner/Makefile rename to test/system/casl2_cmd/cmd_call__inner/Makefile diff --git a/test/system/casl2/cmd_call__inner/cmd b/test/system/casl2_cmd/cmd_call__inner/cmd similarity index 100% rename from test/system/casl2/cmd_call__inner/cmd rename to test/system/casl2_cmd/cmd_call__inner/cmd diff --git a/test/system/casl2/cmd_call__outer/0.txt b/test/system/casl2_cmd/cmd_call__outer/0.txt similarity index 100% rename from test/system/casl2/cmd_call__outer/0.txt rename to test/system/casl2_cmd/cmd_call__outer/0.txt diff --git a/test/system/casl2/cmd_call__outer/Makefile b/test/system/casl2_cmd/cmd_call__outer/Makefile similarity index 100% rename from test/system/casl2/cmd_call__outer/Makefile rename to test/system/casl2_cmd/cmd_call__outer/Makefile diff --git a/test/system/casl2/cmd_call__outer/cmd b/test/system/casl2_cmd/cmd_call__outer/cmd similarity index 100% rename from test/system/casl2/cmd_call__outer/cmd rename to test/system/casl2_cmd/cmd_call__outer/cmd diff --git a/test/system/casl2/cmd_cpa_r1_r2__s/0.txt b/test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt similarity index 100% rename from test/system/casl2/cmd_cpa_r1_r2__s/0.txt rename to test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt diff --git a/test/system/casl2/cmd_cpa_r1_r2__s/Makefile b/test/system/casl2_cmd/cmd_cpa_r1_r2__s/Makefile similarity index 100% rename from test/system/casl2/cmd_cpa_r1_r2__s/Makefile rename to test/system/casl2_cmd/cmd_cpa_r1_r2__s/Makefile diff --git a/test/system/casl2/cmd_cpa_r1_r2__s/cmd b/test/system/casl2_cmd/cmd_cpa_r1_r2__s/cmd similarity index 100% rename from test/system/casl2/cmd_cpa_r1_r2__s/cmd rename to test/system/casl2_cmd/cmd_cpa_r1_r2__s/cmd diff --git a/test/system/casl2/cmd_cpa_r_adr/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr/0.txt rename to test/system/casl2_cmd/cmd_cpa_r_adr/0.txt diff --git a/test/system/casl2/cmd_cpa_r_adr/Makefile b/test/system/casl2_cmd/cmd_cpa_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr/Makefile rename to test/system/casl2_cmd/cmd_cpa_r_adr/Makefile diff --git a/test/system/casl2/cmd_cpa_r_adr/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr/cmd rename to test/system/casl2_cmd/cmd_cpa_r_adr/cmd diff --git a/test/system/casl2/cmd_cpa_r_adr__ls/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr__ls/0.txt rename to test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt diff --git a/test/system/casl2/cmd_cpa_r_adr__ls/Makefile b/test/system/casl2_cmd/cmd_cpa_r_adr__ls/Makefile similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr__ls/Makefile rename to test/system/casl2_cmd/cmd_cpa_r_adr__ls/Makefile diff --git a/test/system/casl2/cmd_cpa_r_adr__ls/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr__ls/cmd similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr__ls/cmd rename to test/system/casl2_cmd/cmd_cpa_r_adr__ls/cmd diff --git a/test/system/casl2/cmd_cpa_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr__s/0.txt rename to test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt diff --git a/test/system/casl2/cmd_cpa_r_adr__s/Makefile b/test/system/casl2_cmd/cmd_cpa_r_adr__s/Makefile similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr__s/Makefile rename to test/system/casl2_cmd/cmd_cpa_r_adr__s/Makefile diff --git a/test/system/casl2/cmd_cpa_r_adr__s/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr__s/cmd similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr__s/cmd rename to test/system/casl2_cmd/cmd_cpa_r_adr__s/cmd diff --git a/test/system/casl2/cmd_cpa_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr__z/0.txt rename to test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt diff --git a/test/system/casl2/cmd_cpa_r_adr__z/Makefile b/test/system/casl2_cmd/cmd_cpa_r_adr__z/Makefile similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr__z/Makefile rename to test/system/casl2_cmd/cmd_cpa_r_adr__z/Makefile diff --git a/test/system/casl2/cmd_cpa_r_adr__z/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr__z/cmd similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr__z/cmd rename to test/system/casl2_cmd/cmd_cpa_r_adr__z/cmd diff --git a/test/system/casl2/cmd_cpa_r_adr_x__s/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr_x__s/0.txt rename to test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt diff --git a/test/system/casl2/cmd_cpa_r_adr_x__s/Makefile b/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/Makefile similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr_x__s/Makefile rename to test/system/casl2_cmd/cmd_cpa_r_adr_x__s/Makefile diff --git a/test/system/casl2/cmd_cpa_r_adr_x__s/cmd b/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/cmd similarity index 100% rename from test/system/casl2/cmd_cpa_r_adr_x__s/cmd rename to test/system/casl2_cmd/cmd_cpa_r_adr_x__s/cmd diff --git a/test/system/casl2/cmd_cpl_r1_r2__s/0.txt b/test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt similarity index 100% rename from test/system/casl2/cmd_cpl_r1_r2__s/0.txt rename to test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt diff --git a/test/system/casl2/cmd_cpl_r1_r2__s/Makefile b/test/system/casl2_cmd/cmd_cpl_r1_r2__s/Makefile similarity index 100% rename from test/system/casl2/cmd_cpl_r1_r2__s/Makefile rename to test/system/casl2_cmd/cmd_cpl_r1_r2__s/Makefile diff --git a/test/system/casl2/cmd_cpl_r1_r2__s/cmd b/test/system/casl2_cmd/cmd_cpl_r1_r2__s/cmd similarity index 100% rename from test/system/casl2/cmd_cpl_r1_r2__s/cmd rename to test/system/casl2_cmd/cmd_cpl_r1_r2__s/cmd diff --git a/test/system/casl2/cmd_cpl_r_adr/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr/0.txt rename to test/system/casl2_cmd/cmd_cpl_r_adr/0.txt diff --git a/test/system/casl2/cmd_cpl_r_adr/Makefile b/test/system/casl2_cmd/cmd_cpl_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr/Makefile rename to test/system/casl2_cmd/cmd_cpl_r_adr/Makefile diff --git a/test/system/casl2/cmd_cpl_r_adr/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr/cmd rename to test/system/casl2_cmd/cmd_cpl_r_adr/cmd diff --git a/test/system/casl2/cmd_cpl_r_adr__ls/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr__ls/0.txt rename to test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt diff --git a/test/system/casl2/cmd_cpl_r_adr__ls/Makefile b/test/system/casl2_cmd/cmd_cpl_r_adr__ls/Makefile similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr__ls/Makefile rename to test/system/casl2_cmd/cmd_cpl_r_adr__ls/Makefile diff --git a/test/system/casl2/cmd_cpl_r_adr__ls/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr__ls/cmd similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr__ls/cmd rename to test/system/casl2_cmd/cmd_cpl_r_adr__ls/cmd diff --git a/test/system/casl2/cmd_cpl_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr__s/0.txt rename to test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt diff --git a/test/system/casl2/cmd_cpl_r_adr__s/Makefile b/test/system/casl2_cmd/cmd_cpl_r_adr__s/Makefile similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr__s/Makefile rename to test/system/casl2_cmd/cmd_cpl_r_adr__s/Makefile diff --git a/test/system/casl2/cmd_cpl_r_adr__s/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr__s/cmd similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr__s/cmd rename to test/system/casl2_cmd/cmd_cpl_r_adr__s/cmd diff --git a/test/system/casl2/cmd_cpl_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr__z/0.txt rename to test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt diff --git a/test/system/casl2/cmd_cpl_r_adr__z/Makefile b/test/system/casl2_cmd/cmd_cpl_r_adr__z/Makefile similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr__z/Makefile rename to test/system/casl2_cmd/cmd_cpl_r_adr__z/Makefile diff --git a/test/system/casl2/cmd_cpl_r_adr__z/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr__z/cmd similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr__z/cmd rename to test/system/casl2_cmd/cmd_cpl_r_adr__z/cmd diff --git a/test/system/casl2/cmd_cpl_r_adr_x__s/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr_x__s/0.txt rename to test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt diff --git a/test/system/casl2/cmd_cpl_r_adr_x__s/Makefile b/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/Makefile similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr_x__s/Makefile rename to test/system/casl2_cmd/cmd_cpl_r_adr_x__s/Makefile diff --git a/test/system/casl2/cmd_cpl_r_adr_x__s/cmd b/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/cmd similarity index 100% rename from test/system/casl2/cmd_cpl_r_adr_x__s/cmd rename to test/system/casl2_cmd/cmd_cpl_r_adr_x__s/cmd diff --git a/test/system/casl2/cmd_dc__c0/0.txt b/test/system/casl2_cmd/cmd_dc__c0/0.txt similarity index 100% rename from test/system/casl2/cmd_dc__c0/0.txt rename to test/system/casl2_cmd/cmd_dc__c0/0.txt diff --git a/test/system/casl2/cmd_dc__c0/Makefile b/test/system/casl2_cmd/cmd_dc__c0/Makefile similarity index 100% rename from test/system/casl2/cmd_dc__c0/Makefile rename to test/system/casl2_cmd/cmd_dc__c0/Makefile diff --git a/test/system/casl2/cmd_dc__c0/cmd b/test/system/casl2_cmd/cmd_dc__c0/cmd similarity index 100% rename from test/system/casl2/cmd_dc__c0/cmd rename to test/system/casl2_cmd/cmd_dc__c0/cmd diff --git a/test/system/casl2/cmd_dc__c1/0.txt b/test/system/casl2_cmd/cmd_dc__c1/0.txt similarity index 100% rename from test/system/casl2/cmd_dc__c1/0.txt rename to test/system/casl2_cmd/cmd_dc__c1/0.txt diff --git a/test/system/casl2/cmd_dc__c1/Makefile b/test/system/casl2_cmd/cmd_dc__c1/Makefile similarity index 100% rename from test/system/casl2/cmd_dc__c1/Makefile rename to test/system/casl2_cmd/cmd_dc__c1/Makefile diff --git a/test/system/casl2/cmd_dc__c1/cmd b/test/system/casl2_cmd/cmd_dc__c1/cmd similarity index 100% rename from test/system/casl2/cmd_dc__c1/cmd rename to test/system/casl2_cmd/cmd_dc__c1/cmd diff --git a/test/system/casl2/cmd_dc__i0/0.txt b/test/system/casl2_cmd/cmd_dc__i0/0.txt similarity index 100% rename from test/system/casl2/cmd_dc__i0/0.txt rename to test/system/casl2_cmd/cmd_dc__i0/0.txt diff --git a/test/system/casl2/cmd_dc__i0/Makefile b/test/system/casl2_cmd/cmd_dc__i0/Makefile similarity index 100% rename from test/system/casl2/cmd_dc__i0/Makefile rename to test/system/casl2_cmd/cmd_dc__i0/Makefile diff --git a/test/system/casl2/cmd_dc__i0/cmd b/test/system/casl2_cmd/cmd_dc__i0/cmd similarity index 100% rename from test/system/casl2/cmd_dc__i0/cmd rename to test/system/casl2_cmd/cmd_dc__i0/cmd diff --git a/test/system/casl2/cmd_dc__i1/0.txt b/test/system/casl2_cmd/cmd_dc__i1/0.txt similarity index 100% rename from test/system/casl2/cmd_dc__i1/0.txt rename to test/system/casl2_cmd/cmd_dc__i1/0.txt diff --git a/test/system/casl2/cmd_dc__i1/Makefile b/test/system/casl2_cmd/cmd_dc__i1/Makefile similarity index 100% rename from test/system/casl2/cmd_dc__i1/Makefile rename to test/system/casl2_cmd/cmd_dc__i1/Makefile diff --git a/test/system/casl2/cmd_dc__i1/cmd b/test/system/casl2_cmd/cmd_dc__i1/cmd similarity index 100% rename from test/system/casl2/cmd_dc__i1/cmd rename to test/system/casl2_cmd/cmd_dc__i1/cmd diff --git a/test/system/casl2/cmd_dc__io/0.txt b/test/system/casl2_cmd/cmd_dc__io/0.txt similarity index 100% rename from test/system/casl2/cmd_dc__io/0.txt rename to test/system/casl2_cmd/cmd_dc__io/0.txt diff --git a/test/system/casl2/cmd_dc__io/Makefile b/test/system/casl2_cmd/cmd_dc__io/Makefile similarity index 100% rename from test/system/casl2/cmd_dc__io/Makefile rename to test/system/casl2_cmd/cmd_dc__io/Makefile diff --git a/test/system/casl2/cmd_dc__io/cmd b/test/system/casl2_cmd/cmd_dc__io/cmd similarity index 100% rename from test/system/casl2/cmd_dc__io/cmd rename to test/system/casl2_cmd/cmd_dc__io/cmd diff --git a/test/system/casl2/cmd_ds/0.txt b/test/system/casl2_cmd/cmd_ds/0.txt similarity index 100% rename from test/system/casl2/cmd_ds/0.txt rename to test/system/casl2_cmd/cmd_ds/0.txt diff --git a/test/system/casl2/cmd_ds/Makefile b/test/system/casl2_cmd/cmd_ds/Makefile similarity index 100% rename from test/system/casl2/cmd_ds/Makefile rename to test/system/casl2_cmd/cmd_ds/Makefile diff --git a/test/system/casl2/cmd_ds/cmd b/test/system/casl2_cmd/cmd_ds/cmd similarity index 100% rename from test/system/casl2/cmd_ds/cmd rename to test/system/casl2_cmd/cmd_ds/cmd diff --git a/test/system/casl2/cmd_ds__0/0.txt b/test/system/casl2_cmd/cmd_ds__0/0.txt similarity index 100% rename from test/system/casl2/cmd_ds__0/0.txt rename to test/system/casl2_cmd/cmd_ds__0/0.txt diff --git a/test/system/casl2/cmd_ds__0/Makefile b/test/system/casl2_cmd/cmd_ds__0/Makefile similarity index 100% rename from test/system/casl2/cmd_ds__0/Makefile rename to test/system/casl2_cmd/cmd_ds__0/Makefile diff --git a/test/system/casl2/cmd_ds__0/cmd b/test/system/casl2_cmd/cmd_ds__0/cmd similarity index 100% rename from test/system/casl2/cmd_ds__0/cmd rename to test/system/casl2_cmd/cmd_ds__0/cmd diff --git a/test/system/casl2/cmd_in/0.txt b/test/system/casl2_cmd/cmd_in/0.txt similarity index 100% rename from test/system/casl2/cmd_in/0.txt rename to test/system/casl2_cmd/cmd_in/0.txt diff --git a/test/system/casl2/cmd_in/Makefile b/test/system/casl2_cmd/cmd_in/Makefile similarity index 100% rename from test/system/casl2/cmd_in/Makefile rename to test/system/casl2_cmd/cmd_in/Makefile diff --git a/test/system/casl2/cmd_in/cmd b/test/system/casl2_cmd/cmd_in/cmd similarity index 100% rename from test/system/casl2/cmd_in/cmd rename to test/system/casl2_cmd/cmd_in/cmd diff --git a/test/system/casl2/cmd_in/teststr.txt b/test/system/casl2_cmd/cmd_in/teststr.txt similarity index 100% rename from test/system/casl2/cmd_in/teststr.txt rename to test/system/casl2_cmd/cmd_in/teststr.txt diff --git a/test/system/casl2/cmd_jmi__m/0.txt b/test/system/casl2_cmd/cmd_jmi__m/0.txt similarity index 100% rename from test/system/casl2/cmd_jmi__m/0.txt rename to test/system/casl2_cmd/cmd_jmi__m/0.txt diff --git a/test/system/casl2/cmd_jmi__m/Makefile b/test/system/casl2_cmd/cmd_jmi__m/Makefile similarity index 100% rename from test/system/casl2/cmd_jmi__m/Makefile rename to test/system/casl2_cmd/cmd_jmi__m/Makefile diff --git a/test/system/casl2/cmd_jmi__m/cmd b/test/system/casl2_cmd/cmd_jmi__m/cmd similarity index 100% rename from test/system/casl2/cmd_jmi__m/cmd rename to test/system/casl2_cmd/cmd_jmi__m/cmd diff --git a/test/system/casl2/cmd_jmi__o/0.txt b/test/system/casl2_cmd/cmd_jmi__o/0.txt similarity index 100% rename from test/system/casl2/cmd_jmi__o/0.txt rename to test/system/casl2_cmd/cmd_jmi__o/0.txt diff --git a/test/system/casl2/cmd_jmi__o/Makefile b/test/system/casl2_cmd/cmd_jmi__o/Makefile similarity index 100% rename from test/system/casl2/cmd_jmi__o/Makefile rename to test/system/casl2_cmd/cmd_jmi__o/Makefile diff --git a/test/system/casl2/cmd_jmi__o/cmd b/test/system/casl2_cmd/cmd_jmi__o/cmd similarity index 100% rename from test/system/casl2/cmd_jmi__o/cmd rename to test/system/casl2_cmd/cmd_jmi__o/cmd diff --git a/test/system/casl2/cmd_jmi__p/0.txt b/test/system/casl2_cmd/cmd_jmi__p/0.txt similarity index 100% rename from test/system/casl2/cmd_jmi__p/0.txt rename to test/system/casl2_cmd/cmd_jmi__p/0.txt diff --git a/test/system/casl2/cmd_jmi__p/Makefile b/test/system/casl2_cmd/cmd_jmi__p/Makefile similarity index 100% rename from test/system/casl2/cmd_jmi__p/Makefile rename to test/system/casl2_cmd/cmd_jmi__p/Makefile diff --git a/test/system/casl2/cmd_jmi__p/cmd b/test/system/casl2_cmd/cmd_jmi__p/cmd similarity index 100% rename from test/system/casl2/cmd_jmi__p/cmd rename to test/system/casl2_cmd/cmd_jmi__p/cmd diff --git a/test/system/casl2/cmd_jmi__z/0.txt b/test/system/casl2_cmd/cmd_jmi__z/0.txt similarity index 100% rename from test/system/casl2/cmd_jmi__z/0.txt rename to test/system/casl2_cmd/cmd_jmi__z/0.txt diff --git a/test/system/casl2/cmd_jmi__z/Makefile b/test/system/casl2_cmd/cmd_jmi__z/Makefile similarity index 100% rename from test/system/casl2/cmd_jmi__z/Makefile rename to test/system/casl2_cmd/cmd_jmi__z/Makefile diff --git a/test/system/casl2/cmd_jmi__z/cmd b/test/system/casl2_cmd/cmd_jmi__z/cmd similarity index 100% rename from test/system/casl2/cmd_jmi__z/cmd rename to test/system/casl2_cmd/cmd_jmi__z/cmd diff --git a/test/system/casl2/cmd_jnz__m/0.txt b/test/system/casl2_cmd/cmd_jnz__m/0.txt similarity index 100% rename from test/system/casl2/cmd_jnz__m/0.txt rename to test/system/casl2_cmd/cmd_jnz__m/0.txt diff --git a/test/system/casl2/cmd_jnz__m/Makefile b/test/system/casl2_cmd/cmd_jnz__m/Makefile similarity index 100% rename from test/system/casl2/cmd_jnz__m/Makefile rename to test/system/casl2_cmd/cmd_jnz__m/Makefile diff --git a/test/system/casl2/cmd_jnz__m/cmd b/test/system/casl2_cmd/cmd_jnz__m/cmd similarity index 100% rename from test/system/casl2/cmd_jnz__m/cmd rename to test/system/casl2_cmd/cmd_jnz__m/cmd diff --git a/test/system/casl2/cmd_jnz__o/0.txt b/test/system/casl2_cmd/cmd_jnz__o/0.txt similarity index 100% rename from test/system/casl2/cmd_jnz__o/0.txt rename to test/system/casl2_cmd/cmd_jnz__o/0.txt diff --git a/test/system/casl2/cmd_jnz__o/Makefile b/test/system/casl2_cmd/cmd_jnz__o/Makefile similarity index 100% rename from test/system/casl2/cmd_jnz__o/Makefile rename to test/system/casl2_cmd/cmd_jnz__o/Makefile diff --git a/test/system/casl2/cmd_jnz__o/cmd b/test/system/casl2_cmd/cmd_jnz__o/cmd similarity index 100% rename from test/system/casl2/cmd_jnz__o/cmd rename to test/system/casl2_cmd/cmd_jnz__o/cmd diff --git a/test/system/casl2/cmd_jnz__p/0.txt b/test/system/casl2_cmd/cmd_jnz__p/0.txt similarity index 100% rename from test/system/casl2/cmd_jnz__p/0.txt rename to test/system/casl2_cmd/cmd_jnz__p/0.txt diff --git a/test/system/casl2/cmd_jnz__p/Makefile b/test/system/casl2_cmd/cmd_jnz__p/Makefile similarity index 100% rename from test/system/casl2/cmd_jnz__p/Makefile rename to test/system/casl2_cmd/cmd_jnz__p/Makefile diff --git a/test/system/casl2/cmd_jnz__p/cmd b/test/system/casl2_cmd/cmd_jnz__p/cmd similarity index 100% rename from test/system/casl2/cmd_jnz__p/cmd rename to test/system/casl2_cmd/cmd_jnz__p/cmd diff --git a/test/system/casl2/cmd_jnz__z/0.txt b/test/system/casl2_cmd/cmd_jnz__z/0.txt similarity index 100% rename from test/system/casl2/cmd_jnz__z/0.txt rename to test/system/casl2_cmd/cmd_jnz__z/0.txt diff --git a/test/system/casl2/cmd_jnz__z/Makefile b/test/system/casl2_cmd/cmd_jnz__z/Makefile similarity index 100% rename from test/system/casl2/cmd_jnz__z/Makefile rename to test/system/casl2_cmd/cmd_jnz__z/Makefile diff --git a/test/system/casl2/cmd_jnz__z/cmd b/test/system/casl2_cmd/cmd_jnz__z/cmd similarity index 100% rename from test/system/casl2/cmd_jnz__z/cmd rename to test/system/casl2_cmd/cmd_jnz__z/cmd diff --git a/test/system/casl2/cmd_jov__m/0.txt b/test/system/casl2_cmd/cmd_jov__m/0.txt similarity index 100% rename from test/system/casl2/cmd_jov__m/0.txt rename to test/system/casl2_cmd/cmd_jov__m/0.txt diff --git a/test/system/casl2/cmd_jov__m/Makefile b/test/system/casl2_cmd/cmd_jov__m/Makefile similarity index 100% rename from test/system/casl2/cmd_jov__m/Makefile rename to test/system/casl2_cmd/cmd_jov__m/Makefile diff --git a/test/system/casl2/cmd_jov__m/cmd b/test/system/casl2_cmd/cmd_jov__m/cmd similarity index 100% rename from test/system/casl2/cmd_jov__m/cmd rename to test/system/casl2_cmd/cmd_jov__m/cmd diff --git a/test/system/casl2/cmd_jov__o/0.txt b/test/system/casl2_cmd/cmd_jov__o/0.txt similarity index 100% rename from test/system/casl2/cmd_jov__o/0.txt rename to test/system/casl2_cmd/cmd_jov__o/0.txt diff --git a/test/system/casl2/cmd_jov__o/Makefile b/test/system/casl2_cmd/cmd_jov__o/Makefile similarity index 100% rename from test/system/casl2/cmd_jov__o/Makefile rename to test/system/casl2_cmd/cmd_jov__o/Makefile diff --git a/test/system/casl2/cmd_jov__o/cmd b/test/system/casl2_cmd/cmd_jov__o/cmd similarity index 100% rename from test/system/casl2/cmd_jov__o/cmd rename to test/system/casl2_cmd/cmd_jov__o/cmd diff --git a/test/system/casl2/cmd_jov__p/0.txt b/test/system/casl2_cmd/cmd_jov__p/0.txt similarity index 100% rename from test/system/casl2/cmd_jov__p/0.txt rename to test/system/casl2_cmd/cmd_jov__p/0.txt diff --git a/test/system/casl2/cmd_jov__p/Makefile b/test/system/casl2_cmd/cmd_jov__p/Makefile similarity index 100% rename from test/system/casl2/cmd_jov__p/Makefile rename to test/system/casl2_cmd/cmd_jov__p/Makefile diff --git a/test/system/casl2/cmd_jov__p/cmd b/test/system/casl2_cmd/cmd_jov__p/cmd similarity index 100% rename from test/system/casl2/cmd_jov__p/cmd rename to test/system/casl2_cmd/cmd_jov__p/cmd diff --git a/test/system/casl2/cmd_jov__z/0.txt b/test/system/casl2_cmd/cmd_jov__z/0.txt similarity index 100% rename from test/system/casl2/cmd_jov__z/0.txt rename to test/system/casl2_cmd/cmd_jov__z/0.txt diff --git a/test/system/casl2/cmd_jov__z/Makefile b/test/system/casl2_cmd/cmd_jov__z/Makefile similarity index 100% rename from test/system/casl2/cmd_jov__z/Makefile rename to test/system/casl2_cmd/cmd_jov__z/Makefile diff --git a/test/system/casl2/cmd_jov__z/cmd b/test/system/casl2_cmd/cmd_jov__z/cmd similarity index 100% rename from test/system/casl2/cmd_jov__z/cmd rename to test/system/casl2_cmd/cmd_jov__z/cmd diff --git a/test/system/casl2/cmd_jpl__m/0.txt b/test/system/casl2_cmd/cmd_jpl__m/0.txt similarity index 100% rename from test/system/casl2/cmd_jpl__m/0.txt rename to test/system/casl2_cmd/cmd_jpl__m/0.txt diff --git a/test/system/casl2/cmd_jpl__m/Makefile b/test/system/casl2_cmd/cmd_jpl__m/Makefile similarity index 100% rename from test/system/casl2/cmd_jpl__m/Makefile rename to test/system/casl2_cmd/cmd_jpl__m/Makefile diff --git a/test/system/casl2/cmd_jpl__m/cmd b/test/system/casl2_cmd/cmd_jpl__m/cmd similarity index 100% rename from test/system/casl2/cmd_jpl__m/cmd rename to test/system/casl2_cmd/cmd_jpl__m/cmd diff --git a/test/system/casl2/cmd_jpl__o/0.txt b/test/system/casl2_cmd/cmd_jpl__o/0.txt similarity index 100% rename from test/system/casl2/cmd_jpl__o/0.txt rename to test/system/casl2_cmd/cmd_jpl__o/0.txt diff --git a/test/system/casl2/cmd_jpl__o/Makefile b/test/system/casl2_cmd/cmd_jpl__o/Makefile similarity index 100% rename from test/system/casl2/cmd_jpl__o/Makefile rename to test/system/casl2_cmd/cmd_jpl__o/Makefile diff --git a/test/system/casl2/cmd_jpl__o/cmd b/test/system/casl2_cmd/cmd_jpl__o/cmd similarity index 100% rename from test/system/casl2/cmd_jpl__o/cmd rename to test/system/casl2_cmd/cmd_jpl__o/cmd diff --git a/test/system/casl2/cmd_jpl__p/0.txt b/test/system/casl2_cmd/cmd_jpl__p/0.txt similarity index 100% rename from test/system/casl2/cmd_jpl__p/0.txt rename to test/system/casl2_cmd/cmd_jpl__p/0.txt diff --git a/test/system/casl2/cmd_jpl__p/Makefile b/test/system/casl2_cmd/cmd_jpl__p/Makefile similarity index 100% rename from test/system/casl2/cmd_jpl__p/Makefile rename to test/system/casl2_cmd/cmd_jpl__p/Makefile diff --git a/test/system/casl2/cmd_jpl__p/cmd b/test/system/casl2_cmd/cmd_jpl__p/cmd similarity index 100% rename from test/system/casl2/cmd_jpl__p/cmd rename to test/system/casl2_cmd/cmd_jpl__p/cmd diff --git a/test/system/casl2/cmd_jpl__z/0.txt b/test/system/casl2_cmd/cmd_jpl__z/0.txt similarity index 100% rename from test/system/casl2/cmd_jpl__z/0.txt rename to test/system/casl2_cmd/cmd_jpl__z/0.txt diff --git a/test/system/casl2/cmd_jpl__z/Makefile b/test/system/casl2_cmd/cmd_jpl__z/Makefile similarity index 100% rename from test/system/casl2/cmd_jpl__z/Makefile rename to test/system/casl2_cmd/cmd_jpl__z/Makefile diff --git a/test/system/casl2/cmd_jpl__z/cmd b/test/system/casl2_cmd/cmd_jpl__z/cmd similarity index 100% rename from test/system/casl2/cmd_jpl__z/cmd rename to test/system/casl2_cmd/cmd_jpl__z/cmd diff --git a/test/system/casl2/cmd_jump__m/0.txt b/test/system/casl2_cmd/cmd_jump__m/0.txt similarity index 100% rename from test/system/casl2/cmd_jump__m/0.txt rename to test/system/casl2_cmd/cmd_jump__m/0.txt diff --git a/test/system/casl2/cmd_jump__m/Makefile b/test/system/casl2_cmd/cmd_jump__m/Makefile similarity index 100% rename from test/system/casl2/cmd_jump__m/Makefile rename to test/system/casl2_cmd/cmd_jump__m/Makefile diff --git a/test/system/casl2/cmd_jump__m/cmd b/test/system/casl2_cmd/cmd_jump__m/cmd similarity index 100% rename from test/system/casl2/cmd_jump__m/cmd rename to test/system/casl2_cmd/cmd_jump__m/cmd diff --git a/test/system/casl2/cmd_jump__o/0.txt b/test/system/casl2_cmd/cmd_jump__o/0.txt similarity index 100% rename from test/system/casl2/cmd_jump__o/0.txt rename to test/system/casl2_cmd/cmd_jump__o/0.txt diff --git a/test/system/casl2/cmd_jump__o/Makefile b/test/system/casl2_cmd/cmd_jump__o/Makefile similarity index 100% rename from test/system/casl2/cmd_jump__o/Makefile rename to test/system/casl2_cmd/cmd_jump__o/Makefile diff --git a/test/system/casl2/cmd_jump__o/cmd b/test/system/casl2_cmd/cmd_jump__o/cmd similarity index 100% rename from test/system/casl2/cmd_jump__o/cmd rename to test/system/casl2_cmd/cmd_jump__o/cmd diff --git a/test/system/casl2/cmd_jump__p/0.txt b/test/system/casl2_cmd/cmd_jump__p/0.txt similarity index 100% rename from test/system/casl2/cmd_jump__p/0.txt rename to test/system/casl2_cmd/cmd_jump__p/0.txt diff --git a/test/system/casl2/cmd_jump__p/Makefile b/test/system/casl2_cmd/cmd_jump__p/Makefile similarity index 100% rename from test/system/casl2/cmd_jump__p/Makefile rename to test/system/casl2_cmd/cmd_jump__p/Makefile diff --git a/test/system/casl2/cmd_jump__p/cmd b/test/system/casl2_cmd/cmd_jump__p/cmd similarity index 100% rename from test/system/casl2/cmd_jump__p/cmd rename to test/system/casl2_cmd/cmd_jump__p/cmd diff --git a/test/system/casl2/cmd_jump__z/0.txt b/test/system/casl2_cmd/cmd_jump__z/0.txt similarity index 100% rename from test/system/casl2/cmd_jump__z/0.txt rename to test/system/casl2_cmd/cmd_jump__z/0.txt diff --git a/test/system/casl2/cmd_jump__z/Makefile b/test/system/casl2_cmd/cmd_jump__z/Makefile similarity index 100% rename from test/system/casl2/cmd_jump__z/Makefile rename to test/system/casl2_cmd/cmd_jump__z/Makefile diff --git a/test/system/casl2/cmd_jump__z/cmd b/test/system/casl2_cmd/cmd_jump__z/cmd similarity index 100% rename from test/system/casl2/cmd_jump__z/cmd rename to test/system/casl2_cmd/cmd_jump__z/cmd diff --git a/test/system/casl2/cmd_jze__m/0.txt b/test/system/casl2_cmd/cmd_jze__m/0.txt similarity index 100% rename from test/system/casl2/cmd_jze__m/0.txt rename to test/system/casl2_cmd/cmd_jze__m/0.txt diff --git a/test/system/casl2/cmd_jze__m/Makefile b/test/system/casl2_cmd/cmd_jze__m/Makefile similarity index 100% rename from test/system/casl2/cmd_jze__m/Makefile rename to test/system/casl2_cmd/cmd_jze__m/Makefile diff --git a/test/system/casl2/cmd_jze__m/cmd b/test/system/casl2_cmd/cmd_jze__m/cmd similarity index 100% rename from test/system/casl2/cmd_jze__m/cmd rename to test/system/casl2_cmd/cmd_jze__m/cmd diff --git a/test/system/casl2/cmd_jze__o/0.txt b/test/system/casl2_cmd/cmd_jze__o/0.txt similarity index 100% rename from test/system/casl2/cmd_jze__o/0.txt rename to test/system/casl2_cmd/cmd_jze__o/0.txt diff --git a/test/system/casl2/cmd_jze__o/Makefile b/test/system/casl2_cmd/cmd_jze__o/Makefile similarity index 100% rename from test/system/casl2/cmd_jze__o/Makefile rename to test/system/casl2_cmd/cmd_jze__o/Makefile diff --git a/test/system/casl2/cmd_jze__o/cmd b/test/system/casl2_cmd/cmd_jze__o/cmd similarity index 100% rename from test/system/casl2/cmd_jze__o/cmd rename to test/system/casl2_cmd/cmd_jze__o/cmd diff --git a/test/system/casl2/cmd_jze__p/0.txt b/test/system/casl2_cmd/cmd_jze__p/0.txt similarity index 100% rename from test/system/casl2/cmd_jze__p/0.txt rename to test/system/casl2_cmd/cmd_jze__p/0.txt diff --git a/test/system/casl2/cmd_jze__p/Makefile b/test/system/casl2_cmd/cmd_jze__p/Makefile similarity index 100% rename from test/system/casl2/cmd_jze__p/Makefile rename to test/system/casl2_cmd/cmd_jze__p/Makefile diff --git a/test/system/casl2/cmd_jze__p/cmd b/test/system/casl2_cmd/cmd_jze__p/cmd similarity index 100% rename from test/system/casl2/cmd_jze__p/cmd rename to test/system/casl2_cmd/cmd_jze__p/cmd diff --git a/test/system/casl2/cmd_jze__z/0.txt b/test/system/casl2_cmd/cmd_jze__z/0.txt similarity index 100% rename from test/system/casl2/cmd_jze__z/0.txt rename to test/system/casl2_cmd/cmd_jze__z/0.txt diff --git a/test/system/casl2/cmd_jze__z/Makefile b/test/system/casl2_cmd/cmd_jze__z/Makefile similarity index 100% rename from test/system/casl2/cmd_jze__z/Makefile rename to test/system/casl2_cmd/cmd_jze__z/Makefile diff --git a/test/system/casl2/cmd_jze__z/cmd b/test/system/casl2_cmd/cmd_jze__z/cmd similarity index 100% rename from test/system/casl2/cmd_jze__z/cmd rename to test/system/casl2_cmd/cmd_jze__z/cmd diff --git a/test/system/casl2/cmd_lad_r_adr/0.txt b/test/system/casl2_cmd/cmd_lad_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_lad_r_adr/0.txt rename to test/system/casl2_cmd/cmd_lad_r_adr/0.txt diff --git a/test/system/casl2/cmd_lad_r_adr/Makefile b/test/system/casl2_cmd/cmd_lad_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_lad_r_adr/Makefile rename to test/system/casl2_cmd/cmd_lad_r_adr/Makefile diff --git a/test/system/casl2/cmd_lad_r_adr/cmd b/test/system/casl2_cmd/cmd_lad_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_lad_r_adr/cmd rename to test/system/casl2_cmd/cmd_lad_r_adr/cmd diff --git a/test/system/casl2/cmd_lad_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_lad_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_lad_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_lad_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_lad_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_lad_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_lad_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_lad_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_lad_r_adr_x/cmd b/test/system/casl2_cmd/cmd_lad_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_lad_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_lad_r_adr_x/cmd diff --git a/test/system/casl2/cmd_lad_r_adr_x__o/0.txt b/test/system/casl2_cmd/cmd_lad_r_adr_x__o/0.txt similarity index 100% rename from test/system/casl2/cmd_lad_r_adr_x__o/0.txt rename to test/system/casl2_cmd/cmd_lad_r_adr_x__o/0.txt diff --git a/test/system/casl2/cmd_lad_r_adr_x__o/Makefile b/test/system/casl2_cmd/cmd_lad_r_adr_x__o/Makefile similarity index 100% rename from test/system/casl2/cmd_lad_r_adr_x__o/Makefile rename to test/system/casl2_cmd/cmd_lad_r_adr_x__o/Makefile diff --git a/test/system/casl2/cmd_lad_r_adr_x__o/cmd b/test/system/casl2_cmd/cmd_lad_r_adr_x__o/cmd similarity index 100% rename from test/system/casl2/cmd_lad_r_adr_x__o/cmd rename to test/system/casl2_cmd/cmd_lad_r_adr_x__o/cmd diff --git a/test/system/casl2/cmd_lad_r_adr_x__s/0.txt b/test/system/casl2_cmd/cmd_lad_r_adr_x__s/0.txt similarity index 100% rename from test/system/casl2/cmd_lad_r_adr_x__s/0.txt rename to test/system/casl2_cmd/cmd_lad_r_adr_x__s/0.txt diff --git a/test/system/casl2/cmd_lad_r_adr_x__s/Makefile b/test/system/casl2_cmd/cmd_lad_r_adr_x__s/Makefile similarity index 100% rename from test/system/casl2/cmd_lad_r_adr_x__s/Makefile rename to test/system/casl2_cmd/cmd_lad_r_adr_x__s/Makefile diff --git a/test/system/casl2/cmd_lad_r_adr_x__s/cmd b/test/system/casl2_cmd/cmd_lad_r_adr_x__s/cmd similarity index 100% rename from test/system/casl2/cmd_lad_r_adr_x__s/cmd rename to test/system/casl2_cmd/cmd_lad_r_adr_x__s/cmd diff --git a/test/system/casl2/cmd_ld_r1_r2/0.txt b/test/system/casl2_cmd/cmd_ld_r1_r2/0.txt similarity index 100% rename from test/system/casl2/cmd_ld_r1_r2/0.txt rename to test/system/casl2_cmd/cmd_ld_r1_r2/0.txt diff --git a/test/system/casl2/cmd_ld_r1_r2/Makefile b/test/system/casl2_cmd/cmd_ld_r1_r2/Makefile similarity index 100% rename from test/system/casl2/cmd_ld_r1_r2/Makefile rename to test/system/casl2_cmd/cmd_ld_r1_r2/Makefile diff --git a/test/system/casl2/cmd_ld_r1_r2/cmd b/test/system/casl2_cmd/cmd_ld_r1_r2/cmd similarity index 100% rename from test/system/casl2/cmd_ld_r1_r2/cmd rename to test/system/casl2_cmd/cmd_ld_r1_r2/cmd diff --git a/test/system/casl2/cmd_ld_r_adr/0.txt b/test/system/casl2_cmd/cmd_ld_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_ld_r_adr/0.txt rename to test/system/casl2_cmd/cmd_ld_r_adr/0.txt diff --git a/test/system/casl2/cmd_ld_r_adr/Makefile b/test/system/casl2_cmd/cmd_ld_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_ld_r_adr/Makefile rename to test/system/casl2_cmd/cmd_ld_r_adr/Makefile diff --git a/test/system/casl2/cmd_ld_r_adr/cmd b/test/system/casl2_cmd/cmd_ld_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_ld_r_adr/cmd rename to test/system/casl2_cmd/cmd_ld_r_adr/cmd diff --git a/test/system/casl2/cmd_ld_r_adr__l/0.txt b/test/system/casl2_cmd/cmd_ld_r_adr__l/0.txt similarity index 100% rename from test/system/casl2/cmd_ld_r_adr__l/0.txt rename to test/system/casl2_cmd/cmd_ld_r_adr__l/0.txt diff --git a/test/system/casl2/cmd_ld_r_adr__l/Makefile b/test/system/casl2_cmd/cmd_ld_r_adr__l/Makefile similarity index 100% rename from test/system/casl2/cmd_ld_r_adr__l/Makefile rename to test/system/casl2_cmd/cmd_ld_r_adr__l/Makefile diff --git a/test/system/casl2/cmd_ld_r_adr__l/cmd b/test/system/casl2_cmd/cmd_ld_r_adr__l/cmd similarity index 100% rename from test/system/casl2/cmd_ld_r_adr__l/cmd rename to test/system/casl2_cmd/cmd_ld_r_adr__l/cmd diff --git a/test/system/casl2/cmd_ld_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_ld_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_ld_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_ld_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_ld_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_ld_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_ld_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_ld_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_ld_r_adr_x/cmd b/test/system/casl2_cmd/cmd_ld_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_ld_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_ld_r_adr_x/cmd diff --git a/test/system/casl2/cmd_nop/0.txt b/test/system/casl2_cmd/cmd_nop/0.txt similarity index 100% rename from test/system/casl2/cmd_nop/0.txt rename to test/system/casl2_cmd/cmd_nop/0.txt diff --git a/test/system/casl2/cmd_nop/Makefile b/test/system/casl2_cmd/cmd_nop/Makefile similarity index 100% rename from test/system/casl2/cmd_nop/Makefile rename to test/system/casl2_cmd/cmd_nop/Makefile diff --git a/test/system/casl2/cmd_nop/cmd b/test/system/casl2_cmd/cmd_nop/cmd similarity index 100% rename from test/system/casl2/cmd_nop/cmd rename to test/system/casl2_cmd/cmd_nop/cmd diff --git a/test/system/casl2/cmd_or_r1_r2/0.txt b/test/system/casl2_cmd/cmd_or_r1_r2/0.txt similarity index 100% rename from test/system/casl2/cmd_or_r1_r2/0.txt rename to test/system/casl2_cmd/cmd_or_r1_r2/0.txt diff --git a/test/system/casl2/cmd_or_r1_r2/Makefile b/test/system/casl2_cmd/cmd_or_r1_r2/Makefile similarity index 100% rename from test/system/casl2/cmd_or_r1_r2/Makefile rename to test/system/casl2_cmd/cmd_or_r1_r2/Makefile diff --git a/test/system/casl2/cmd_or_r1_r2/cmd b/test/system/casl2_cmd/cmd_or_r1_r2/cmd similarity index 100% rename from test/system/casl2/cmd_or_r1_r2/cmd rename to test/system/casl2_cmd/cmd_or_r1_r2/cmd diff --git a/test/system/casl2/cmd_or_r_adr/0.txt b/test/system/casl2_cmd/cmd_or_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_or_r_adr/0.txt rename to test/system/casl2_cmd/cmd_or_r_adr/0.txt diff --git a/test/system/casl2/cmd_or_r_adr/Makefile b/test/system/casl2_cmd/cmd_or_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_or_r_adr/Makefile rename to test/system/casl2_cmd/cmd_or_r_adr/Makefile diff --git a/test/system/casl2/cmd_or_r_adr/cmd b/test/system/casl2_cmd/cmd_or_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_or_r_adr/cmd rename to test/system/casl2_cmd/cmd_or_r_adr/cmd diff --git a/test/system/casl2/cmd_or_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_or_r_adr__s/0.txt similarity index 100% rename from test/system/casl2/cmd_or_r_adr__s/0.txt rename to test/system/casl2_cmd/cmd_or_r_adr__s/0.txt diff --git a/test/system/casl2/cmd_or_r_adr__s/Makefile b/test/system/casl2_cmd/cmd_or_r_adr__s/Makefile similarity index 100% rename from test/system/casl2/cmd_or_r_adr__s/Makefile rename to test/system/casl2_cmd/cmd_or_r_adr__s/Makefile diff --git a/test/system/casl2/cmd_or_r_adr__s/cmd b/test/system/casl2_cmd/cmd_or_r_adr__s/cmd similarity index 100% rename from test/system/casl2/cmd_or_r_adr__s/cmd rename to test/system/casl2_cmd/cmd_or_r_adr__s/cmd diff --git a/test/system/casl2/cmd_or_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_or_r_adr__z/0.txt similarity index 100% rename from test/system/casl2/cmd_or_r_adr__z/0.txt rename to test/system/casl2_cmd/cmd_or_r_adr__z/0.txt diff --git a/test/system/casl2/cmd_or_r_adr__z/Makefile b/test/system/casl2_cmd/cmd_or_r_adr__z/Makefile similarity index 100% rename from test/system/casl2/cmd_or_r_adr__z/Makefile rename to test/system/casl2_cmd/cmd_or_r_adr__z/Makefile diff --git a/test/system/casl2/cmd_or_r_adr__z/cmd b/test/system/casl2_cmd/cmd_or_r_adr__z/cmd similarity index 100% rename from test/system/casl2/cmd_or_r_adr__z/cmd rename to test/system/casl2_cmd/cmd_or_r_adr__z/cmd diff --git a/test/system/casl2/cmd_or_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_or_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_or_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_or_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_or_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_or_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_or_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_or_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_or_r_adr_x/cmd b/test/system/casl2_cmd/cmd_or_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_or_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_or_r_adr_x/cmd diff --git a/test/system/casl2/cmd_out/0.txt b/test/system/casl2_cmd/cmd_out/0.txt similarity index 100% rename from test/system/casl2/cmd_out/0.txt rename to test/system/casl2_cmd/cmd_out/0.txt diff --git a/test/system/casl2/cmd_out/Makefile b/test/system/casl2_cmd/cmd_out/Makefile similarity index 100% rename from test/system/casl2/cmd_out/Makefile rename to test/system/casl2_cmd/cmd_out/Makefile diff --git a/test/system/casl2/cmd_out/cmd b/test/system/casl2_cmd/cmd_out/cmd similarity index 100% rename from test/system/casl2/cmd_out/cmd rename to test/system/casl2_cmd/cmd_out/cmd diff --git a/test/system/casl2/cmd_push_pop__0/0.txt b/test/system/casl2_cmd/cmd_push_pop__0/0.txt similarity index 100% rename from test/system/casl2/cmd_push_pop__0/0.txt rename to test/system/casl2_cmd/cmd_push_pop__0/0.txt diff --git a/test/system/casl2/cmd_push_pop__0/Makefile b/test/system/casl2_cmd/cmd_push_pop__0/Makefile similarity index 100% rename from test/system/casl2/cmd_push_pop__0/Makefile rename to test/system/casl2_cmd/cmd_push_pop__0/Makefile diff --git a/test/system/casl2/cmd_push_pop__0/cmd b/test/system/casl2_cmd/cmd_push_pop__0/cmd similarity index 100% rename from test/system/casl2/cmd_push_pop__0/cmd rename to test/system/casl2_cmd/cmd_push_pop__0/cmd diff --git a/test/system/casl2/cmd_push_pop__1/0.txt b/test/system/casl2_cmd/cmd_push_pop__1/0.txt similarity index 100% rename from test/system/casl2/cmd_push_pop__1/0.txt rename to test/system/casl2_cmd/cmd_push_pop__1/0.txt diff --git a/test/system/casl2/cmd_push_pop__1/Makefile b/test/system/casl2_cmd/cmd_push_pop__1/Makefile similarity index 100% rename from test/system/casl2/cmd_push_pop__1/Makefile rename to test/system/casl2_cmd/cmd_push_pop__1/Makefile diff --git a/test/system/casl2/cmd_push_pop__1/cmd b/test/system/casl2_cmd/cmd_push_pop__1/cmd similarity index 100% rename from test/system/casl2/cmd_push_pop__1/cmd rename to test/system/casl2_cmd/cmd_push_pop__1/cmd diff --git a/test/system/casl2/cmd_rpop/0.txt b/test/system/casl2_cmd/cmd_rpop/0.txt similarity index 100% rename from test/system/casl2/cmd_rpop/0.txt rename to test/system/casl2_cmd/cmd_rpop/0.txt diff --git a/test/system/casl2/cmd_rpop/Makefile b/test/system/casl2_cmd/cmd_rpop/Makefile similarity index 100% rename from test/system/casl2/cmd_rpop/Makefile rename to test/system/casl2_cmd/cmd_rpop/Makefile diff --git a/test/system/casl2/cmd_rpop/cmd b/test/system/casl2_cmd/cmd_rpop/cmd similarity index 100% rename from test/system/casl2/cmd_rpop/cmd rename to test/system/casl2_cmd/cmd_rpop/cmd diff --git a/test/system/casl2/cmd_rpush/0.txt b/test/system/casl2_cmd/cmd_rpush/0.txt similarity index 100% rename from test/system/casl2/cmd_rpush/0.txt rename to test/system/casl2_cmd/cmd_rpush/0.txt diff --git a/test/system/casl2/cmd_rpush/Makefile b/test/system/casl2_cmd/cmd_rpush/Makefile similarity index 100% rename from test/system/casl2/cmd_rpush/Makefile rename to test/system/casl2_cmd/cmd_rpush/Makefile diff --git a/test/system/casl2/cmd_rpush/cmd b/test/system/casl2_cmd/cmd_rpush/cmd similarity index 100% rename from test/system/casl2/cmd_rpush/cmd rename to test/system/casl2_cmd/cmd_rpush/cmd diff --git a/test/system/casl2/cmd_sla/0.txt b/test/system/casl2_cmd/cmd_sla/0.txt similarity index 100% rename from test/system/casl2/cmd_sla/0.txt rename to test/system/casl2_cmd/cmd_sla/0.txt diff --git a/test/system/casl2/cmd_sla/Makefile b/test/system/casl2_cmd/cmd_sla/Makefile similarity index 100% rename from test/system/casl2/cmd_sla/Makefile rename to test/system/casl2_cmd/cmd_sla/Makefile diff --git a/test/system/casl2/cmd_sla/cmd b/test/system/casl2_cmd/cmd_sla/cmd similarity index 100% rename from test/system/casl2/cmd_sla/cmd rename to test/system/casl2_cmd/cmd_sla/cmd diff --git a/test/system/casl2/cmd_sla__o/0.txt b/test/system/casl2_cmd/cmd_sla__o/0.txt similarity index 100% rename from test/system/casl2/cmd_sla__o/0.txt rename to test/system/casl2_cmd/cmd_sla__o/0.txt diff --git a/test/system/casl2/cmd_sla__o/Makefile b/test/system/casl2_cmd/cmd_sla__o/Makefile similarity index 100% rename from test/system/casl2/cmd_sla__o/Makefile rename to test/system/casl2_cmd/cmd_sla__o/Makefile diff --git a/test/system/casl2/cmd_sla__o/cmd b/test/system/casl2_cmd/cmd_sla__o/cmd similarity index 100% rename from test/system/casl2/cmd_sla__o/cmd rename to test/system/casl2_cmd/cmd_sla__o/cmd diff --git a/test/system/casl2/cmd_sla__os/0.txt b/test/system/casl2_cmd/cmd_sla__os/0.txt similarity index 100% rename from test/system/casl2/cmd_sla__os/0.txt rename to test/system/casl2_cmd/cmd_sla__os/0.txt diff --git a/test/system/casl2/cmd_sla__os/Makefile b/test/system/casl2_cmd/cmd_sla__os/Makefile similarity index 100% rename from test/system/casl2/cmd_sla__os/Makefile rename to test/system/casl2_cmd/cmd_sla__os/Makefile diff --git a/test/system/casl2/cmd_sla__os/cmd b/test/system/casl2_cmd/cmd_sla__os/cmd similarity index 100% rename from test/system/casl2/cmd_sla__os/cmd rename to test/system/casl2_cmd/cmd_sla__os/cmd diff --git a/test/system/casl2/cmd_sla__oz/0.txt b/test/system/casl2_cmd/cmd_sla__oz/0.txt similarity index 100% rename from test/system/casl2/cmd_sla__oz/0.txt rename to test/system/casl2_cmd/cmd_sla__oz/0.txt diff --git a/test/system/casl2/cmd_sla__oz/Makefile b/test/system/casl2_cmd/cmd_sla__oz/Makefile similarity index 100% rename from test/system/casl2/cmd_sla__oz/Makefile rename to test/system/casl2_cmd/cmd_sla__oz/Makefile diff --git a/test/system/casl2/cmd_sla__oz/cmd b/test/system/casl2_cmd/cmd_sla__oz/cmd similarity index 100% rename from test/system/casl2/cmd_sla__oz/cmd rename to test/system/casl2_cmd/cmd_sla__oz/cmd diff --git a/test/system/casl2/cmd_sla__s/0.txt b/test/system/casl2_cmd/cmd_sla__s/0.txt similarity index 100% rename from test/system/casl2/cmd_sla__s/0.txt rename to test/system/casl2_cmd/cmd_sla__s/0.txt diff --git a/test/system/casl2/cmd_sla__s/Makefile b/test/system/casl2_cmd/cmd_sla__s/Makefile similarity index 100% rename from test/system/casl2/cmd_sla__s/Makefile rename to test/system/casl2_cmd/cmd_sla__s/Makefile diff --git a/test/system/casl2/cmd_sla__s/cmd b/test/system/casl2_cmd/cmd_sla__s/cmd similarity index 100% rename from test/system/casl2/cmd_sla__s/cmd rename to test/system/casl2_cmd/cmd_sla__s/cmd diff --git a/test/system/casl2/cmd_sla__z/0.txt b/test/system/casl2_cmd/cmd_sla__z/0.txt similarity index 100% rename from test/system/casl2/cmd_sla__z/0.txt rename to test/system/casl2_cmd/cmd_sla__z/0.txt diff --git a/test/system/casl2/cmd_sla__z/Makefile b/test/system/casl2_cmd/cmd_sla__z/Makefile similarity index 100% rename from test/system/casl2/cmd_sla__z/Makefile rename to test/system/casl2_cmd/cmd_sla__z/Makefile diff --git a/test/system/casl2/cmd_sla__z/cmd b/test/system/casl2_cmd/cmd_sla__z/cmd similarity index 100% rename from test/system/casl2/cmd_sla__z/cmd rename to test/system/casl2_cmd/cmd_sla__z/cmd diff --git a/test/system/casl2/cmd_sll/0.txt b/test/system/casl2_cmd/cmd_sll/0.txt similarity index 100% rename from test/system/casl2/cmd_sll/0.txt rename to test/system/casl2_cmd/cmd_sll/0.txt diff --git a/test/system/casl2/cmd_sll/Makefile b/test/system/casl2_cmd/cmd_sll/Makefile similarity index 100% rename from test/system/casl2/cmd_sll/Makefile rename to test/system/casl2_cmd/cmd_sll/Makefile diff --git a/test/system/casl2/cmd_sll/cmd b/test/system/casl2_cmd/cmd_sll/cmd similarity index 100% rename from test/system/casl2/cmd_sll/cmd rename to test/system/casl2_cmd/cmd_sll/cmd diff --git a/test/system/casl2/cmd_sll__o/0.txt b/test/system/casl2_cmd/cmd_sll__o/0.txt similarity index 100% rename from test/system/casl2/cmd_sll__o/0.txt rename to test/system/casl2_cmd/cmd_sll__o/0.txt diff --git a/test/system/casl2/cmd_sll__o/Makefile b/test/system/casl2_cmd/cmd_sll__o/Makefile similarity index 100% rename from test/system/casl2/cmd_sll__o/Makefile rename to test/system/casl2_cmd/cmd_sll__o/Makefile diff --git a/test/system/casl2/cmd_sll__o/cmd b/test/system/casl2_cmd/cmd_sll__o/cmd similarity index 100% rename from test/system/casl2/cmd_sll__o/cmd rename to test/system/casl2_cmd/cmd_sll__o/cmd diff --git a/test/system/casl2/cmd_sll__os/0.txt b/test/system/casl2_cmd/cmd_sll__os/0.txt similarity index 100% rename from test/system/casl2/cmd_sll__os/0.txt rename to test/system/casl2_cmd/cmd_sll__os/0.txt diff --git a/test/system/casl2/cmd_sll__os/Makefile b/test/system/casl2_cmd/cmd_sll__os/Makefile similarity index 100% rename from test/system/casl2/cmd_sll__os/Makefile rename to test/system/casl2_cmd/cmd_sll__os/Makefile diff --git a/test/system/casl2/cmd_sll__os/cmd b/test/system/casl2_cmd/cmd_sll__os/cmd similarity index 100% rename from test/system/casl2/cmd_sll__os/cmd rename to test/system/casl2_cmd/cmd_sll__os/cmd diff --git a/test/system/casl2/cmd_sll__oz/0.txt b/test/system/casl2_cmd/cmd_sll__oz/0.txt similarity index 100% rename from test/system/casl2/cmd_sll__oz/0.txt rename to test/system/casl2_cmd/cmd_sll__oz/0.txt diff --git a/test/system/casl2/cmd_sll__oz/Makefile b/test/system/casl2_cmd/cmd_sll__oz/Makefile similarity index 100% rename from test/system/casl2/cmd_sll__oz/Makefile rename to test/system/casl2_cmd/cmd_sll__oz/Makefile diff --git a/test/system/casl2/cmd_sll__oz/cmd b/test/system/casl2_cmd/cmd_sll__oz/cmd similarity index 100% rename from test/system/casl2/cmd_sll__oz/cmd rename to test/system/casl2_cmd/cmd_sll__oz/cmd diff --git a/test/system/casl2/cmd_sll__s/0.txt b/test/system/casl2_cmd/cmd_sll__s/0.txt similarity index 100% rename from test/system/casl2/cmd_sll__s/0.txt rename to test/system/casl2_cmd/cmd_sll__s/0.txt diff --git a/test/system/casl2/cmd_sll__s/Makefile b/test/system/casl2_cmd/cmd_sll__s/Makefile similarity index 100% rename from test/system/casl2/cmd_sll__s/Makefile rename to test/system/casl2_cmd/cmd_sll__s/Makefile diff --git a/test/system/casl2/cmd_sll__s/cmd b/test/system/casl2_cmd/cmd_sll__s/cmd similarity index 100% rename from test/system/casl2/cmd_sll__s/cmd rename to test/system/casl2_cmd/cmd_sll__s/cmd diff --git a/test/system/casl2/cmd_sll__z/0.txt b/test/system/casl2_cmd/cmd_sll__z/0.txt similarity index 100% rename from test/system/casl2/cmd_sll__z/0.txt rename to test/system/casl2_cmd/cmd_sll__z/0.txt diff --git a/test/system/casl2/cmd_sll__z/Makefile b/test/system/casl2_cmd/cmd_sll__z/Makefile similarity index 100% rename from test/system/casl2/cmd_sll__z/Makefile rename to test/system/casl2_cmd/cmd_sll__z/Makefile diff --git a/test/system/casl2/cmd_sll__z/cmd b/test/system/casl2_cmd/cmd_sll__z/cmd similarity index 100% rename from test/system/casl2/cmd_sll__z/cmd rename to test/system/casl2_cmd/cmd_sll__z/cmd diff --git a/test/system/casl2/cmd_sra/0.txt b/test/system/casl2_cmd/cmd_sra/0.txt similarity index 100% rename from test/system/casl2/cmd_sra/0.txt rename to test/system/casl2_cmd/cmd_sra/0.txt diff --git a/test/system/casl2/cmd_sra/Makefile b/test/system/casl2_cmd/cmd_sra/Makefile similarity index 100% rename from test/system/casl2/cmd_sra/Makefile rename to test/system/casl2_cmd/cmd_sra/Makefile diff --git a/test/system/casl2/cmd_sra/cmd b/test/system/casl2_cmd/cmd_sra/cmd similarity index 100% rename from test/system/casl2/cmd_sra/cmd rename to test/system/casl2_cmd/cmd_sra/cmd diff --git a/test/system/casl2/cmd_sra__o/0.txt b/test/system/casl2_cmd/cmd_sra__o/0.txt similarity index 100% rename from test/system/casl2/cmd_sra__o/0.txt rename to test/system/casl2_cmd/cmd_sra__o/0.txt diff --git a/test/system/casl2/cmd_sra__o/Makefile b/test/system/casl2_cmd/cmd_sra__o/Makefile similarity index 100% rename from test/system/casl2/cmd_sra__o/Makefile rename to test/system/casl2_cmd/cmd_sra__o/Makefile diff --git a/test/system/casl2/cmd_sra__o/cmd b/test/system/casl2_cmd/cmd_sra__o/cmd similarity index 100% rename from test/system/casl2/cmd_sra__o/cmd rename to test/system/casl2_cmd/cmd_sra__o/cmd diff --git a/test/system/casl2/cmd_sra__os/0.txt b/test/system/casl2_cmd/cmd_sra__os/0.txt similarity index 100% rename from test/system/casl2/cmd_sra__os/0.txt rename to test/system/casl2_cmd/cmd_sra__os/0.txt diff --git a/test/system/casl2/cmd_sra__os/Makefile b/test/system/casl2_cmd/cmd_sra__os/Makefile similarity index 100% rename from test/system/casl2/cmd_sra__os/Makefile rename to test/system/casl2_cmd/cmd_sra__os/Makefile diff --git a/test/system/casl2/cmd_sra__os/cmd b/test/system/casl2_cmd/cmd_sra__os/cmd similarity index 100% rename from test/system/casl2/cmd_sra__os/cmd rename to test/system/casl2_cmd/cmd_sra__os/cmd diff --git a/test/system/casl2/cmd_sra__oz/0.txt b/test/system/casl2_cmd/cmd_sra__oz/0.txt similarity index 100% rename from test/system/casl2/cmd_sra__oz/0.txt rename to test/system/casl2_cmd/cmd_sra__oz/0.txt diff --git a/test/system/casl2/cmd_sra__oz/Makefile b/test/system/casl2_cmd/cmd_sra__oz/Makefile similarity index 100% rename from test/system/casl2/cmd_sra__oz/Makefile rename to test/system/casl2_cmd/cmd_sra__oz/Makefile diff --git a/test/system/casl2/cmd_sra__oz/cmd b/test/system/casl2_cmd/cmd_sra__oz/cmd similarity index 100% rename from test/system/casl2/cmd_sra__oz/cmd rename to test/system/casl2_cmd/cmd_sra__oz/cmd diff --git a/test/system/casl2/cmd_sra__s/0.txt b/test/system/casl2_cmd/cmd_sra__s/0.txt similarity index 100% rename from test/system/casl2/cmd_sra__s/0.txt rename to test/system/casl2_cmd/cmd_sra__s/0.txt diff --git a/test/system/casl2/cmd_sra__s/Makefile b/test/system/casl2_cmd/cmd_sra__s/Makefile similarity index 100% rename from test/system/casl2/cmd_sra__s/Makefile rename to test/system/casl2_cmd/cmd_sra__s/Makefile diff --git a/test/system/casl2/cmd_sra__s/cmd b/test/system/casl2_cmd/cmd_sra__s/cmd similarity index 100% rename from test/system/casl2/cmd_sra__s/cmd rename to test/system/casl2_cmd/cmd_sra__s/cmd diff --git a/test/system/casl2/cmd_sra__z/0.txt b/test/system/casl2_cmd/cmd_sra__z/0.txt similarity index 100% rename from test/system/casl2/cmd_sra__z/0.txt rename to test/system/casl2_cmd/cmd_sra__z/0.txt diff --git a/test/system/casl2/cmd_sra__z/Makefile b/test/system/casl2_cmd/cmd_sra__z/Makefile similarity index 100% rename from test/system/casl2/cmd_sra__z/Makefile rename to test/system/casl2_cmd/cmd_sra__z/Makefile diff --git a/test/system/casl2/cmd_sra__z/cmd b/test/system/casl2_cmd/cmd_sra__z/cmd similarity index 100% rename from test/system/casl2/cmd_sra__z/cmd rename to test/system/casl2_cmd/cmd_sra__z/cmd diff --git a/test/system/casl2/cmd_srl/0.txt b/test/system/casl2_cmd/cmd_srl/0.txt similarity index 100% rename from test/system/casl2/cmd_srl/0.txt rename to test/system/casl2_cmd/cmd_srl/0.txt diff --git a/test/system/casl2/cmd_srl/Makefile b/test/system/casl2_cmd/cmd_srl/Makefile similarity index 100% rename from test/system/casl2/cmd_srl/Makefile rename to test/system/casl2_cmd/cmd_srl/Makefile diff --git a/test/system/casl2/cmd_srl/cmd b/test/system/casl2_cmd/cmd_srl/cmd similarity index 100% rename from test/system/casl2/cmd_srl/cmd rename to test/system/casl2_cmd/cmd_srl/cmd diff --git a/test/system/casl2/cmd_srl__o/0.txt b/test/system/casl2_cmd/cmd_srl__o/0.txt similarity index 100% rename from test/system/casl2/cmd_srl__o/0.txt rename to test/system/casl2_cmd/cmd_srl__o/0.txt diff --git a/test/system/casl2/cmd_srl__o/Makefile b/test/system/casl2_cmd/cmd_srl__o/Makefile similarity index 100% rename from test/system/casl2/cmd_srl__o/Makefile rename to test/system/casl2_cmd/cmd_srl__o/Makefile diff --git a/test/system/casl2/cmd_srl__o/cmd b/test/system/casl2_cmd/cmd_srl__o/cmd similarity index 100% rename from test/system/casl2/cmd_srl__o/cmd rename to test/system/casl2_cmd/cmd_srl__o/cmd diff --git a/test/system/casl2/cmd_srl__oz/0.txt b/test/system/casl2_cmd/cmd_srl__oz/0.txt similarity index 100% rename from test/system/casl2/cmd_srl__oz/0.txt rename to test/system/casl2_cmd/cmd_srl__oz/0.txt diff --git a/test/system/casl2/cmd_srl__oz/Makefile b/test/system/casl2_cmd/cmd_srl__oz/Makefile similarity index 100% rename from test/system/casl2/cmd_srl__oz/Makefile rename to test/system/casl2_cmd/cmd_srl__oz/Makefile diff --git a/test/system/casl2/cmd_srl__oz/cmd b/test/system/casl2_cmd/cmd_srl__oz/cmd similarity index 100% rename from test/system/casl2/cmd_srl__oz/cmd rename to test/system/casl2_cmd/cmd_srl__oz/cmd diff --git a/test/system/casl2/cmd_srl__s/0.txt b/test/system/casl2_cmd/cmd_srl__s/0.txt similarity index 100% rename from test/system/casl2/cmd_srl__s/0.txt rename to test/system/casl2_cmd/cmd_srl__s/0.txt diff --git a/test/system/casl2/cmd_srl__s/Makefile b/test/system/casl2_cmd/cmd_srl__s/Makefile similarity index 100% rename from test/system/casl2/cmd_srl__s/Makefile rename to test/system/casl2_cmd/cmd_srl__s/Makefile diff --git a/test/system/casl2/cmd_srl__s/cmd b/test/system/casl2_cmd/cmd_srl__s/cmd similarity index 100% rename from test/system/casl2/cmd_srl__s/cmd rename to test/system/casl2_cmd/cmd_srl__s/cmd diff --git a/test/system/casl2/cmd_srl__z/0.txt b/test/system/casl2_cmd/cmd_srl__z/0.txt similarity index 100% rename from test/system/casl2/cmd_srl__z/0.txt rename to test/system/casl2_cmd/cmd_srl__z/0.txt diff --git a/test/system/casl2/cmd_srl__z/Makefile b/test/system/casl2_cmd/cmd_srl__z/Makefile similarity index 100% rename from test/system/casl2/cmd_srl__z/Makefile rename to test/system/casl2_cmd/cmd_srl__z/Makefile diff --git a/test/system/casl2/cmd_srl__z/cmd b/test/system/casl2_cmd/cmd_srl__z/cmd similarity index 100% rename from test/system/casl2/cmd_srl__z/cmd rename to test/system/casl2_cmd/cmd_srl__z/cmd diff --git a/test/system/casl2/cmd_st_r_adr/0.txt b/test/system/casl2_cmd/cmd_st_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_st_r_adr/0.txt rename to test/system/casl2_cmd/cmd_st_r_adr/0.txt diff --git a/test/system/casl2/cmd_st_r_adr/Makefile b/test/system/casl2_cmd/cmd_st_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_st_r_adr/Makefile rename to test/system/casl2_cmd/cmd_st_r_adr/Makefile diff --git a/test/system/casl2/cmd_st_r_adr/cmd b/test/system/casl2_cmd/cmd_st_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_st_r_adr/cmd rename to test/system/casl2_cmd/cmd_st_r_adr/cmd diff --git a/test/system/casl2/cmd_st_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_st_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_st_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_st_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_st_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_st_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_st_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_st_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_st_r_adr_x/cmd b/test/system/casl2_cmd/cmd_st_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_st_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_st_r_adr_x/cmd diff --git a/test/system/casl2/cmd_suba_r1_r2/0.txt b/test/system/casl2_cmd/cmd_suba_r1_r2/0.txt similarity index 100% rename from test/system/casl2/cmd_suba_r1_r2/0.txt rename to test/system/casl2_cmd/cmd_suba_r1_r2/0.txt diff --git a/test/system/casl2/cmd_suba_r1_r2/Makefile b/test/system/casl2_cmd/cmd_suba_r1_r2/Makefile similarity index 100% rename from test/system/casl2/cmd_suba_r1_r2/Makefile rename to test/system/casl2_cmd/cmd_suba_r1_r2/Makefile diff --git a/test/system/casl2/cmd_suba_r1_r2/cmd b/test/system/casl2_cmd/cmd_suba_r1_r2/cmd similarity index 100% rename from test/system/casl2/cmd_suba_r1_r2/cmd rename to test/system/casl2_cmd/cmd_suba_r1_r2/cmd diff --git a/test/system/casl2/cmd_suba_r_adr/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_suba_r_adr/0.txt rename to test/system/casl2_cmd/cmd_suba_r_adr/0.txt diff --git a/test/system/casl2/cmd_suba_r_adr/Makefile b/test/system/casl2_cmd/cmd_suba_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_suba_r_adr/Makefile rename to test/system/casl2_cmd/cmd_suba_r_adr/Makefile diff --git a/test/system/casl2/cmd_suba_r_adr/cmd b/test/system/casl2_cmd/cmd_suba_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_suba_r_adr/cmd rename to test/system/casl2_cmd/cmd_suba_r_adr/cmd diff --git a/test/system/casl2/cmd_suba_r_adr__ao/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__ao/0.txt similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__ao/0.txt rename to test/system/casl2_cmd/cmd_suba_r_adr__ao/0.txt diff --git a/test/system/casl2/cmd_suba_r_adr__ao/Makefile b/test/system/casl2_cmd/cmd_suba_r_adr__ao/Makefile similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__ao/Makefile rename to test/system/casl2_cmd/cmd_suba_r_adr__ao/Makefile diff --git a/test/system/casl2/cmd_suba_r_adr__ao/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__ao/cmd similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__ao/cmd rename to test/system/casl2_cmd/cmd_suba_r_adr__ao/cmd diff --git a/test/system/casl2/cmd_suba_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__as0/0.txt similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__as0/0.txt rename to test/system/casl2_cmd/cmd_suba_r_adr__as0/0.txt diff --git a/test/system/casl2/cmd_suba_r_adr__as0/Makefile b/test/system/casl2_cmd/cmd_suba_r_adr__as0/Makefile similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__as0/Makefile rename to test/system/casl2_cmd/cmd_suba_r_adr__as0/Makefile diff --git a/test/system/casl2/cmd_suba_r_adr__as0/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__as0/cmd similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__as0/cmd rename to test/system/casl2_cmd/cmd_suba_r_adr__as0/cmd diff --git a/test/system/casl2/cmd_suba_r_adr__as1/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__as1/0.txt similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__as1/0.txt rename to test/system/casl2_cmd/cmd_suba_r_adr__as1/0.txt diff --git a/test/system/casl2/cmd_suba_r_adr__as1/Makefile b/test/system/casl2_cmd/cmd_suba_r_adr__as1/Makefile similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__as1/Makefile rename to test/system/casl2_cmd/cmd_suba_r_adr__as1/Makefile diff --git a/test/system/casl2/cmd_suba_r_adr__as1/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__as1/cmd similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__as1/cmd rename to test/system/casl2_cmd/cmd_suba_r_adr__as1/cmd diff --git a/test/system/casl2/cmd_suba_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__lo/0.txt similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__lo/0.txt rename to test/system/casl2_cmd/cmd_suba_r_adr__lo/0.txt diff --git a/test/system/casl2/cmd_suba_r_adr__lo/Makefile b/test/system/casl2_cmd/cmd_suba_r_adr__lo/Makefile similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__lo/Makefile rename to test/system/casl2_cmd/cmd_suba_r_adr__lo/Makefile diff --git a/test/system/casl2/cmd_suba_r_adr__lo/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__lo/cmd similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__lo/cmd rename to test/system/casl2_cmd/cmd_suba_r_adr__lo/cmd diff --git a/test/system/casl2/cmd_suba_r_adr__o/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__o/0.txt similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__o/0.txt rename to test/system/casl2_cmd/cmd_suba_r_adr__o/0.txt diff --git a/test/system/casl2/cmd_suba_r_adr__o/Makefile b/test/system/casl2_cmd/cmd_suba_r_adr__o/Makefile similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__o/Makefile rename to test/system/casl2_cmd/cmd_suba_r_adr__o/Makefile diff --git a/test/system/casl2/cmd_suba_r_adr__o/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__o/cmd similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__o/cmd rename to test/system/casl2_cmd/cmd_suba_r_adr__o/cmd diff --git a/test/system/casl2/cmd_suba_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr__z/0.txt similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__z/0.txt rename to test/system/casl2_cmd/cmd_suba_r_adr__z/0.txt diff --git a/test/system/casl2/cmd_suba_r_adr__z/Makefile b/test/system/casl2_cmd/cmd_suba_r_adr__z/Makefile similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__z/Makefile rename to test/system/casl2_cmd/cmd_suba_r_adr__z/Makefile diff --git a/test/system/casl2/cmd_suba_r_adr__z/cmd b/test/system/casl2_cmd/cmd_suba_r_adr__z/cmd similarity index 100% rename from test/system/casl2/cmd_suba_r_adr__z/cmd rename to test/system/casl2_cmd/cmd_suba_r_adr__z/cmd diff --git a/test/system/casl2/cmd_suba_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_suba_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_suba_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_suba_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_suba_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_suba_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_suba_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_suba_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_suba_r_adr_x/cmd b/test/system/casl2_cmd/cmd_suba_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_suba_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_suba_r_adr_x/cmd diff --git a/test/system/casl2/cmd_subl_r1_r2/0.txt b/test/system/casl2_cmd/cmd_subl_r1_r2/0.txt similarity index 100% rename from test/system/casl2/cmd_subl_r1_r2/0.txt rename to test/system/casl2_cmd/cmd_subl_r1_r2/0.txt diff --git a/test/system/casl2/cmd_subl_r1_r2/Makefile b/test/system/casl2_cmd/cmd_subl_r1_r2/Makefile similarity index 100% rename from test/system/casl2/cmd_subl_r1_r2/Makefile rename to test/system/casl2_cmd/cmd_subl_r1_r2/Makefile diff --git a/test/system/casl2/cmd_subl_r1_r2/cmd b/test/system/casl2_cmd/cmd_subl_r1_r2/cmd similarity index 100% rename from test/system/casl2/cmd_subl_r1_r2/cmd rename to test/system/casl2_cmd/cmd_subl_r1_r2/cmd diff --git a/test/system/casl2/cmd_subl_r_adr/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_subl_r_adr/0.txt rename to test/system/casl2_cmd/cmd_subl_r_adr/0.txt diff --git a/test/system/casl2/cmd_subl_r_adr/Makefile b/test/system/casl2_cmd/cmd_subl_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_subl_r_adr/Makefile rename to test/system/casl2_cmd/cmd_subl_r_adr/Makefile diff --git a/test/system/casl2/cmd_subl_r_adr/cmd b/test/system/casl2_cmd/cmd_subl_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_subl_r_adr/cmd rename to test/system/casl2_cmd/cmd_subl_r_adr/cmd diff --git a/test/system/casl2/cmd_subl_r_adr__ao/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__ao/0.txt similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__ao/0.txt rename to test/system/casl2_cmd/cmd_subl_r_adr__ao/0.txt diff --git a/test/system/casl2/cmd_subl_r_adr__ao/Makefile b/test/system/casl2_cmd/cmd_subl_r_adr__ao/Makefile similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__ao/Makefile rename to test/system/casl2_cmd/cmd_subl_r_adr__ao/Makefile diff --git a/test/system/casl2/cmd_subl_r_adr__ao/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__ao/cmd similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__ao/cmd rename to test/system/casl2_cmd/cmd_subl_r_adr__ao/cmd diff --git a/test/system/casl2/cmd_subl_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__as0/0.txt similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__as0/0.txt rename to test/system/casl2_cmd/cmd_subl_r_adr__as0/0.txt diff --git a/test/system/casl2/cmd_subl_r_adr__as0/Makefile b/test/system/casl2_cmd/cmd_subl_r_adr__as0/Makefile similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__as0/Makefile rename to test/system/casl2_cmd/cmd_subl_r_adr__as0/Makefile diff --git a/test/system/casl2/cmd_subl_r_adr__as0/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__as0/cmd similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__as0/cmd rename to test/system/casl2_cmd/cmd_subl_r_adr__as0/cmd diff --git a/test/system/casl2/cmd_subl_r_adr__as1/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__as1/0.txt similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__as1/0.txt rename to test/system/casl2_cmd/cmd_subl_r_adr__as1/0.txt diff --git a/test/system/casl2/cmd_subl_r_adr__as1/Makefile b/test/system/casl2_cmd/cmd_subl_r_adr__as1/Makefile similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__as1/Makefile rename to test/system/casl2_cmd/cmd_subl_r_adr__as1/Makefile diff --git a/test/system/casl2/cmd_subl_r_adr__as1/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__as1/cmd similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__as1/cmd rename to test/system/casl2_cmd/cmd_subl_r_adr__as1/cmd diff --git a/test/system/casl2/cmd_subl_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__lo/0.txt similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__lo/0.txt rename to test/system/casl2_cmd/cmd_subl_r_adr__lo/0.txt diff --git a/test/system/casl2/cmd_subl_r_adr__lo/Makefile b/test/system/casl2_cmd/cmd_subl_r_adr__lo/Makefile similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__lo/Makefile rename to test/system/casl2_cmd/cmd_subl_r_adr__lo/Makefile diff --git a/test/system/casl2/cmd_subl_r_adr__lo/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__lo/cmd similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__lo/cmd rename to test/system/casl2_cmd/cmd_subl_r_adr__lo/cmd diff --git a/test/system/casl2/cmd_subl_r_adr__o/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__o/0.txt similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__o/0.txt rename to test/system/casl2_cmd/cmd_subl_r_adr__o/0.txt diff --git a/test/system/casl2/cmd_subl_r_adr__o/Makefile b/test/system/casl2_cmd/cmd_subl_r_adr__o/Makefile similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__o/Makefile rename to test/system/casl2_cmd/cmd_subl_r_adr__o/Makefile diff --git a/test/system/casl2/cmd_subl_r_adr__o/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__o/cmd similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__o/cmd rename to test/system/casl2_cmd/cmd_subl_r_adr__o/cmd diff --git a/test/system/casl2/cmd_subl_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr__z/0.txt similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__z/0.txt rename to test/system/casl2_cmd/cmd_subl_r_adr__z/0.txt diff --git a/test/system/casl2/cmd_subl_r_adr__z/Makefile b/test/system/casl2_cmd/cmd_subl_r_adr__z/Makefile similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__z/Makefile rename to test/system/casl2_cmd/cmd_subl_r_adr__z/Makefile diff --git a/test/system/casl2/cmd_subl_r_adr__z/cmd b/test/system/casl2_cmd/cmd_subl_r_adr__z/cmd similarity index 100% rename from test/system/casl2/cmd_subl_r_adr__z/cmd rename to test/system/casl2_cmd/cmd_subl_r_adr__z/cmd diff --git a/test/system/casl2/cmd_subl_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_subl_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_subl_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_subl_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_subl_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_subl_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_subl_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_subl_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_subl_r_adr_x/cmd b/test/system/casl2_cmd/cmd_subl_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_subl_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_subl_r_adr_x/cmd diff --git a/test/system/casl2/cmd_svc__1/0.txt b/test/system/casl2_cmd/cmd_svc__1/0.txt similarity index 100% rename from test/system/casl2/cmd_svc__1/0.txt rename to test/system/casl2_cmd/cmd_svc__1/0.txt diff --git a/test/system/casl2/cmd_svc__1/Makefile b/test/system/casl2_cmd/cmd_svc__1/Makefile similarity index 100% rename from test/system/casl2/cmd_svc__1/Makefile rename to test/system/casl2_cmd/cmd_svc__1/Makefile diff --git a/test/system/casl2/cmd_svc__1/cmd b/test/system/casl2_cmd/cmd_svc__1/cmd similarity index 100% rename from test/system/casl2/cmd_svc__1/cmd rename to test/system/casl2_cmd/cmd_svc__1/cmd diff --git a/test/system/casl2/cmd_svc__1/teststr.txt b/test/system/casl2_cmd/cmd_svc__1/teststr.txt similarity index 100% rename from test/system/casl2/cmd_svc__1/teststr.txt rename to test/system/casl2_cmd/cmd_svc__1/teststr.txt diff --git a/test/system/casl2/cmd_svc__2/0.txt b/test/system/casl2_cmd/cmd_svc__2/0.txt similarity index 100% rename from test/system/casl2/cmd_svc__2/0.txt rename to test/system/casl2_cmd/cmd_svc__2/0.txt diff --git a/test/system/casl2/cmd_svc__2/Makefile b/test/system/casl2_cmd/cmd_svc__2/Makefile similarity index 100% rename from test/system/casl2/cmd_svc__2/Makefile rename to test/system/casl2_cmd/cmd_svc__2/Makefile diff --git a/test/system/casl2/cmd_svc__2/cmd b/test/system/casl2_cmd/cmd_svc__2/cmd similarity index 100% rename from test/system/casl2/cmd_svc__2/cmd rename to test/system/casl2_cmd/cmd_svc__2/cmd diff --git a/test/system/casl2/cmd_xor_r1_r2/0.txt b/test/system/casl2_cmd/cmd_xor_r1_r2/0.txt similarity index 100% rename from test/system/casl2/cmd_xor_r1_r2/0.txt rename to test/system/casl2_cmd/cmd_xor_r1_r2/0.txt diff --git a/test/system/casl2/cmd_xor_r1_r2/Makefile b/test/system/casl2_cmd/cmd_xor_r1_r2/Makefile similarity index 100% rename from test/system/casl2/cmd_xor_r1_r2/Makefile rename to test/system/casl2_cmd/cmd_xor_r1_r2/Makefile diff --git a/test/system/casl2/cmd_xor_r1_r2/cmd b/test/system/casl2_cmd/cmd_xor_r1_r2/cmd similarity index 100% rename from test/system/casl2/cmd_xor_r1_r2/cmd rename to test/system/casl2_cmd/cmd_xor_r1_r2/cmd diff --git a/test/system/casl2/cmd_xor_r1_r2__clear/0.txt b/test/system/casl2_cmd/cmd_xor_r1_r2__clear/0.txt similarity index 100% rename from test/system/casl2/cmd_xor_r1_r2__clear/0.txt rename to test/system/casl2_cmd/cmd_xor_r1_r2__clear/0.txt diff --git a/test/system/casl2/cmd_xor_r1_r2__clear/Makefile b/test/system/casl2_cmd/cmd_xor_r1_r2__clear/Makefile similarity index 100% rename from test/system/casl2/cmd_xor_r1_r2__clear/Makefile rename to test/system/casl2_cmd/cmd_xor_r1_r2__clear/Makefile diff --git a/test/system/casl2/cmd_xor_r1_r2__clear/cmd b/test/system/casl2_cmd/cmd_xor_r1_r2__clear/cmd similarity index 100% rename from test/system/casl2/cmd_xor_r1_r2__clear/cmd rename to test/system/casl2_cmd/cmd_xor_r1_r2__clear/cmd diff --git a/test/system/casl2/cmd_xor_r_adr/0.txt b/test/system/casl2_cmd/cmd_xor_r_adr/0.txt similarity index 100% rename from test/system/casl2/cmd_xor_r_adr/0.txt rename to test/system/casl2_cmd/cmd_xor_r_adr/0.txt diff --git a/test/system/casl2/cmd_xor_r_adr/Makefile b/test/system/casl2_cmd/cmd_xor_r_adr/Makefile similarity index 100% rename from test/system/casl2/cmd_xor_r_adr/Makefile rename to test/system/casl2_cmd/cmd_xor_r_adr/Makefile diff --git a/test/system/casl2/cmd_xor_r_adr/cmd b/test/system/casl2_cmd/cmd_xor_r_adr/cmd similarity index 100% rename from test/system/casl2/cmd_xor_r_adr/cmd rename to test/system/casl2_cmd/cmd_xor_r_adr/cmd diff --git a/test/system/casl2/cmd_xor_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_xor_r_adr__s/0.txt similarity index 100% rename from test/system/casl2/cmd_xor_r_adr__s/0.txt rename to test/system/casl2_cmd/cmd_xor_r_adr__s/0.txt diff --git a/test/system/casl2/cmd_xor_r_adr__s/Makefile b/test/system/casl2_cmd/cmd_xor_r_adr__s/Makefile similarity index 100% rename from test/system/casl2/cmd_xor_r_adr__s/Makefile rename to test/system/casl2_cmd/cmd_xor_r_adr__s/Makefile diff --git a/test/system/casl2/cmd_xor_r_adr__s/cmd b/test/system/casl2_cmd/cmd_xor_r_adr__s/cmd similarity index 100% rename from test/system/casl2/cmd_xor_r_adr__s/cmd rename to test/system/casl2_cmd/cmd_xor_r_adr__s/cmd diff --git a/test/system/casl2/cmd_xor_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_xor_r_adr__z/0.txt similarity index 100% rename from test/system/casl2/cmd_xor_r_adr__z/0.txt rename to test/system/casl2_cmd/cmd_xor_r_adr__z/0.txt diff --git a/test/system/casl2/cmd_xor_r_adr__z/Makefile b/test/system/casl2_cmd/cmd_xor_r_adr__z/Makefile similarity index 100% rename from test/system/casl2/cmd_xor_r_adr__z/Makefile rename to test/system/casl2_cmd/cmd_xor_r_adr__z/Makefile diff --git a/test/system/casl2/cmd_xor_r_adr__z/cmd b/test/system/casl2_cmd/cmd_xor_r_adr__z/cmd similarity index 100% rename from test/system/casl2/cmd_xor_r_adr__z/cmd rename to test/system/casl2_cmd/cmd_xor_r_adr__z/cmd diff --git a/test/system/casl2/cmd_xor_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_xor_r_adr_x/0.txt similarity index 100% rename from test/system/casl2/cmd_xor_r_adr_x/0.txt rename to test/system/casl2_cmd/cmd_xor_r_adr_x/0.txt diff --git a/test/system/casl2/cmd_xor_r_adr_x/Makefile b/test/system/casl2_cmd/cmd_xor_r_adr_x/Makefile similarity index 100% rename from test/system/casl2/cmd_xor_r_adr_x/Makefile rename to test/system/casl2_cmd/cmd_xor_r_adr_x/Makefile diff --git a/test/system/casl2/cmd_xor_r_adr_x/cmd b/test/system/casl2_cmd/cmd_xor_r_adr_x/cmd similarity index 100% rename from test/system/casl2/cmd_xor_r_adr_x/cmd rename to test/system/casl2_cmd/cmd_xor_r_adr_x/cmd diff --git a/test/system/comet2/Define.mk b/test/system/casl2_err/Define.mk similarity index 100% rename from test/system/comet2/Define.mk rename to test/system/casl2_err/Define.mk diff --git a/test/system/comet2/Makefile b/test/system/casl2_err/Makefile similarity index 100% rename from test/system/comet2/Makefile rename to test/system/casl2_err/Makefile diff --git a/test/system/comet2/Test.mk b/test/system/casl2_err/Test.mk similarity index 100% rename from test/system/comet2/Test.mk rename to test/system/casl2_err/Test.mk diff --git a/test/system/casl2/err_101/0.txt b/test/system/casl2_err/err_101/0.txt similarity index 100% rename from test/system/casl2/err_101/0.txt rename to test/system/casl2_err/err_101/0.txt diff --git a/test/system/casl2/err_101/Makefile b/test/system/casl2_err/err_101/Makefile similarity index 100% rename from test/system/casl2/err_101/Makefile rename to test/system/casl2_err/err_101/Makefile diff --git a/test/system/casl2/err_101/cmd b/test/system/casl2_err/err_101/cmd similarity index 100% rename from test/system/casl2/err_101/cmd rename to test/system/casl2_err/err_101/cmd diff --git a/test/system/casl2/err_103/0.txt b/test/system/casl2_err/err_103/0.txt similarity index 100% rename from test/system/casl2/err_103/0.txt rename to test/system/casl2_err/err_103/0.txt diff --git a/test/system/casl2/err_103/Makefile b/test/system/casl2_err/err_103/Makefile similarity index 100% rename from test/system/casl2/err_103/Makefile rename to test/system/casl2_err/err_103/Makefile diff --git a/test/system/casl2/err_103/cmd b/test/system/casl2_err/err_103/cmd similarity index 100% rename from test/system/casl2/err_103/cmd rename to test/system/casl2_err/err_103/cmd diff --git a/test/system/casl2/err_104/0.txt b/test/system/casl2_err/err_104/0.txt similarity index 100% rename from test/system/casl2/err_104/0.txt rename to test/system/casl2_err/err_104/0.txt diff --git a/test/system/casl2/err_104/Makefile b/test/system/casl2_err/err_104/Makefile similarity index 100% rename from test/system/casl2/err_104/Makefile rename to test/system/casl2_err/err_104/Makefile diff --git a/test/system/casl2/err_104/cmd b/test/system/casl2_err/err_104/cmd similarity index 100% rename from test/system/casl2/err_104/cmd rename to test/system/casl2_err/err_104/cmd diff --git a/test/system/casl2/err_105/0.txt b/test/system/casl2_err/err_105/0.txt similarity index 100% rename from test/system/casl2/err_105/0.txt rename to test/system/casl2_err/err_105/0.txt diff --git a/test/system/casl2/err_105/Makefile b/test/system/casl2_err/err_105/Makefile similarity index 100% rename from test/system/casl2/err_105/Makefile rename to test/system/casl2_err/err_105/Makefile diff --git a/test/system/casl2/err_105/cmd b/test/system/casl2_err/err_105/cmd similarity index 100% rename from test/system/casl2/err_105/cmd rename to test/system/casl2_err/err_105/cmd diff --git a/test/system/casl2/err_106_DC/0.txt b/test/system/casl2_err/err_106_DC/0.txt similarity index 100% rename from test/system/casl2/err_106_DC/0.txt rename to test/system/casl2_err/err_106_DC/0.txt diff --git a/test/system/casl2/err_106_DC/Makefile b/test/system/casl2_err/err_106_DC/Makefile similarity index 100% rename from test/system/casl2/err_106_DC/Makefile rename to test/system/casl2_err/err_106_DC/Makefile diff --git a/test/system/casl2/err_106_DC/cmd b/test/system/casl2_err/err_106_DC/cmd similarity index 100% rename from test/system/casl2/err_106_DC/cmd rename to test/system/casl2_err/err_106_DC/cmd diff --git a/test/system/casl2/err_106_DS/0.txt b/test/system/casl2_err/err_106_DS/0.txt similarity index 100% rename from test/system/casl2/err_106_DS/0.txt rename to test/system/casl2_err/err_106_DS/0.txt diff --git a/test/system/casl2/err_106_DS/Makefile b/test/system/casl2_err/err_106_DS/Makefile similarity index 100% rename from test/system/casl2/err_106_DS/Makefile rename to test/system/casl2_err/err_106_DS/Makefile diff --git a/test/system/casl2/err_106_DS/cmd b/test/system/casl2_err/err_106_DS/cmd similarity index 100% rename from test/system/casl2/err_106_DS/cmd rename to test/system/casl2_err/err_106_DS/cmd diff --git a/test/system/casl2/err_107/0.txt b/test/system/casl2_err/err_107/0.txt similarity index 100% rename from test/system/casl2/err_107/0.txt rename to test/system/casl2_err/err_107/0.txt diff --git a/test/system/casl2/err_107/Makefile b/test/system/casl2_err/err_107/Makefile similarity index 100% rename from test/system/casl2/err_107/Makefile rename to test/system/casl2_err/err_107/Makefile diff --git a/test/system/casl2/err_107/cmd b/test/system/casl2_err/err_107/cmd similarity index 100% rename from test/system/casl2/err_107/cmd rename to test/system/casl2_err/err_107/cmd diff --git a/test/system/casl2/err_108/0.txt b/test/system/casl2_err/err_108/0.txt similarity index 100% rename from test/system/casl2/err_108/0.txt rename to test/system/casl2_err/err_108/0.txt diff --git a/test/system/casl2/err_108/Makefile b/test/system/casl2_err/err_108/Makefile similarity index 100% rename from test/system/casl2/err_108/Makefile rename to test/system/casl2_err/err_108/Makefile diff --git a/test/system/casl2/err_108/cmd b/test/system/casl2_err/err_108/cmd similarity index 100% rename from test/system/casl2/err_108/cmd rename to test/system/casl2_err/err_108/cmd diff --git a/test/system/casl2/err_109/0.txt b/test/system/casl2_err/err_109/0.txt similarity index 100% rename from test/system/casl2/err_109/0.txt rename to test/system/casl2_err/err_109/0.txt diff --git a/test/system/casl2/err_109/Makefile b/test/system/casl2_err/err_109/Makefile similarity index 100% rename from test/system/casl2/err_109/Makefile rename to test/system/casl2_err/err_109/Makefile diff --git a/test/system/casl2/err_109/cmd b/test/system/casl2_err/err_109/cmd similarity index 100% rename from test/system/casl2/err_109/cmd rename to test/system/casl2_err/err_109/cmd diff --git a/test/system/casl2/err_110/0.txt b/test/system/casl2_err/err_110/0.txt similarity index 100% rename from test/system/casl2/err_110/0.txt rename to test/system/casl2_err/err_110/0.txt diff --git a/test/system/casl2/err_110/Makefile b/test/system/casl2_err/err_110/Makefile similarity index 100% rename from test/system/casl2/err_110/Makefile rename to test/system/casl2_err/err_110/Makefile diff --git a/test/system/casl2/err_110/cmd b/test/system/casl2_err/err_110/cmd similarity index 100% rename from test/system/casl2/err_110/cmd rename to test/system/casl2_err/err_110/cmd diff --git a/test/system/casl2/err_111/0.txt b/test/system/casl2_err/err_111/0.txt similarity index 100% rename from test/system/casl2/err_111/0.txt rename to test/system/casl2_err/err_111/0.txt diff --git a/test/system/casl2/err_111/Makefile b/test/system/casl2_err/err_111/Makefile similarity index 100% rename from test/system/casl2/err_111/Makefile rename to test/system/casl2_err/err_111/Makefile diff --git a/test/system/casl2/err_111/cmd b/test/system/casl2_err/err_111/cmd similarity index 100% rename from test/system/casl2/err_111/cmd rename to test/system/casl2_err/err_111/cmd diff --git a/test/system/casl2/err_112/0.txt b/test/system/casl2_err/err_112/0.txt similarity index 100% rename from test/system/casl2/err_112/0.txt rename to test/system/casl2_err/err_112/0.txt diff --git a/test/system/casl2/err_112/Makefile b/test/system/casl2_err/err_112/Makefile similarity index 100% rename from test/system/casl2/err_112/Makefile rename to test/system/casl2_err/err_112/Makefile diff --git a/test/system/casl2/err_112/cmd b/test/system/casl2_err/err_112/cmd similarity index 100% rename from test/system/casl2/err_112/cmd rename to test/system/casl2_err/err_112/cmd diff --git a/test/system/casl2/err_113/0.txt b/test/system/casl2_err/err_113/0.txt similarity index 100% rename from test/system/casl2/err_113/0.txt rename to test/system/casl2_err/err_113/0.txt diff --git a/test/system/casl2/err_113/Makefile b/test/system/casl2_err/err_113/Makefile similarity index 100% rename from test/system/casl2/err_113/Makefile rename to test/system/casl2_err/err_113/Makefile diff --git a/test/system/casl2/err_113/cmd b/test/system/casl2_err/err_113/cmd similarity index 100% rename from test/system/casl2/err_113/cmd rename to test/system/casl2_err/err_113/cmd diff --git a/test/system/casl2/err_114/0.txt b/test/system/casl2_err/err_114/0.txt similarity index 100% rename from test/system/casl2/err_114/0.txt rename to test/system/casl2_err/err_114/0.txt diff --git a/test/system/casl2/err_114/Makefile b/test/system/casl2_err/err_114/Makefile similarity index 100% rename from test/system/casl2/err_114/Makefile rename to test/system/casl2_err/err_114/Makefile diff --git a/test/system/casl2/err_114/cmd b/test/system/casl2_err/err_114/cmd similarity index 100% rename from test/system/casl2/err_114/cmd rename to test/system/casl2_err/err_114/cmd diff --git a/test/system/casl2/err_115/0.txt b/test/system/casl2_err/err_115/0.txt similarity index 100% rename from test/system/casl2/err_115/0.txt rename to test/system/casl2_err/err_115/0.txt diff --git a/test/system/casl2/err_115/Makefile b/test/system/casl2_err/err_115/Makefile similarity index 100% rename from test/system/casl2/err_115/Makefile rename to test/system/casl2_err/err_115/Makefile diff --git a/test/system/casl2/err_115/cmd b/test/system/casl2_err/err_115/cmd similarity index 100% rename from test/system/casl2/err_115/cmd rename to test/system/casl2_err/err_115/cmd diff --git a/test/system/casl2/err_116/0.txt b/test/system/casl2_err/err_116/0.txt similarity index 100% rename from test/system/casl2/err_116/0.txt rename to test/system/casl2_err/err_116/0.txt diff --git a/test/system/casl2/err_116/Makefile b/test/system/casl2_err/err_116/Makefile similarity index 100% rename from test/system/casl2/err_116/Makefile rename to test/system/casl2_err/err_116/Makefile diff --git a/test/system/casl2/err_116/cmd b/test/system/casl2_err/err_116/cmd similarity index 100% rename from test/system/casl2/err_116/cmd rename to test/system/casl2_err/err_116/cmd diff --git a/test/system/casl2/err_117/0.txt b/test/system/casl2_err/err_117/0.txt similarity index 100% rename from test/system/casl2/err_117/0.txt rename to test/system/casl2_err/err_117/0.txt diff --git a/test/system/casl2/err_117/Makefile b/test/system/casl2_err/err_117/Makefile similarity index 100% rename from test/system/casl2/err_117/Makefile rename to test/system/casl2_err/err_117/Makefile diff --git a/test/system/casl2/err_117/cmd b/test/system/casl2_err/err_117/cmd similarity index 100% rename from test/system/casl2/err_117/cmd rename to test/system/casl2_err/err_117/cmd diff --git a/test/system/casl2/err_118/0.txt b/test/system/casl2_err/err_118/0.txt similarity index 100% rename from test/system/casl2/err_118/0.txt rename to test/system/casl2_err/err_118/0.txt diff --git a/test/system/casl2/err_118/Makefile b/test/system/casl2_err/err_118/Makefile similarity index 100% rename from test/system/casl2/err_118/Makefile rename to test/system/casl2_err/err_118/Makefile diff --git a/test/system/casl2/err_118/cmd b/test/system/casl2_err/err_118/cmd similarity index 100% rename from test/system/casl2/err_118/cmd rename to test/system/casl2_err/err_118/cmd diff --git a/test/system/casl2/err_119/0.txt b/test/system/casl2_err/err_119/0.txt similarity index 100% rename from test/system/casl2/err_119/0.txt rename to test/system/casl2_err/err_119/0.txt diff --git a/test/system/casl2/err_119/Makefile b/test/system/casl2_err/err_119/Makefile similarity index 100% rename from test/system/casl2/err_119/Makefile rename to test/system/casl2_err/err_119/Makefile diff --git a/test/system/casl2/err_119/cmd b/test/system/casl2_err/err_119/cmd similarity index 100% rename from test/system/casl2/err_119/cmd rename to test/system/casl2_err/err_119/cmd diff --git a/test/system/casl2/err_120/0.txt b/test/system/casl2_err/err_120/0.txt similarity index 100% rename from test/system/casl2/err_120/0.txt rename to test/system/casl2_err/err_120/0.txt diff --git a/test/system/casl2/err_120/Makefile b/test/system/casl2_err/err_120/Makefile similarity index 100% rename from test/system/casl2/err_120/Makefile rename to test/system/casl2_err/err_120/Makefile diff --git a/test/system/casl2/err_120/cmd b/test/system/casl2_err/err_120/cmd similarity index 100% rename from test/system/casl2/err_120/cmd rename to test/system/casl2_err/err_120/cmd diff --git a/test/system/casl2/err_121/0.txt b/test/system/casl2_err/err_121/0.txt similarity index 100% rename from test/system/casl2/err_121/0.txt rename to test/system/casl2_err/err_121/0.txt diff --git a/test/system/casl2/err_121/Makefile b/test/system/casl2_err/err_121/Makefile similarity index 100% rename from test/system/casl2/err_121/Makefile rename to test/system/casl2_err/err_121/Makefile diff --git a/test/system/casl2/err_121/cmd b/test/system/casl2_err/err_121/cmd similarity index 100% rename from test/system/casl2/err_121/cmd rename to test/system/casl2_err/err_121/cmd diff --git a/test/system/casl2/err_123/0.txt b/test/system/casl2_err/err_123/0.txt similarity index 100% rename from test/system/casl2/err_123/0.txt rename to test/system/casl2_err/err_123/0.txt diff --git a/test/system/casl2/err_123/Makefile b/test/system/casl2_err/err_123/Makefile similarity index 100% rename from test/system/casl2/err_123/Makefile rename to test/system/casl2_err/err_123/Makefile diff --git a/test/system/casl2/err_123/cmd b/test/system/casl2_err/err_123/cmd similarity index 100% rename from test/system/casl2/err_123/cmd rename to test/system/casl2_err/err_123/cmd diff --git a/test/system/casl2/err_124/0.txt b/test/system/casl2_err/err_124/0.txt similarity index 100% rename from test/system/casl2/err_124/0.txt rename to test/system/casl2_err/err_124/0.txt diff --git a/test/system/casl2/err_124/Makefile b/test/system/casl2_err/err_124/Makefile similarity index 100% rename from test/system/casl2/err_124/Makefile rename to test/system/casl2_err/err_124/Makefile diff --git a/test/system/casl2/err_124/cmd b/test/system/casl2_err/err_124/cmd similarity index 100% rename from test/system/casl2/err_124/cmd rename to test/system/casl2_err/err_124/cmd diff --git a/test/system/casl2/err_125/0.txt b/test/system/casl2_err/err_125/0.txt similarity index 100% rename from test/system/casl2/err_125/0.txt rename to test/system/casl2_err/err_125/0.txt diff --git a/test/system/casl2/err_125/Makefile b/test/system/casl2_err/err_125/Makefile similarity index 100% rename from test/system/casl2/err_125/Makefile rename to test/system/casl2_err/err_125/Makefile diff --git a/test/system/casl2/err_125/cmd b/test/system/casl2_err/err_125/cmd similarity index 100% rename from test/system/casl2/err_125/cmd rename to test/system/casl2_err/err_125/cmd diff --git a/test/system/casl2/err_126/0.txt b/test/system/casl2_err/err_126/0.txt similarity index 100% rename from test/system/casl2/err_126/0.txt rename to test/system/casl2_err/err_126/0.txt diff --git a/test/system/casl2/err_126/Makefile b/test/system/casl2_err/err_126/Makefile similarity index 100% rename from test/system/casl2/err_126/Makefile rename to test/system/casl2_err/err_126/Makefile diff --git a/test/system/casl2/err_126/cmd b/test/system/casl2_err/err_126/cmd similarity index 100% rename from test/system/casl2/err_126/cmd rename to test/system/casl2_err/err_126/cmd diff --git a/test/system/casl2/err_201/0.txt b/test/system/casl2_err/err_201/0.txt similarity index 100% rename from test/system/casl2/err_201/0.txt rename to test/system/casl2_err/err_201/0.txt diff --git a/test/system/casl2/err_201/Makefile b/test/system/casl2_err/err_201/Makefile similarity index 100% rename from test/system/casl2/err_201/Makefile rename to test/system/casl2_err/err_201/Makefile diff --git a/test/system/casl2/err_201/cmd b/test/system/casl2_err/err_201/cmd similarity index 100% rename from test/system/casl2/err_201/cmd rename to test/system/casl2_err/err_201/cmd diff --git a/test/system/casl2/err_202/0.txt b/test/system/casl2_err/err_202/0.txt similarity index 100% rename from test/system/casl2/err_202/0.txt rename to test/system/casl2_err/err_202/0.txt diff --git a/test/system/casl2/err_202/Makefile b/test/system/casl2_err/err_202/Makefile similarity index 100% rename from test/system/casl2/err_202/Makefile rename to test/system/casl2_err/err_202/Makefile diff --git a/test/system/casl2/err_202/cmd b/test/system/casl2_err/err_202/cmd similarity index 100% rename from test/system/casl2/err_202/cmd rename to test/system/casl2_err/err_202/cmd diff --git a/test/system/casl2/err_203/0.txt b/test/system/casl2_err/err_203/0.txt similarity index 100% rename from test/system/casl2/err_203/0.txt rename to test/system/casl2_err/err_203/0.txt diff --git a/test/system/casl2/err_203/Makefile b/test/system/casl2_err/err_203/Makefile similarity index 100% rename from test/system/casl2/err_203/Makefile rename to test/system/casl2_err/err_203/Makefile diff --git a/test/system/casl2/err_203/cmd b/test/system/casl2_err/err_203/cmd similarity index 100% rename from test/system/casl2/err_203/cmd rename to test/system/casl2_err/err_203/cmd diff --git a/test/system/casl2/err_207/0.txt b/test/system/casl2_err/err_207/0.txt similarity index 100% rename from test/system/casl2/err_207/0.txt rename to test/system/casl2_err/err_207/0.txt diff --git a/test/system/casl2/err_207/Makefile b/test/system/casl2_err/err_207/Makefile similarity index 100% rename from test/system/casl2/err_207/Makefile rename to test/system/casl2_err/err_207/Makefile diff --git a/test/system/casl2/err_207/cmd b/test/system/casl2_err/err_207/cmd similarity index 100% rename from test/system/casl2/err_207/cmd rename to test/system/casl2_err/err_207/cmd diff --git a/test/system/casl2/err_208/0.txt b/test/system/casl2_err/err_208/0.txt similarity index 100% rename from test/system/casl2/err_208/0.txt rename to test/system/casl2_err/err_208/0.txt diff --git a/test/system/casl2/err_208/Makefile b/test/system/casl2_err/err_208/Makefile similarity index 100% rename from test/system/casl2/err_208/Makefile rename to test/system/casl2_err/err_208/Makefile diff --git a/test/system/casl2/err_208/cmd b/test/system/casl2_err/err_208/cmd similarity index 100% rename from test/system/casl2/err_208/cmd rename to test/system/casl2_err/err_208/cmd diff --git a/test/system/casl2/err_208/teststr.txt b/test/system/casl2_err/err_208/teststr.txt similarity index 100% rename from test/system/casl2/err_208/teststr.txt rename to test/system/casl2_err/err_208/teststr.txt diff --git a/test/system/casl2/err_209/0.txt b/test/system/casl2_err/err_209/0.txt similarity index 100% rename from test/system/casl2/err_209/0.txt rename to test/system/casl2_err/err_209/0.txt diff --git a/test/system/casl2/err_209/Makefile b/test/system/casl2_err/err_209/Makefile similarity index 100% rename from test/system/casl2/err_209/Makefile rename to test/system/casl2_err/err_209/Makefile diff --git a/test/system/casl2/err_209/cmd b/test/system/casl2_err/err_209/cmd similarity index 100% rename from test/system/casl2/err_209/cmd rename to test/system/casl2_err/err_209/cmd diff --git a/test/system/casl2_lib/Define.mk b/test/system/casl2_lib/Define.mk new file mode 120000 index 0000000..b4a58e1 --- /dev/null +++ b/test/system/casl2_lib/Define.mk @@ -0,0 +1 @@ +../../template/Define.mk \ No newline at end of file diff --git a/test/system/casl2_lib/Makefile b/test/system/casl2_lib/Makefile new file mode 120000 index 0000000..4f4e7b0 --- /dev/null +++ b/test/system/casl2_lib/Makefile @@ -0,0 +1 @@ +../../template/Group.mk \ No newline at end of file diff --git a/test/system/casl2_lib/Test.mk b/test/system/casl2_lib/Test.mk new file mode 120000 index 0000000..ada05aa --- /dev/null +++ b/test/system/casl2_lib/Test.mk @@ -0,0 +1 @@ +../../template/Test.mk \ No newline at end of file diff --git a/test/system/casl2/lib_abs/0.txt b/test/system/casl2_lib/lib_abs/0.txt similarity index 100% rename from test/system/casl2/lib_abs/0.txt rename to test/system/casl2_lib/lib_abs/0.txt diff --git a/test/system/casl2/hello/Makefile b/test/system/casl2_lib/lib_abs/Makefile similarity index 100% rename from test/system/casl2/hello/Makefile rename to test/system/casl2_lib/lib_abs/Makefile diff --git a/test/system/casl2_lib/lib_abs/cmd b/test/system/casl2_lib/lib_abs/cmd new file mode 100755 index 0000000..fcdd625 --- /dev/null +++ b/test/system/casl2_lib/lib_abs/cmd @@ -0,0 +1 @@ +../../../../casl2 -M2048 ../../../../as/casl2lib/sample/call_abs.casl ../../../../as/casl2lib/stdlib.casl diff --git a/test/system/casl2/lib_addl32/0.txt b/test/system/casl2_lib/lib_addl32/0.txt similarity index 100% rename from test/system/casl2/lib_addl32/0.txt rename to test/system/casl2_lib/lib_addl32/0.txt diff --git a/test/system/casl2/lib_abs/Makefile b/test/system/casl2_lib/lib_addl32/Makefile similarity index 100% rename from test/system/casl2/lib_abs/Makefile rename to test/system/casl2_lib/lib_addl32/Makefile diff --git a/test/system/casl2_lib/lib_addl32/cmd b/test/system/casl2_lib/lib_addl32/cmd new file mode 100755 index 0000000..2f3c209 --- /dev/null +++ b/test/system/casl2_lib/lib_addl32/cmd @@ -0,0 +1 @@ +../../../../casl2 -M2048 ../../../../as/casl2lib/sample/call_addl32.casl ../../../../as/casl2lib/stdlib.casl diff --git a/test/system/casl2/lib_divl/0.txt b/test/system/casl2_lib/lib_divl/0.txt similarity index 100% rename from test/system/casl2/lib_divl/0.txt rename to test/system/casl2_lib/lib_divl/0.txt diff --git a/test/system/casl2/lib_addl32/Makefile b/test/system/casl2_lib/lib_divl/Makefile similarity index 100% rename from test/system/casl2/lib_addl32/Makefile rename to test/system/casl2_lib/lib_divl/Makefile diff --git a/test/system/casl2_lib/lib_divl/cmd b/test/system/casl2_lib/lib_divl/cmd new file mode 100755 index 0000000..13d7da4 --- /dev/null +++ b/test/system/casl2_lib/lib_divl/cmd @@ -0,0 +1 @@ +../../../../casl2 -M2048 ../../../../as/casl2lib/sample/call_divl.casl ../../../../as/casl2lib/stdlib.casl diff --git a/test/system/casl2/lib_inl/0.txt b/test/system/casl2_lib/lib_inl/0.txt similarity index 100% rename from test/system/casl2/lib_inl/0.txt rename to test/system/casl2_lib/lib_inl/0.txt diff --git a/test/system/casl2/lib_divl/Makefile b/test/system/casl2_lib/lib_inl/Makefile similarity index 100% rename from test/system/casl2/lib_divl/Makefile rename to test/system/casl2_lib/lib_inl/Makefile diff --git a/test/system/casl2_lib/lib_inl/cmd b/test/system/casl2_lib/lib_inl/cmd new file mode 100755 index 0000000..941a81f --- /dev/null +++ b/test/system/casl2_lib/lib_inl/cmd @@ -0,0 +1 @@ +../../../../casl2 -M2048 ../../../../as/casl2lib/sample/call_inl.casl ../../../../as/casl2lib/stdlib.casl #0000 +MAIN.LOOP ---> #0006 +MAIN.FIN ---> #000F +MAIN.FST ---> #0011 +MAIN.LST ---> #0012 +MAIN.STEP ---> #0013 diff --git a/test/system/casl2/opt_s/Makefile b/test/system/casl2_opt/opt_sL/Makefile similarity index 100% rename from test/system/casl2/opt_s/Makefile rename to test/system/casl2_opt/opt_sL/Makefile diff --git a/test/system/casl2_opt/opt_sL/cmd b/test/system/casl2_opt/opt_sL/cmd new file mode 100755 index 0000000..11dde66 --- /dev/null +++ b/test/system/casl2_opt/opt_sL/cmd @@ -0,0 +1,2 @@ +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 new file mode 100644 index 0000000..d6f1778 --- /dev/null +++ b/test/system/casl2_opt/opt_slA/0.txt @@ -0,0 +1,83 @@ +;;; sum_10.casl +;;; 出力 GR0: 1から10までの整数をすべて加算した値 +MAIN START + PUSH 0,GR1 + LAD GR0,0 ; GR0を初期化 + LD GR1,FST ; GR1に初項を転送 +LOOP ADDL GR0,GR1 ; ループ先頭 + ADDL GR1,STEP ; GR1 <- GR1 + 公差 + CPL GR1,LST ; GR1が末項より大きい場合は終了 + JPL FIN ; ↓ + JUMP LOOP ; ループ終端 +FIN POP GR1 + RET +FST DC 1 ; 初項 +LST DC 10 ; 末項 +STEP DC 1 ; 公差 + END + +Assemble ../../../../as/sample/sum_10.casl (0) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 +../../../../as/sample/sum_10.casl: 13: RET +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 +../../../../as/sample/sum_10.casl: 17: END + +Label:::: +MAIN ---> #0000 +MAIN.LOOP ---> #0006 +MAIN.FIN ---> #000F +MAIN.FST ---> #0011 +MAIN.LST ---> #0012 +MAIN.STEP ---> #0013 + +Assemble ../../../../as/sample/sum_10.casl (1) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 + #0000 #7001 + #0001 #0000 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 + #0002 #1200 + #0003 #0000 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 + #0004 #1010 + #0005 #0011 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 + #0006 #2601 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 + #0007 #2210 + #0008 #0013 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 + #0009 #4110 + #000A #0012 +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ + #000B #6500 + #000C #000F +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 + #000D #6400 + #000E #0006 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 + #000F #7110 +../../../../as/sample/sum_10.casl: 13: RET + #0010 #8100 +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 + #0011 #0001 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 + #0012 #000A +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 + #0013 #0001 +../../../../as/sample/sum_10.casl: 17: END diff --git a/test/system/casl2/opt_sL/Makefile b/test/system/casl2_opt/opt_slA/Makefile similarity index 100% rename from test/system/casl2/opt_sL/Makefile rename to test/system/casl2_opt/opt_slA/Makefile diff --git a/test/system/casl2_opt/opt_slA/cmd b/test/system/casl2_opt/opt_slA/cmd new file mode 100755 index 0000000..7406f90 --- /dev/null +++ b/test/system/casl2_opt/opt_slA/cmd @@ -0,0 +1,2 @@ +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 new file mode 100644 index 0000000..d6f1778 --- /dev/null +++ b/test/system/casl2_opt/opt_slaO/0.txt @@ -0,0 +1,83 @@ +;;; sum_10.casl +;;; 出力 GR0: 1から10までの整数をすべて加算した値 +MAIN START + PUSH 0,GR1 + LAD GR0,0 ; GR0を初期化 + LD GR1,FST ; GR1に初項を転送 +LOOP ADDL GR0,GR1 ; ループ先頭 + ADDL GR1,STEP ; GR1 <- GR1 + 公差 + CPL GR1,LST ; GR1が末項より大きい場合は終了 + JPL FIN ; ↓ + JUMP LOOP ; ループ終端 +FIN POP GR1 + RET +FST DC 1 ; 初項 +LST DC 10 ; 末項 +STEP DC 1 ; 公差 + END + +Assemble ../../../../as/sample/sum_10.casl (0) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 +../../../../as/sample/sum_10.casl: 13: RET +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 +../../../../as/sample/sum_10.casl: 17: END + +Label:::: +MAIN ---> #0000 +MAIN.LOOP ---> #0006 +MAIN.FIN ---> #000F +MAIN.FST ---> #0011 +MAIN.LST ---> #0012 +MAIN.STEP ---> #0013 + +Assemble ../../../../as/sample/sum_10.casl (1) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 + #0000 #7001 + #0001 #0000 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 + #0002 #1200 + #0003 #0000 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 + #0004 #1010 + #0005 #0011 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 + #0006 #2601 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 + #0007 #2210 + #0008 #0013 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 + #0009 #4110 + #000A #0012 +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ + #000B #6500 + #000C #000F +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 + #000D #6400 + #000E #0006 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 + #000F #7110 +../../../../as/sample/sum_10.casl: 13: RET + #0010 #8100 +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 + #0011 #0001 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 + #0012 #000A +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 + #0013 #0001 +../../../../as/sample/sum_10.casl: 17: END diff --git a/test/system/casl2/opt_slA/Makefile b/test/system/casl2_opt/opt_slaO/Makefile similarity index 100% rename from test/system/casl2/opt_slA/Makefile rename to test/system/casl2_opt/opt_slaO/Makefile diff --git a/test/system/casl2_opt/opt_slaO/cmd b/test/system/casl2_opt/opt_slaO/cmd new file mode 100755 index 0000000..98822fc --- /dev/null +++ b/test/system/casl2_opt/opt_slaO/cmd @@ -0,0 +1,2 @@ +cat ../../../../as/sample/sum_10.casl +../../../../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 new file mode 100644 index 0000000..d6f1778 --- /dev/null +++ b/test/system/casl2_opt/opt_slaOn/0.txt @@ -0,0 +1,83 @@ +;;; sum_10.casl +;;; 出力 GR0: 1から10までの整数をすべて加算した値 +MAIN START + PUSH 0,GR1 + LAD GR0,0 ; GR0を初期化 + LD GR1,FST ; GR1に初項を転送 +LOOP ADDL GR0,GR1 ; ループ先頭 + ADDL GR1,STEP ; GR1 <- GR1 + 公差 + CPL GR1,LST ; GR1が末項より大きい場合は終了 + JPL FIN ; ↓ + JUMP LOOP ; ループ終端 +FIN POP GR1 + RET +FST DC 1 ; 初項 +LST DC 10 ; 末項 +STEP DC 1 ; 公差 + END + +Assemble ../../../../as/sample/sum_10.casl (0) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 +../../../../as/sample/sum_10.casl: 13: RET +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 +../../../../as/sample/sum_10.casl: 17: END + +Label:::: +MAIN ---> #0000 +MAIN.LOOP ---> #0006 +MAIN.FIN ---> #000F +MAIN.FST ---> #0011 +MAIN.LST ---> #0012 +MAIN.STEP ---> #0013 + +Assemble ../../../../as/sample/sum_10.casl (1) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 + #0000 #7001 + #0001 #0000 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 + #0002 #1200 + #0003 #0000 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 + #0004 #1010 + #0005 #0011 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 + #0006 #2601 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 + #0007 #2210 + #0008 #0013 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 + #0009 #4110 + #000A #0012 +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ + #000B #6500 + #000C #000F +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 + #000D #6400 + #000E #0006 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 + #000F #7110 +../../../../as/sample/sum_10.casl: 13: RET + #0010 #8100 +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 + #0011 #0001 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 + #0012 #000A +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 + #0013 #0001 +../../../../as/sample/sum_10.casl: 17: END diff --git a/test/system/casl2/opt_slaO/Makefile b/test/system/casl2_opt/opt_slaOn/Makefile similarity index 100% rename from test/system/casl2/opt_slaO/Makefile rename to test/system/casl2_opt/opt_slaOn/Makefile diff --git a/test/system/casl2_opt/opt_slaOn/cmd b/test/system/casl2_opt/opt_slaOn/cmd new file mode 100755 index 0000000..80b9087 --- /dev/null +++ b/test/system/casl2_opt/opt_slaOn/cmd @@ -0,0 +1,2 @@ +cat ../../../../as/sample/sum_10.casl +../../../../casl2 -sla -Oopt.o ../../../../as/sample/sum_10.casl diff --git a/test/system/casl2/opt_slao_T/0.txt b/test/system/casl2_opt/opt_slao_T/0.txt similarity index 91% rename from test/system/casl2/opt_slao_T/0.txt rename to test/system/casl2_opt/opt_slao_T/0.txt index 1cdcb90..d38f7de 100644 --- a/test/system/casl2/opt_slao_T/0.txt +++ b/test/system/casl2_opt/opt_slao_T/0.txt @@ -16,24 +16,24 @@ LST DC 10 ; 末項 STEP DC 1 ; 公差 END -Assemble ../../../../as/sum_10.casl (0) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 -../../../../as/sum_10.casl: 12:FIN POP GR1 -../../../../as/sum_10.casl: 13: RET -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 -../../../../as/sum_10.casl: 17: END +Assemble ../../../../as/sample/sum_10.casl (0) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 +../../../../as/sample/sum_10.casl: 13: RET +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 +../../../../as/sample/sum_10.casl: 17: END Label:::: MAIN ---> #0000 @@ -43,44 +43,44 @@ MAIN.FST ---> #0011 MAIN.LST ---> #0012 MAIN.STEP ---> #0013 -Assemble ../../../../as/sum_10.casl (1) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 +Assemble ../../../../as/sample/sum_10.casl (1) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 #0000 #7001 #0001 #0000 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 #0002 #1200 #0003 #0000 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 #0004 #1010 #0005 #0011 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 #0006 #2601 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 #0007 #2210 #0008 #0013 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 #0009 #4110 #000A #0012 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ #000B #6500 #000C #000F -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 #000D #6400 #000E #0006 -../../../../as/sum_10.casl: 12:FIN POP GR1 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 #000F #7110 -../../../../as/sum_10.casl: 13: RET +../../../../as/sample/sum_10.casl: 13: RET #0010 #8100 -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 #0011 #0001 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 #0012 #000A -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 #0013 #0001 -../../../../as/sum_10.casl: 17: END +../../../../as/sample/sum_10.casl: 17: END Executing machine codes #0000: Register:::: diff --git a/test/system/casl2/opt_slaOn/Makefile b/test/system/casl2_opt/opt_slao_T/Makefile similarity index 100% rename from test/system/casl2/opt_slaOn/Makefile rename to test/system/casl2_opt/opt_slao_T/Makefile diff --git a/test/system/casl2_opt/opt_slao_T/cmd b/test/system/casl2_opt/opt_slao_T/cmd new file mode 100755 index 0000000..b71e5c1 --- /dev/null +++ b/test/system/casl2_opt/opt_slao_T/cmd @@ -0,0 +1,2 @@ +cat ../../../../as/sample/sum_10.casl +../../../../casl2 -slaTo ../../../../as/sample/sum_10.casl diff --git a/test/system/casl2/opt_slaot/0.txt b/test/system/casl2_opt/opt_slaot/0.txt similarity index 91% rename from test/system/casl2/opt_slaot/0.txt rename to test/system/casl2_opt/opt_slaot/0.txt index 1cdcb90..d38f7de 100644 --- a/test/system/casl2/opt_slaot/0.txt +++ b/test/system/casl2_opt/opt_slaot/0.txt @@ -16,24 +16,24 @@ LST DC 10 ; 末項 STEP DC 1 ; 公差 END -Assemble ../../../../as/sum_10.casl (0) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 -../../../../as/sum_10.casl: 12:FIN POP GR1 -../../../../as/sum_10.casl: 13: RET -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 -../../../../as/sum_10.casl: 17: END +Assemble ../../../../as/sample/sum_10.casl (0) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 +../../../../as/sample/sum_10.casl: 13: RET +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 +../../../../as/sample/sum_10.casl: 17: END Label:::: MAIN ---> #0000 @@ -43,44 +43,44 @@ MAIN.FST ---> #0011 MAIN.LST ---> #0012 MAIN.STEP ---> #0013 -Assemble ../../../../as/sum_10.casl (1) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 +Assemble ../../../../as/sample/sum_10.casl (1) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 #0000 #7001 #0001 #0000 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 #0002 #1200 #0003 #0000 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 #0004 #1010 #0005 #0011 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 #0006 #2601 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 #0007 #2210 #0008 #0013 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 #0009 #4110 #000A #0012 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ #000B #6500 #000C #000F -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 #000D #6400 #000E #0006 -../../../../as/sum_10.casl: 12:FIN POP GR1 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 #000F #7110 -../../../../as/sum_10.casl: 13: RET +../../../../as/sample/sum_10.casl: 13: RET #0010 #8100 -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 #0011 #0001 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 #0012 #000A -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 #0013 #0001 -../../../../as/sum_10.casl: 17: END +../../../../as/sample/sum_10.casl: 17: END Executing machine codes #0000: Register:::: diff --git a/test/system/casl2/opt_slao_T/Makefile b/test/system/casl2_opt/opt_slaot/Makefile similarity index 100% rename from test/system/casl2/opt_slao_T/Makefile rename to test/system/casl2_opt/opt_slaot/Makefile diff --git a/test/system/casl2_opt/opt_slaot/cmd b/test/system/casl2_opt/opt_slaot/cmd new file mode 100755 index 0000000..ebc2594 --- /dev/null +++ b/test/system/casl2_opt/opt_slaot/cmd @@ -0,0 +1,2 @@ +cat ../../../../as/sample/sum_10.casl +../../../../casl2 -slat -o ../../../../as/sample/sum_10.casl diff --git a/test/system/casl2/opt_slaotd/0.txt b/test/system/casl2_opt/opt_slaotd/0.txt similarity index 98% rename from test/system/casl2/opt_slaotd/0.txt rename to test/system/casl2_opt/opt_slaotd/0.txt index 38656f9..012cdcf 100644 --- a/test/system/casl2/opt_slaotd/0.txt +++ b/test/system/casl2_opt/opt_slaotd/0.txt @@ -16,24 +16,24 @@ LST DC 10 ; 末項 STEP DC 1 ; 公差 END -Assemble ../../../../as/sum_10.casl (0) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 -../../../../as/sum_10.casl: 12:FIN POP GR1 -../../../../as/sum_10.casl: 13: RET -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 -../../../../as/sum_10.casl: 17: END +Assemble ../../../../as/sample/sum_10.casl (0) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 +../../../../as/sample/sum_10.casl: 13: RET +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 +../../../../as/sample/sum_10.casl: 17: END Label:::: MAIN ---> #0000 @@ -43,44 +43,44 @@ MAIN.FST ---> #0011 MAIN.LST ---> #0012 MAIN.STEP ---> #0013 -Assemble ../../../../as/sum_10.casl (1) -../../../../as/sum_10.casl: 1:;;; sum_10.casl -../../../../as/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 -../../../../as/sum_10.casl: 3:MAIN START -../../../../as/sum_10.casl: 4: PUSH 0,GR1 +Assemble ../../../../as/sample/sum_10.casl (1) +../../../../as/sample/sum_10.casl: 1:;;; sum_10.casl +../../../../as/sample/sum_10.casl: 2:;;; 出力 GR0: 1から10までの整数をすべて加算した値 +../../../../as/sample/sum_10.casl: 3:MAIN START +../../../../as/sample/sum_10.casl: 4: PUSH 0,GR1 #0000 #7001 #0001 #0000 -../../../../as/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 +../../../../as/sample/sum_10.casl: 5: LAD GR0,0 ; GR0を初期化 #0002 #1200 #0003 #0000 -../../../../as/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 +../../../../as/sample/sum_10.casl: 6: LD GR1,FST ; GR1に初項を転送 #0004 #1010 #0005 #0011 -../../../../as/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 +../../../../as/sample/sum_10.casl: 7:LOOP ADDL GR0,GR1 ; ループ先頭 #0006 #2601 -../../../../as/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 +../../../../as/sample/sum_10.casl: 8: ADDL GR1,STEP ; GR1 <- GR1 + 公差 #0007 #2210 #0008 #0013 -../../../../as/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 +../../../../as/sample/sum_10.casl: 9: CPL GR1,LST ; GR1が末項より大きい場合は終了 #0009 #4110 #000A #0012 -../../../../as/sum_10.casl: 10: JPL FIN ; ↓ +../../../../as/sample/sum_10.casl: 10: JPL FIN ; ↓ #000B #6500 #000C #000F -../../../../as/sum_10.casl: 11: JUMP LOOP ; ループ終端 +../../../../as/sample/sum_10.casl: 11: JUMP LOOP ; ループ終端 #000D #6400 #000E #0006 -../../../../as/sum_10.casl: 12:FIN POP GR1 +../../../../as/sample/sum_10.casl: 12:FIN POP GR1 #000F #7110 -../../../../as/sum_10.casl: 13: RET +../../../../as/sample/sum_10.casl: 13: RET #0010 #8100 -../../../../as/sum_10.casl: 14:FST DC 1 ; 初項 +../../../../as/sample/sum_10.casl: 14:FST DC 1 ; 初項 #0011 #0001 -../../../../as/sum_10.casl: 15:LST DC 10 ; 末項 +../../../../as/sample/sum_10.casl: 15:LST DC 10 ; 末項 #0012 #000A -../../../../as/sum_10.casl: 16:STEP DC 1 ; 公差 +../../../../as/sample/sum_10.casl: 16:STEP DC 1 ; 公差 #0013 #0001 -../../../../as/sum_10.casl: 17: END +../../../../as/sample/sum_10.casl: 17: END Executing machine codes #0000: Register:::: diff --git a/test/system/casl2/opt_slaot/Makefile b/test/system/casl2_opt/opt_slaotd/Makefile similarity index 100% rename from test/system/casl2/opt_slaot/Makefile rename to test/system/casl2_opt/opt_slaotd/Makefile diff --git a/test/system/casl2_opt/opt_slaotd/cmd b/test/system/casl2_opt/opt_slaotd/cmd new file mode 100755 index 0000000..acd8987 --- /dev/null +++ b/test/system/casl2_opt/opt_slaotd/cmd @@ -0,0 +1,2 @@ +cat ../../../../as/sample/sum_10.casl +../../../../casl2 -slatdo ../../../../as/sample/sum_10.casl diff --git a/test/system/casl2/opt_v/.gitignore b/test/system/casl2_opt/opt_v/.gitignore similarity index 100% rename from test/system/casl2/opt_v/.gitignore rename to test/system/casl2_opt/opt_v/.gitignore diff --git a/test/system/casl2/opt_v/0.txt.version b/test/system/casl2_opt/opt_v/0.txt.version similarity index 100% rename from test/system/casl2/opt_v/0.txt.version rename to test/system/casl2_opt/opt_v/0.txt.version diff --git a/test/system/casl2/opt_slaotd/Makefile b/test/system/casl2_opt/opt_v/Makefile similarity index 100% rename from test/system/casl2/opt_slaotd/Makefile rename to test/system/casl2_opt/opt_v/Makefile diff --git a/test/system/casl2/opt_v/cmd b/test/system/casl2_opt/opt_v/cmd similarity index 100% rename from test/system/casl2/opt_v/cmd rename to test/system/casl2_opt/opt_v/cmd diff --git a/test/system/casl2_smoke/Define.mk b/test/system/casl2_smoke/Define.mk new file mode 120000 index 0000000..b4a58e1 --- /dev/null +++ b/test/system/casl2_smoke/Define.mk @@ -0,0 +1 @@ +../../template/Define.mk \ No newline at end of file diff --git a/test/system/casl2_smoke/Makefile b/test/system/casl2_smoke/Makefile new file mode 120000 index 0000000..4f4e7b0 --- /dev/null +++ b/test/system/casl2_smoke/Makefile @@ -0,0 +1 @@ +../../template/Group.mk \ No newline at end of file diff --git a/test/system/casl2_smoke/Test.mk b/test/system/casl2_smoke/Test.mk new file mode 120000 index 0000000..ada05aa --- /dev/null +++ b/test/system/casl2_smoke/Test.mk @@ -0,0 +1 @@ +../../template/Test.mk \ No newline at end of file diff --git a/test/system/casl2_smoke/hello/0.txt b/test/system/casl2_smoke/hello/0.txt new file mode 100644 index 0000000..384470e --- /dev/null +++ b/test/system/casl2_smoke/hello/0.txt @@ -0,0 +1,63 @@ +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 +../../../../as/sample/hello.casl: 2: OUT OBUF,LEN +../../../../as/sample/hello.casl: 3: RET +../../../../as/sample/hello.casl: 4:OBUF DC 'Hello, World!' +../../../../as/sample/hello.casl: 5:LEN DC 13 +../../../../as/sample/hello.casl: 6: END + +Label:::: +MAIN ---> #0000 +MAIN.OBUF ---> #0013 +MAIN.LEN ---> #0020 + +Assemble ../../../../as/sample/hello.casl (1) +../../../../as/sample/hello.casl: 1:MAIN START +../../../../as/sample/hello.casl: 2: OUT OBUF,LEN + #0000 #7001 + #0001 #0000 + #0002 #7002 + #0003 #0000 + #0004 #1210 + #0005 #0013 + #0006 #1220 + #0007 #0020 + #0008 #F000 + #0009 #0002 + #0021 #000A + #000A #1210 + #000B #0021 + #0022 #0001 + #000C #1220 + #000D #0022 + #000E #F000 + #000F #0002 + #0010 #7120 + #0011 #7110 +../../../../as/sample/hello.casl: 3: RET + #0012 #8100 +../../../../as/sample/hello.casl: 4:OBUF DC 'Hello, World!' + #0013 #0048 + #0014 #0065 + #0015 #006C + #0016 #006C + #0017 #006F + #0018 #002C + #0019 #0020 + #001A #0057 + #001B #006F + #001C #0072 + #001D #006C + #001E #0064 + #001F #0021 +../../../../as/sample/hello.casl: 5:LEN DC 13 + #0020 #000D +../../../../as/sample/hello.casl: 6: END +Hello, World! diff --git a/test/system/casl2/opt_v/Makefile b/test/system/casl2_smoke/hello/Makefile similarity index 100% rename from test/system/casl2/opt_v/Makefile rename to test/system/casl2_smoke/hello/Makefile diff --git a/test/system/casl2_smoke/hello/cmd b/test/system/casl2_smoke/hello/cmd new file mode 100755 index 0000000..1b676ca --- /dev/null +++ b/test/system/casl2_smoke/hello/cmd @@ -0,0 +1,2 @@ +cat ../../../../as/sample/hello.casl +../../../../casl2 -sla ../../../../as/sample/hello.casl diff --git a/test/system/comet2/hello/cmd b/test/system/comet2/hello/cmd deleted file mode 100755 index aabc023..0000000 --- a/test/system/comet2/hello/cmd +++ /dev/null @@ -1,3 +0,0 @@ -../../../../casl2 -O ../../../../as/hello.casl -../../../../comet2 a.o -rm -f a.o diff --git a/test/system/comet2/lib_abs/cmd b/test/system/comet2/lib_abs/cmd deleted file mode 100755 index cefb556..0000000 --- a/test/system/comet2/lib_abs/cmd +++ /dev/null @@ -1,3 +0,0 @@ -../../../../casl2 -O abs.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl -../../../../comet2 a.o -rm -f a.o diff --git a/test/system/comet2/lib_addl32/cmd b/test/system/comet2/lib_addl32/cmd deleted file mode 100755 index e44e5d8..0000000 --- a/test/system/comet2/lib_addl32/cmd +++ /dev/null @@ -1,3 +0,0 @@ -../../../../casl2 -O addl32.casl ../../../../as/casl2lib/addl32.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl -../../../../comet2 a.o -rm -f a.o diff --git a/test/system/comet2/lib_divl/cmd b/test/system/comet2/lib_divl/cmd deleted file mode 100755 index 47e8127..0000000 --- a/test/system/comet2/lib_divl/cmd +++ /dev/null @@ -1,3 +0,0 @@ -../../../../casl2 -M640 -O divl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl -../../../../comet2 -M640 a.o -rm -f a.o diff --git a/test/system/comet2/lib_inl/cmd b/test/system/comet2/lib_inl/cmd deleted file mode 100755 index 9d47a46..0000000 --- a/test/system/comet2/lib_inl/cmd +++ /dev/null @@ -1,3 +0,0 @@ -../../../../casl2 -M720 -O 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 -../../../../comet2 -M720 a.o &1 | tail -1 1>&2 rm -f a.o diff --git a/test/system/comet2/opt_opterr/desc.txt b/test/system/comet2_opt/opt_opterr/desc.txt similarity index 100% rename from test/system/comet2/opt_opterr/desc.txt rename to test/system/comet2_opt/opt_opterr/desc.txt diff --git a/test/system/comet2/opt_t/0.txt b/test/system/comet2_opt/opt_t/0.txt similarity index 100% rename from test/system/comet2/opt_t/0.txt rename to test/system/comet2_opt/opt_t/0.txt diff --git a/test/system/comet2/opt_opterr/Makefile b/test/system/comet2_opt/opt_t/Makefile similarity index 100% rename from test/system/comet2/opt_opterr/Makefile rename to test/system/comet2_opt/opt_t/Makefile diff --git a/test/system/comet2_opt/opt_t/cmd b/test/system/comet2_opt/opt_t/cmd new file mode 100755 index 0000000..b43f198 --- /dev/null +++ b/test/system/comet2_opt/opt_t/cmd @@ -0,0 +1,3 @@ +../../../../casl2 -O ../../../../as/sample/sum_10.casl +../../../../comet2 -t a.o +rm -f a.o diff --git a/test/system/comet2/opt_t/desc.txt b/test/system/comet2_opt/opt_t/desc.txt similarity index 100% rename from test/system/comet2/opt_t/desc.txt rename to test/system/comet2_opt/opt_t/desc.txt diff --git a/test/system/comet2/opt_td/0.txt b/test/system/comet2_opt/opt_td/0.txt similarity index 100% rename from test/system/comet2/opt_td/0.txt rename to test/system/comet2_opt/opt_td/0.txt diff --git a/test/system/comet2/opt_t/Makefile b/test/system/comet2_opt/opt_td/Makefile similarity index 100% rename from test/system/comet2/opt_t/Makefile rename to test/system/comet2_opt/opt_td/Makefile diff --git a/test/system/comet2_opt/opt_td/cmd b/test/system/comet2_opt/opt_td/cmd new file mode 100755 index 0000000..dbe5503 --- /dev/null +++ b/test/system/comet2_opt/opt_td/cmd @@ -0,0 +1,3 @@ +../../../../casl2 -O ../../../../as/sample/sum_10.casl +../../../../comet2 -td a.o +rm -f a.o diff --git a/test/system/comet2/opt_td/desc.txt b/test/system/comet2_opt/opt_td/desc.txt similarity index 100% rename from test/system/comet2/opt_td/desc.txt rename to test/system/comet2_opt/opt_td/desc.txt diff --git a/test/system/comet2/opt_v/.gitignore b/test/system/comet2_opt/opt_v/.gitignore similarity index 100% rename from test/system/comet2/opt_v/.gitignore rename to test/system/comet2_opt/opt_v/.gitignore diff --git a/test/system/comet2/opt_v/0.txt.version b/test/system/comet2_opt/opt_v/0.txt.version similarity index 100% rename from test/system/comet2/opt_v/0.txt.version rename to test/system/comet2_opt/opt_v/0.txt.version diff --git a/test/system/comet2/opt_td/Makefile b/test/system/comet2_opt/opt_v/Makefile similarity index 100% rename from test/system/comet2/opt_td/Makefile rename to test/system/comet2_opt/opt_v/Makefile diff --git a/test/system/comet2/opt_v/cmd b/test/system/comet2_opt/opt_v/cmd similarity index 100% rename from test/system/comet2/opt_v/cmd rename to test/system/comet2_opt/opt_v/cmd diff --git a/test/system/comet2_smoke/Define.mk b/test/system/comet2_smoke/Define.mk new file mode 120000 index 0000000..b4a58e1 --- /dev/null +++ b/test/system/comet2_smoke/Define.mk @@ -0,0 +1 @@ +../../template/Define.mk \ No newline at end of file diff --git a/test/system/comet2_smoke/Makefile b/test/system/comet2_smoke/Makefile new file mode 120000 index 0000000..4f4e7b0 --- /dev/null +++ b/test/system/comet2_smoke/Makefile @@ -0,0 +1 @@ +../../template/Group.mk \ No newline at end of file diff --git a/test/system/comet2_smoke/Test.mk b/test/system/comet2_smoke/Test.mk new file mode 120000 index 0000000..ada05aa --- /dev/null +++ b/test/system/comet2_smoke/Test.mk @@ -0,0 +1 @@ +../../template/Test.mk \ No newline at end of file diff --git a/test/system/comet2/direct/0.txt b/test/system/comet2_smoke/direct/0.txt similarity index 100% rename from test/system/comet2/direct/0.txt rename to test/system/comet2_smoke/direct/0.txt diff --git a/test/system/comet2/err_206/Makefile b/test/system/comet2_smoke/direct/Makefile similarity index 100% rename from test/system/comet2/err_206/Makefile rename to test/system/comet2_smoke/direct/Makefile diff --git a/test/system/comet2/direct/cmd b/test/system/comet2_smoke/direct/cmd similarity index 100% rename from test/system/comet2/direct/cmd rename to test/system/comet2_smoke/direct/cmd diff --git a/test/system/comet2/direct/create_a.c b/test/system/comet2_smoke/direct/create_a.c similarity index 100% rename from test/system/comet2/direct/create_a.c rename to test/system/comet2_smoke/direct/create_a.c diff --git a/test/system/comet2/direct/desc.txt b/test/system/comet2_smoke/direct/desc.txt similarity index 100% rename from test/system/comet2/direct/desc.txt rename to test/system/comet2_smoke/direct/desc.txt diff --git a/test/system/comet2/hello/0.txt b/test/system/comet2_smoke/hello/0.txt similarity index 100% rename from test/system/comet2/hello/0.txt rename to test/system/comet2_smoke/hello/0.txt diff --git a/test/system/comet2/opt_v/Makefile b/test/system/comet2_smoke/hello/Makefile similarity index 100% rename from test/system/comet2/opt_v/Makefile rename to test/system/comet2_smoke/hello/Makefile diff --git a/test/system/comet2_smoke/hello/cmd b/test/system/comet2_smoke/hello/cmd new file mode 100755 index 0000000..f679005 --- /dev/null +++ b/test/system/comet2_smoke/hello/cmd @@ -0,0 +1,3 @@ +../../../../casl2 -O ../../../../as/sample/hello.casl +../../../../comet2 a.o +rm -f a.o