命令テストの整理

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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
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 (symlink)
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 (file)
--- 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 = <teststr.txt
-CMD = $(CASL2) $(CASL2FLAG) $(ASFILE) $(IN)
+IN = teststr.txt
+CMD = $(CASL2) $(ASFILE) <$(IN)
 include ../TEST.mk

diff --git a/test/integration/casl2/lib_inl/#0.txt# b/test/integration/casl2/lib_inl/#0.txt#
deleted file mode 100644 (file)
index e888dde..0000000
--- a/test/integration/casl2/lib_inl/#0.txt#
+++ /dev/null
@@ -1,15 +0,0 @@
-../../../../casl2 ../../../../as/casl2lib_driver/inl.casl ../../../../as/casl2lib/inl.casl ../../../../as/casl2lib/outl.casl
-0
-1
-2
-10
-12
-32767
-32768
-65535
-0
-18000
-Not A Number
-Not A Number
-Not A Number
-g
\ No newline at end of file

diff --git a/test/integration/casl2/lib_inl/.#0.txt b/test/integration/casl2/lib_inl/.#0.txt
deleted file mode 120000 (symlink)
index 5d881fb..0000000
--- a/test/integration/casl2/lib_inl/.#0.txt
+++ /dev/null
@@ -1 +0,0 @@
-kazubito@horse.j8takagi.net.13917:1265068188
\ No newline at end of file

diff --git a/test/integration/casl2/lib_inl/0.txt b/test/integration/casl2/lib_inl/0.txt
index 20938f4..867f4f3 100644 (file)
--- a/test/integration/casl2/lib_inl/0.txt
+++ b/test/integration/casl2/lib_inl/0.txt
@@ -12,3 +12,4 @@
 Not A Number
 Not A Number
 Not A Number
+g