From e90ae6766bac6e16a608ea7b31eb9d8a5924b83c Mon Sep 17 00:00:00 2001 From: j8takagi Date: Mon, 8 Feb 2010 03:38:10 +0900 Subject: [PATCH] =?utf8?q?=E5=91=BD=E4=BB=A4=E3=83=86=E3=82=B9=E3=83=88?= =?utf8?q?=E3=81=AE=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- as/cmd/ADDL/{addl.casl => addl1.casl} | 0 as/cmd/AND/and0_s.casl | 7 +++++++ as/cmd/AND/and0_z.casl | 7 +++++++ as/cmd/AND/and1_s.casl | 8 ++++++++ as/cmd/AND/and1_z.casl | 8 ++++++++ as/cmd/CALL/call0.casl | 7 ++----- as/cmd/CALL/call1.casl | 8 ++------ as/cmd/{ => IN}/in_out.casl | 0 as/cmd/OUT/out1.casl | 4 ++-- test/integration/casl2/cmd_out1/0.txt | 6 ++++-- test/integration/casl2/iotest/#Makefile# | 6 ------ test/integration/casl2/iotest/.#Makefile | 1 - test/integration/casl2/iotest/Makefile | 5 ++--- test/integration/casl2/lib_inl/#0.txt# | 15 --------------- test/integration/casl2/lib_inl/.#0.txt | 1 - test/integration/casl2/lib_inl/0.txt | 1 + 16 files changed, 43 insertions(+), 41 deletions(-) rename as/cmd/ADDL/{addl.casl => addl1.casl} (100%) create mode 100644 as/cmd/AND/and0_s.casl create mode 100644 as/cmd/AND/and0_z.casl create mode 100644 as/cmd/AND/and1_s.casl create mode 100644 as/cmd/AND/and1_z.casl rename as/cmd/{ => IN}/in_out.casl (100%) delete mode 100644 test/integration/casl2/iotest/#Makefile# delete mode 120000 test/integration/casl2/iotest/.#Makefile delete mode 100644 test/integration/casl2/lib_inl/#0.txt# delete mode 120000 test/integration/casl2/lib_inl/.#0.txt diff --git a/as/cmd/ADDL/addl.casl b/as/cmd/ADDL/addl1.casl similarity index 100% rename from as/cmd/ADDL/addl.casl rename to as/cmd/ADDL/addl1.casl diff --git a/as/cmd/AND/and0_s.casl b/as/cmd/AND/and0_s.casl new file mode 100644 index 0000000..bfbd457 --- /dev/null +++ b/as/cmd/AND/and0_s.casl @@ -0,0 +1,7 @@ +MAIN START + LD GR1,A + AND GR1,B + RET +A DC #8000 +B DC #FFFF + END diff --git a/as/cmd/AND/and0_z.casl b/as/cmd/AND/and0_z.casl new file mode 100644 index 0000000..64270ec --- /dev/null +++ b/as/cmd/AND/and0_z.casl @@ -0,0 +1,7 @@ +MAIN START + LD GR1,A + AND GR1,B + RET +A DC #0001 +B DC #FFFE + END diff --git a/as/cmd/AND/and1_s.casl b/as/cmd/AND/and1_s.casl new file mode 100644 index 0000000..ad41d24 --- /dev/null +++ b/as/cmd/AND/and1_s.casl @@ -0,0 +1,8 @@ +MAIN START + LD GR1,A + LD GR2,B + AND GR1,GR2 + RET +A DC #8000 +B DC #FFFF + END diff --git a/as/cmd/AND/and1_z.casl b/as/cmd/AND/and1_z.casl new file mode 100644 index 0000000..1135b54 --- /dev/null +++ b/as/cmd/AND/and1_z.casl @@ -0,0 +1,8 @@ +MAIN START + LD GR1,A + LD GR2,B + AND GR1,GR2 + RET +A DC #1 +B DC #FFFE + END diff --git a/as/cmd/CALL/call0.casl b/as/cmd/CALL/call0.casl index bcd9543..d6a6a40 100644 --- a/as/cmd/CALL/call0.casl +++ b/as/cmd/CALL/call0.casl @@ -1,10 +1,7 @@ -MAIN START BEGIN -BEGIN LD GR1,A +MAIN START + LAD GR1,29 CALL COPY - ST GR2,B RET -A DC 29 -B DS 1 END COPY START LD GR2,GR1 diff --git a/as/cmd/CALL/call1.casl b/as/cmd/CALL/call1.casl index f0282ca..bc420fb 100644 --- a/as/cmd/CALL/call1.casl +++ b/as/cmd/CALL/call1.casl @@ -1,11 +1,7 @@ MAIN START BEGIN -BEGIN LD GR1,=29 +BEGIN LAD GR1,29 CALL COPY - ST GR2,B RET -B DS 1 - END -COPY START - LD GR2,GR1 +COPY LD GR2,GR1 RET END diff --git a/as/cmd/in_out.casl b/as/cmd/IN/in_out.casl similarity index 100% rename from as/cmd/in_out.casl rename to as/cmd/IN/in_out.casl diff --git a/as/cmd/OUT/out1.casl b/as/cmd/OUT/out1.casl index d7266b0..f69b72a 100644 --- a/as/cmd/OUT/out1.casl +++ b/as/cmd/OUT/out1.casl @@ -5,8 +5,8 @@ OTEST START OUT BUF3,L3 OUT BUF4,L4 RET -BUF1 DC 9,10 ; TAB、改行 -L1 DC 2 +BUF1 DC '0',9,'1',10 ; TAB、改行 +L1 DC 4 BUF2 DC ' !"#$%&''()*+,-./0123456789:;<=>?' L2 DC 32 BUF3 DC '@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_' diff --git a/test/integration/casl2/cmd_out1/0.txt b/test/integration/casl2/cmd_out1/0.txt index 739adba..5a973a9 100644 --- a/test/integration/casl2/cmd_out1/0.txt +++ b/test/integration/casl2/cmd_out1/0.txt @@ -1,4 +1,6 @@ ../../../../casl2 ../../../../as/cmd/OUT/out1.casl -Assemble error - 123: ' !"#$%&''()*+,-./0123456789:: illegal string - ../../../../as/cmd/OUT/out1.casl:10: BUF2 DC ' !"#$%&''()*+,-./0123456789:;<=>?' +0 1 + !"#$%&'()*+,-./0123456789:;<=>? +@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_ +`abcdefghijklmnopqrstuvwxyz{|}~ diff --git a/test/integration/casl2/iotest/#Makefile# b/test/integration/casl2/iotest/#Makefile# deleted file mode 100644 index 3aa55d8..0000000 --- a/test/integration/casl2/iotest/#Makefile# +++ /dev/null @@ -1,6 +0,0 @@ -include ../CMD.mk # YACASL2DIR, CASL2 -ASDIR = $(YACASL2DIR)/as/FUNC -ASFILE = $(ASDIR)/iotest.casl -IN = teststr.txt -CMD = $(CASL2) $(ASFILE) <$(IN) -include ../TEST.mk diff --git a/test/integration/casl2/iotest/.#Makefile b/test/integration/casl2/iotest/.#Makefile deleted file mode 120000 index 5d881fb..0000000 --- a/test/integration/casl2/iotest/.#Makefile +++ /dev/null @@ -1 +0,0 @@ -kazubito@horse.j8takagi.net.13917:1265068188 \ No newline at end of file diff --git a/test/integration/casl2/iotest/Makefile b/test/integration/casl2/iotest/Makefile index 05ff369..3aa55d8 100644 --- a/test/integration/casl2/iotest/Makefile +++ b/test/integration/casl2/iotest/Makefile @@ -1,7 +1,6 @@ include ../CMD.mk # YACASL2DIR, CASL2 -CASL2FLAG = -sla ASDIR = $(YACASL2DIR)/as/FUNC ASFILE = $(ASDIR)/iotest.casl -IN =