From 8aa7ec78eb2670d38c077efa8a013d27fe38c19c Mon Sep 17 00:00:00 2001 From: j8takagi Date: Mon, 4 Apr 2011 00:34:09 +0900 Subject: [PATCH] =?utf8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE=E6=95=B4?= =?utf8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- as/cmd/ADDA/{adda2.casl => adda2_0.casl} | 4 +- as/cmd/ADDA/adda_r1_r2.casl | 83 + as/cmd/ADDA/{adda1.casl => adda_r_adr_x.casl} | 0 as/err/err_201.casl | 11 +- as/err/err_202.casl | 8 +- as/err/err_203.casl | 7 +- as/err/err_204.casl | 5 - as/err/err_205.casl | 8 - as/err/err_206.casl | 5 - as/err/err_207.casl | 2 +- as/err/err_208.casl | 7 + as/err/err_209.casl | 7 + as/err/err_210.casl | 10 + test/system/casl2/cmd_ADDA_adda1/cmd | 2 - test/system/casl2/cmd_ADDA_adda2/0.txt | 96 - test/system/casl2/cmd_ADDA_adda2/cmd | 2 - test/system/casl2/cmd_ADDA_r1_r2/0.txt | 2107 +++++++++++++++++ .../Makefile | 0 test/system/casl2/cmd_ADDA_r1_r2/cmd | 3 + .../0.txt | 22 +- .../Makefile | 0 test/system/casl2/cmd_ADDA_r_adr_x/cmd | 2 + test/system/comet2/err_201/0.txt | 2 +- test/system/comet2/err_201/desc.txt | 1 + test/system/comet2/err_202/0.txt | 2 +- test/system/comet2/err_202/cmd | 2 +- test/system/comet2/err_202/desc.txt | 1 + test/system/comet2/err_203/0.txt | 3 +- test/system/comet2/err_203/cmd | 2 +- test/system/comet2/err_203/desc.txt | 1 + test/system/comet2/err_204/0.txt | 2 +- test/system/comet2/err_204/Makefile | 21 + test/system/comet2/err_204/cmd | 4 +- .../comet2/{err_210 => err_204}/create_a.c | 0 test/system/comet2/err_204/desc.txt | 1 + test/system/comet2/err_205/0.txt | 1 - test/system/comet2/err_205/cmd | 3 - test/system/comet2/err_206/0.txt | 1 - test/system/comet2/err_206/Makefile | 2 - test/system/comet2/err_206/cmd | 3 - test/system/comet2/err_207/0.txt | 1 - test/system/comet2/err_207/Makefile | 2 - test/system/comet2/err_207/cmd | 3 - test/system/comet2/err_208/0.txt | 2 +- test/system/comet2/err_208/cmd | 3 +- .../comet2/{err_202 => err_208}/teststr.txt | 0 test/system/comet2/err_209/0.txt | 1 - test/system/comet2/err_209/Makefile | 23 - test/system/comet2/err_209/cmd | 1 - test/system/comet2/err_209/create_a.c | 22 - test/system/comet2/err_209/desc.txt | 1 - test/system/comet2/err_210/0.txt | 1 - test/system/comet2/err_210/Makefile | 23 - test/system/comet2/err_210/cmd | 1 - test/system/comet2/err_210/desc.txt | 1 - test/system/comet2/err_211/0.txt | 1 + .../comet2/{err_205 => err_211}/Makefile | 0 test/system/comet2/err_211/cmd | 2 + 58 files changed, 2281 insertions(+), 250 deletions(-) rename as/cmd/ADDA/{adda2.casl => adda2_0.casl} (70%) create mode 100644 as/cmd/ADDA/adda_r1_r2.casl rename as/cmd/ADDA/{adda1.casl => adda_r_adr_x.casl} (100%) delete mode 100644 as/err/err_204.casl delete mode 100644 as/err/err_205.casl delete mode 100644 as/err/err_206.casl create mode 100644 as/err/err_208.casl create mode 100644 as/err/err_209.casl create mode 100644 as/err/err_210.casl delete mode 100755 test/system/casl2/cmd_ADDA_adda1/cmd delete mode 100644 test/system/casl2/cmd_ADDA_adda2/0.txt delete mode 100755 test/system/casl2/cmd_ADDA_adda2/cmd create mode 100644 test/system/casl2/cmd_ADDA_r1_r2/0.txt rename test/system/casl2/{cmd_ADDA_adda1 => cmd_ADDA_r1_r2}/Makefile (100%) create mode 100755 test/system/casl2/cmd_ADDA_r1_r2/cmd rename test/system/casl2/{cmd_ADDA_adda1 => cmd_ADDA_r_adr_x}/0.txt (81%) rename test/system/casl2/{cmd_ADDA_adda2 => cmd_ADDA_r_adr_x}/Makefile (100%) create mode 100755 test/system/casl2/cmd_ADDA_r_adr_x/cmd create mode 100644 test/system/comet2/err_201/desc.txt create mode 100644 test/system/comet2/err_202/desc.txt create mode 100644 test/system/comet2/err_203/desc.txt rename test/system/comet2/{err_210 => err_204}/create_a.c (100%) create mode 100644 test/system/comet2/err_204/desc.txt delete mode 100644 test/system/comet2/err_205/0.txt delete mode 100755 test/system/comet2/err_205/cmd delete mode 100644 test/system/comet2/err_206/0.txt delete mode 100644 test/system/comet2/err_206/Makefile delete mode 100755 test/system/comet2/err_206/cmd delete mode 100644 test/system/comet2/err_207/0.txt delete mode 100644 test/system/comet2/err_207/Makefile delete mode 100755 test/system/comet2/err_207/cmd rename test/system/comet2/{err_202 => err_208}/teststr.txt (100%) delete mode 100644 test/system/comet2/err_209/0.txt delete mode 100644 test/system/comet2/err_209/Makefile delete mode 100755 test/system/comet2/err_209/cmd delete mode 100644 test/system/comet2/err_209/create_a.c delete mode 100644 test/system/comet2/err_209/desc.txt delete mode 100644 test/system/comet2/err_210/0.txt delete mode 100644 test/system/comet2/err_210/Makefile delete mode 100755 test/system/comet2/err_210/cmd delete mode 100644 test/system/comet2/err_210/desc.txt create mode 100644 test/system/comet2/err_211/0.txt rename test/system/comet2/{err_205 => err_211}/Makefile (100%) create mode 100755 test/system/comet2/err_211/cmd diff --git a/as/cmd/ADDA/adda2.casl b/as/cmd/ADDA/adda2_0.casl similarity index 70% rename from as/cmd/ADDA/adda2.casl rename to as/cmd/ADDA/adda2_0.casl index eee6ad5..5b8c872 100644 --- a/as/cmd/ADDA/adda2.casl +++ b/as/cmd/ADDA/adda2_0.casl @@ -1,8 +1,8 @@ ;;; ADDA r1,r2 MAIN START BEGIN LD GR1,A - LD GR2,B - ADDA GR1,GR2 + LD GR0,B + ADDA GR1,GR0 RET A DC 3 B DC 1 diff --git a/as/cmd/ADDA/adda_r1_r2.casl b/as/cmd/ADDA/adda_r1_r2.casl new file mode 100644 index 0000000..af7364b --- /dev/null +++ b/as/cmd/ADDA/adda_r1_r2.casl @@ -0,0 +1,83 @@ +;;; ADDA r1,r2 +MAIN START +BEGIN LAD GR1,1 + LAD GR2,1 + LAD GR3,1 + LAD GR4,1 + LAD GR5,1 + LAD GR6,1 + LAD GR7,1 + LAD GR0,1 + ADDA GR1,GR1 + ADDA GR1,GR2 + ADDA GR1,GR3 + ADDA GR1,GR4 + ADDA GR1,GR5 + ADDA GR1,GR6 + ADDA GR1,GR7 + LAD GR1,1 + ADDA GR2,GR0 + ADDA GR2,GR1 + ADDA GR2,GR2 + ADDA GR2,GR3 + ADDA GR2,GR4 + ADDA GR2,GR5 + ADDA GR2,GR6 + ADDA GR2,GR7 + ADDA GR2,GR0 + LAD GR2,1 + ADDA GR3,GR1 + ADDA GR3,GR2 + ADDA GR3,GR3 + ADDA GR3,GR4 + ADDA GR3,GR5 + ADDA GR3,GR6 + ADDA GR3,GR7 + ADDA GR3,GR0 + LAD GR3,1 + ADDA GR4,GR1 + ADDA GR4,GR2 + ADDA GR4,GR3 + ADDA GR4,GR4 + ADDA GR4,GR5 + ADDA GR4,GR6 + ADDA GR4,GR7 + ADDA GR4,GR0 + LAD GR4,1 + ADDA GR5,GR1 + ADDA GR5,GR2 + ADDA GR5,GR3 + ADDA GR5,GR4 + ADDA GR5,GR5 + ADDA GR5,GR6 + ADDA GR5,GR7 + ADDA GR5,GR0 + LAD GR5,1 + ADDA GR6,GR1 + ADDA GR6,GR2 + ADDA GR6,GR3 + ADDA GR6,GR4 + ADDA GR6,GR5 + ADDA GR6,GR6 + ADDA GR6,GR7 + ADDA GR6,GR0 + LAD GR6,1 + ADDA GR7,GR1 + ADDA GR7,GR2 + ADDA GR7,GR3 + ADDA GR7,GR4 + ADDA GR7,GR5 + ADDA GR7,GR6 + ADDA GR7,GR7 + ADDA GR7,GR0 + LAD GR7,1 + ADDA GR0,GR1 + ADDA GR0,GR2 + ADDA GR0,GR3 + ADDA GR0,GR4 + ADDA GR0,GR5 + ADDA GR0,GR6 + ADDA GR0,GR7 + ADDA GR0,GR0 + RET + END diff --git a/as/cmd/ADDA/adda1.casl b/as/cmd/ADDA/adda_r_adr_x.casl similarity index 100% rename from as/cmd/ADDA/adda1.casl rename to as/cmd/ADDA/adda_r_adr_x.casl diff --git a/as/err/err_201.casl b/as/err/err_201.casl index 5e52d1b..00f0bcb 100644 --- a/as/err/err_201.casl +++ b/as/err/err_201.casl @@ -1,10 +1,5 @@ -;;; casl2 -O err_201.casl && comet2 -M8 a.o +;;; casl2 -M8 err_201.casl MAIN START - LD GR0,A - LD GR0,B - LD GR0,C - RET -A DC 7 -B DC -7 -C DC 0 + JUMP #FFFF +FIN RET END diff --git a/as/err/err_202.casl b/as/err/err_202.casl index 789c272..af6d57e 100644 --- a/as/err/err_202.casl +++ b/as/err/err_202.casl @@ -1,7 +1,5 @@ -;;; casl2 -M32 err_202.casl /dev/null && ../../../../comet2 a.comet diff --git a/test/system/comet2/err_210/create_a.c b/test/system/comet2/err_204/create_a.c similarity index 100% rename from test/system/comet2/err_210/create_a.c rename to test/system/comet2/err_204/create_a.c diff --git a/test/system/comet2/err_204/desc.txt b/test/system/comet2/err_204/desc.txt new file mode 100644 index 0000000..320626e --- /dev/null +++ b/test/system/comet2/err_204/desc.txt @@ -0,0 +1 @@ +エラー204発生のテスト diff --git a/test/system/comet2/err_205/0.txt b/test/system/comet2/err_205/0.txt deleted file mode 100644 index e7e8008..0000000 --- a/test/system/comet2/err_205/0.txt +++ /dev/null @@ -1 +0,0 @@ -Execute error - 205: PR:#000E: Stack Pointer (SP) - cannot allocate stack buffer diff --git a/test/system/comet2/err_205/cmd b/test/system/comet2/err_205/cmd deleted file mode 100755 index 53f6235..0000000 --- a/test/system/comet2/err_205/cmd +++ /dev/null @@ -1,3 +0,0 @@ -../../../../casl2 -O ../../../../as/err/err_205.casl -../../../../comet2 -M32 a.o -rm -f a.o diff --git a/test/system/comet2/err_206/0.txt b/test/system/comet2/err_206/0.txt deleted file mode 100644 index d492496..0000000 --- a/test/system/comet2/err_206/0.txt +++ /dev/null @@ -1 +0,0 @@ -Execute error - 206: PR:#0001: Address - out of COMET II memory diff --git a/test/system/comet2/err_206/Makefile b/test/system/comet2/err_206/Makefile deleted file mode 100644 index b6dac59..0000000 --- a/test/system/comet2/err_206/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -include ../Define.mk -include ../Test.mk diff --git a/test/system/comet2/err_206/cmd b/test/system/comet2/err_206/cmd deleted file mode 100755 index cd9fd9d..0000000 --- a/test/system/comet2/err_206/cmd +++ /dev/null @@ -1,3 +0,0 @@ -../../../../casl2 -O ../../../../as/err/err_206.casl -../../../../comet2 -M8 a.o -rm -f a.o diff --git a/test/system/comet2/err_207/0.txt b/test/system/comet2/err_207/0.txt deleted file mode 100644 index a9d4b78..0000000 --- a/test/system/comet2/err_207/0.txt +++ /dev/null @@ -1 +0,0 @@ -Execute error - 207: PR:#0001: Stack Pointer (SP) - out of COMET II memory diff --git a/test/system/comet2/err_207/Makefile b/test/system/comet2/err_207/Makefile deleted file mode 100644 index b6dac59..0000000 --- a/test/system/comet2/err_207/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -include ../Define.mk -include ../Test.mk diff --git a/test/system/comet2/err_207/cmd b/test/system/comet2/err_207/cmd deleted file mode 100755 index 5cf37f1..0000000 --- a/test/system/comet2/err_207/cmd +++ /dev/null @@ -1,3 +0,0 @@ -../../../../casl2 -O ../../../../as/err/err_207.casl -../../../../comet2 -M8 a.o -rm -f a.o diff --git a/test/system/comet2/err_208/0.txt b/test/system/comet2/err_208/0.txt index e3cbe60..ab0ed76 100644 --- a/test/system/comet2/err_208/0.txt +++ b/test/system/comet2/err_208/0.txt @@ -1 +1 @@ -comet2 error - 208: object file is not specified +Execute error - 202: SVC input - out of Input memory diff --git a/test/system/comet2/err_208/cmd b/test/system/comet2/err_208/cmd index 530ea30..fec741a 100755 --- a/test/system/comet2/err_208/cmd +++ b/test/system/comet2/err_208/cmd @@ -1,2 +1,3 @@ -../../../../comet2 -M8 +../../../../casl2 -O ../../../../as/err/err_202.casl +../../../../comet2 -M32 a.o /dev/null && ../../../../comet2 a.comet diff --git a/test/system/comet2/err_209/create_a.c b/test/system/comet2/err_209/create_a.c deleted file mode 100644 index 4621506..0000000 --- a/test/system/comet2/err_209/create_a.c +++ /dev/null @@ -1,22 +0,0 @@ -#include -#include -#include "cmem.h" -#include "word.h" - -/** - * 引数で指定したファイルにアセンブル結果を書込 - */ -int main() -{ - FILE *fp; - const WORD w[] = {0x1010, 0x0005, 0x220f, 0x0006, 0x8100, 0x0003, 0x0001}; - const char *f = "a.comet"; - - if((fp = fopen(f, "w")) == NULL) { - perror(f); - exit(-1); - } - fwrite(w, sizeof(WORD), ARRAYSIZE(w), fp); - fclose(fp); - return 0; -} diff --git a/test/system/comet2/err_209/desc.txt b/test/system/comet2/err_209/desc.txt deleted file mode 100644 index e06570c..0000000 --- a/test/system/comet2/err_209/desc.txt +++ /dev/null @@ -1 +0,0 @@ -エラー209 "not GR in operand x"の発生 diff --git a/test/system/comet2/err_210/0.txt b/test/system/comet2/err_210/0.txt deleted file mode 100644 index dcaf9a2..0000000 --- a/test/system/comet2/err_210/0.txt +++ /dev/null @@ -1 +0,0 @@ -Execute error - 210: PR:#0002: not command code of COMET II diff --git a/test/system/comet2/err_210/Makefile b/test/system/comet2/err_210/Makefile deleted file mode 100644 index 894b127..0000000 --- a/test/system/comet2/err_210/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -include ../Define.mk -include ../Test.mk - -CC := gcc -CFLAGS := -Wall -INCLUDEDIR := ../../../../include - -.INTERMEDIATE: create_a a.comet - -a.comet: create_a - ./$^ - -create_a: create_a.c - $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^ - -$(CMD_FILE): a.comet - -clean: clean0 - -clean0: - @rm -f create_a - @rm -rf create_a.dSYM - @rm -f a.comet diff --git a/test/system/comet2/err_210/cmd b/test/system/comet2/err_210/cmd deleted file mode 100755 index 3d423e8..0000000 --- a/test/system/comet2/err_210/cmd +++ /dev/null @@ -1 +0,0 @@ -make a.comet >/dev/null && ../../../../comet2 a.comet diff --git a/test/system/comet2/err_210/desc.txt b/test/system/comet2/err_210/desc.txt deleted file mode 100644 index 72445a8..0000000 --- a/test/system/comet2/err_210/desc.txt +++ /dev/null @@ -1 +0,0 @@ -エラー210 "not command code of COMET II"の発生 diff --git a/test/system/comet2/err_211/0.txt b/test/system/comet2/err_211/0.txt new file mode 100644 index 0000000..e3cbe60 --- /dev/null +++ b/test/system/comet2/err_211/0.txt @@ -0,0 +1 @@ +comet2 error - 208: object file is not specified diff --git a/test/system/comet2/err_205/Makefile b/test/system/comet2/err_211/Makefile similarity index 100% rename from test/system/comet2/err_205/Makefile rename to test/system/comet2/err_211/Makefile diff --git a/test/system/comet2/err_211/cmd b/test/system/comet2/err_211/cmd new file mode 100755 index 0000000..530ea30 --- /dev/null +++ b/test/system/comet2/err_211/cmd @@ -0,0 +1,2 @@ +../../../../comet2 -M8 +rm -f a.o -- 2.18.0