comet2monitorのテストを追加

diff --git a/monitor/break_help.monitor b/monitor/break_help.monitor
new file mode 100644 (file)
index 0000000..dac9bf4
--- /dev/null
+++ b/monitor/break_help.monitor
@@ -0,0 +1 @@
+b ?

diff --git a/monitor/break_help_2.monitor b/monitor/break_help_2.monitor
new file mode 100644 (file)
index 0000000..545bf29
--- /dev/null
+++ b/monitor/break_help_2.monitor
@@ -0,0 +1 @@
+b ? 1

diff --git a/monitor/continue_hello.monitor b/monitor/continue_hello.monitor
index b11ad2b..72e1aa1 100644 (file)
--- a/monitor/continue_hello.monitor
+++ b/monitor/continue_hello.monitor
@@ -1,4 +1,4 @@
 l as/sample/hello.o
 d a 0 #22
-T a
+t a
 c

diff --git a/monitor/continue_sum10.monitor b/monitor/continue_sum10.monitor
index c387b82..7d5ea6e 100644 (file)
--- a/monitor/continue_sum10.monitor
+++ b/monitor/continue_sum10.monitor
@@ -1,4 +1,4 @@
 l as/sample/sum_10.o
 d a 0 #18
-T a
+t a
 c

diff --git a/monitor/dump_0.monitor b/monitor/dump_0.monitor
new file mode 100644 (file)
index 0000000..656211a
--- /dev/null
+++ b/monitor/dump_0.monitor
@@ -0,0 +1,2 @@
+l as/sample/sum_10.o
+d

diff --git a/monitor/dump_1.monitor b/monitor/dump_1.monitor
new file mode 100644 (file)
index 0000000..8fb1c85
--- /dev/null
+++ b/monitor/dump_1.monitor
@@ -0,0 +1,2 @@
+l as/sample/sum_10.o
+d 0

diff --git a/monitor/dump_2.monitor b/monitor/dump_2.monitor
new file mode 100644 (file)
index 0000000..2b0239e
--- /dev/null
+++ b/monitor/dump_2.monitor
@@ -0,0 +1,2 @@
+l as/sample/sum_10.o
+d 0 #20

diff --git a/monitor/dump_3.monitor b/monitor/dump_3.monitor
new file mode 100644 (file)
index 0000000..74fa8a4
--- /dev/null
+++ b/monitor/dump_3.monitor
@@ -0,0 +1,2 @@
+l as/sample/sum_10.o
+d 0 #20 #40

diff --git a/monitor/dump_plus.monitor b/monitor/dump_plus.monitor
new file mode 100644 (file)
index 0000000..afbca65
--- /dev/null
+++ b/monitor/dump_plus.monitor
@@ -0,0 +1,2 @@
+l as/sample/sum_10.o
+d 0 +#20

diff --git a/monitor/revert_hello.monitor b/monitor/revert_hello.monitor
index 22f5dd7..f3060e1 100644 (file)
--- a/monitor/revert_hello.monitor
+++ b/monitor/revert_hello.monitor
@@ -1,3 +1,3 @@
 l as/sample/hello.o
-d a 0 #18
+d a 0 #22
 r 0 #22

diff --git a/test/system/comet2monitor/break_help/0.txt b/test/system/comet2monitor/break_help/0.txt
new file mode 100644 (file)
index 0000000..c600c86
--- /dev/null
+++ b/test/system/comet2monitor/break_help/0.txt
@@ -0,0 +1,8 @@
+COMET II machine code monitor. Type ? for help.
+(comet2 monitor) b ?
+breakpoint manipulate:
+    b[reak] a[dd] <address>
+    b[reak] d[el] <address>
+    b[reak] l[ist]
+    b[reak] r[eset]
+(comet2 monitor) 
\ No newline at end of file

diff --git a/test/system/comet2monitor/break_help/Makefile b/test/system/comet2monitor/break_help/Makefile
new file mode 100644 (file)
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/comet2monitor/break_help/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk

diff --git a/test/system/comet2monitor/break_help/cmd b/test/system/comet2monitor/break_help/cmd
new file mode 100755 (executable)
index 0000000..03875a9
--- /dev/null
+++ b/test/system/comet2monitor/break_help/cmd
@@ -0,0 +1 @@
+cd ../../../.. && ./comet2monitor <monitor/break_help.monitor

diff --git a/test/system/comet2monitor/break_help_2/0.txt b/test/system/comet2monitor/break_help_2/0.txt
new file mode 100644 (file)
index 0000000..a4c6974
--- /dev/null
+++ b/test/system/comet2monitor/break_help_2/0.txt
@@ -0,0 +1,8 @@
+COMET II machine code monitor. Type ? for help.
+(comet2 monitor) b ? 1
+breakpoint manipulate:
+    b[reak] a[dd] <address>
+    b[reak] d[el] <address>
+    b[reak] l[ist]
+    b[reak] r[eset]
+(comet2 monitor) 1: ignored.

diff --git a/test/system/comet2monitor/break_help_2/Makefile b/test/system/comet2monitor/break_help_2/Makefile
new file mode 100644 (file)
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/comet2monitor/break_help_2/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk

diff --git a/test/system/comet2monitor/break_help_2/cmd b/test/system/comet2monitor/break_help_2/cmd
new file mode 100755 (executable)
index 0000000..a4ee477
--- /dev/null
+++ b/test/system/comet2monitor/break_help_2/cmd
@@ -0,0 +1 @@
+cd ../../../.. && ./comet2monitor <monitor/break_help_2.monitor

diff --git a/test/system/comet2monitor/dump_0/0.txt b/test/system/comet2monitor/dump_0/0.txt
new file mode 100644 (file)
index 0000000..4604c5a
--- /dev/null
+++ b/test/system/comet2monitor/dump_0/0.txt
@@ -0,0 +1,10 @@
+COMET II machine code monitor. Type ? for help.
+(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) d
+#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
+       -------------------------------------------------------------------------------------
+#0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
+#0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
+#0000: 0020: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+#0000: 0030: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+(comet2 monitor) 
\ No newline at end of file

diff --git a/test/system/comet2monitor/dump_0/Makefile b/test/system/comet2monitor/dump_0/Makefile
new file mode 100644 (file)
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/comet2monitor/dump_0/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk

diff --git a/test/system/comet2monitor/dump_0/cmd b/test/system/comet2monitor/dump_0/cmd
new file mode 100755 (executable)
index 0000000..71536a4
--- /dev/null
+++ b/test/system/comet2monitor/dump_0/cmd
@@ -0,0 +1 @@
+cd ../../../.. && ./comet2monitor <monitor/dump_0.monitor

diff --git a/test/system/comet2monitor/dump_1/0.txt b/test/system/comet2monitor/dump_1/0.txt
new file mode 100644 (file)
index 0000000..1147123
--- /dev/null
+++ b/test/system/comet2monitor/dump_1/0.txt
@@ -0,0 +1,10 @@
+COMET II machine code monitor. Type ? for help.
+(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) d 0
+#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
+       -------------------------------------------------------------------------------------
+#0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
+#0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
+#0000: 0020: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+#0000: 0030: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+(comet2 monitor) 
\ No newline at end of file

diff --git a/test/system/comet2monitor/dump_1/Makefile b/test/system/comet2monitor/dump_1/Makefile
new file mode 100644 (file)
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/comet2monitor/dump_1/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk

diff --git a/test/system/comet2monitor/dump_1/cmd b/test/system/comet2monitor/dump_1/cmd
new file mode 100755 (executable)
index 0000000..5e998f0
--- /dev/null
+++ b/test/system/comet2monitor/dump_1/cmd
@@ -0,0 +1 @@
+cd ../../../.. && ./comet2monitor <monitor/dump_1.monitor

diff --git a/test/system/comet2monitor/dump_2/0.txt b/test/system/comet2monitor/dump_2/0.txt
new file mode 100644 (file)
index 0000000..ceaa504
--- /dev/null
+++ b/test/system/comet2monitor/dump_2/0.txt
@@ -0,0 +1,8 @@
+COMET II machine code monitor. Type ? for help.
+(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) d 0 #20
+#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
+       -------------------------------------------------------------------------------------
+#0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
+#0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
+(comet2 monitor) 
\ No newline at end of file

diff --git a/test/system/comet2monitor/dump_2/Makefile b/test/system/comet2monitor/dump_2/Makefile
new file mode 100644 (file)
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/comet2monitor/dump_2/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk

diff --git a/test/system/comet2monitor/dump_2/cmd b/test/system/comet2monitor/dump_2/cmd
new file mode 100755 (executable)
index 0000000..3c4614c
--- /dev/null
+++ b/test/system/comet2monitor/dump_2/cmd
@@ -0,0 +1 @@
+cd ../../../.. && ./comet2monitor <monitor/dump_2.monitor

diff --git a/test/system/comet2monitor/dump_3/0.txt b/test/system/comet2monitor/dump_3/0.txt
new file mode 100644 (file)
index 0000000..3804f53
--- /dev/null
+++ b/test/system/comet2monitor/dump_3/0.txt
@@ -0,0 +1,8 @@
+COMET II machine code monitor. Type ? for help.
+(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) d 0 #20 #40
+#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
+       -------------------------------------------------------------------------------------
+#0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
+#0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
+(comet2 monitor) #40: ignored.

diff --git a/test/system/comet2monitor/dump_3/Makefile b/test/system/comet2monitor/dump_3/Makefile
new file mode 100644 (file)
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/comet2monitor/dump_3/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk

diff --git a/test/system/comet2monitor/dump_3/cmd b/test/system/comet2monitor/dump_3/cmd
new file mode 100755 (executable)
index 0000000..964742e
--- /dev/null
+++ b/test/system/comet2monitor/dump_3/cmd
@@ -0,0 +1 @@
+cd ../../../.. && ./comet2monitor <monitor/dump_3.monitor

diff --git a/test/system/comet2monitor/dump_plus/0.txt b/test/system/comet2monitor/dump_plus/0.txt
new file mode 100644 (file)
index 0000000..cd908e6
--- /dev/null
+++ b/test/system/comet2monitor/dump_plus/0.txt
@@ -0,0 +1,8 @@
+COMET II machine code monitor. Type ? for help.
+(comet2 monitor) l as/sample/sum_10.o
+(comet2 monitor) d 0 +#20
+#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
+       -------------------------------------------------------------------------------------
+#0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
+#0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
+(comet2 monitor) 
\ No newline at end of file

diff --git a/test/system/comet2monitor/dump_plus/Makefile b/test/system/comet2monitor/dump_plus/Makefile
new file mode 100644 (file)
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/comet2monitor/dump_plus/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk

diff --git a/test/system/comet2monitor/dump_plus/cmd b/test/system/comet2monitor/dump_plus/cmd
new file mode 100755 (executable)
index 0000000..ef72b21
--- /dev/null
+++ b/test/system/comet2monitor/dump_plus/cmd
@@ -0,0 +1 @@
+cd ../../../.. && ./comet2monitor <monitor/dump_plus.monitor

diff --git a/test/system/comet2monitor/load/0.txt b/test/system/comet2monitor/load/0.txt
index bde1136..4604c5a 100644 (file)
--- a/test/system/comet2monitor/load/0.txt
+++ b/test/system/comet2monitor/load/0.txt
@@ -1,4 +1,10 @@
 COMET II machine code monitor. Type ? for help.
 (comet2 monitor) l as/sample/sum_10.o
 (comet2 monitor) d
+#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
+       -------------------------------------------------------------------------------------
+#0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
+#0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
+#0000: 0020: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+#0000: 0030: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
 (comet2 monitor) 
\ No newline at end of file

diff --git a/test/system/comet2monitor/revert_hello/0.txt b/test/system/comet2monitor/revert_hello/0.txt
new file mode 100644 (file)
index 0000000..da5b1d9
--- /dev/null
+++ b/test/system/comet2monitor/revert_hello/0.txt
@@ -0,0 +1,37 @@
+COMET II machine code monitor. Type ? for help.
+(comet2 monitor) l as/sample/hello.o
+(comet2 monitor) d a 0 #22
+#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
+       -------------------------------------------------------------------------------------
+#0000: 0000: 7001 0000 7002 0000 1210 0013 1220 0020 F000 0002 1210 0021 1220 0022 F000 0002
+#0000: 0010: 7120 7110 8100 0048 0065 006C 006C 006F 002C 0020 0057 006F 0072 006C 0064 0021
+#0000: 0020: 000D 000A
+(comet2 monitor) r 0 #22
+        PUSH    #0000,GR1       ; #0000: #7001 #0000
+        PUSH    #0000,GR2       ; #0002: #7002 #0000
+        LAD     GR1,#0013       ; #0004: #1210 #0013
+        LAD     GR2,#0020       ; #0006: #1220 #0020
+        SVC     #0002           ; #0008: #F000 #0002
+        LAD     GR1,#0021       ; #000A: #1210 #0021
+        LAD     GR2,#0022       ; #000C: #1220 #0022
+        SVC     #0002           ; #000E: #F000 #0002
+        POP     GR2             ; #0010: #7120
+        POP     GR1             ; #0011: #7110
+        RET                     ; #0012: #8100
+        DC      72              ; #0013: #0048 ::    72 = #0048 = 0000000001001000 = 'H'
+        DC      101             ; #0014: #0065 ::   101 = #0065 = 0000000001100101 = 'e'
+        DC      108             ; #0015: #006C ::   108 = #006C = 0000000001101100 = 'l'
+        DC      108             ; #0016: #006C ::   108 = #006C = 0000000001101100 = 'l'
+        DC      111             ; #0017: #006F ::   111 = #006F = 0000000001101111 = 'o'
+        DC      44              ; #0018: #002C ::    44 = #002C = 0000000000101100 = ','
+        DC      32              ; #0019: #0020 ::    32 = #0020 = 0000000000100000 = ' '
+        DC      87              ; #001A: #0057 ::    87 = #0057 = 0000000001010111 = 'W'
+        DC      111             ; #001B: #006F ::   111 = #006F = 0000000001101111 = 'o'
+        DC      114             ; #001C: #0072 ::   114 = #0072 = 0000000001110010 = 'r'
+        DC      108             ; #001D: #006C ::   108 = #006C = 0000000001101100 = 'l'
+        DC      100             ; #001E: #0064 ::   100 = #0064 = 0000000001100100 = 'd'
+        DC      33              ; #001F: #0021 ::    33 = #0021 = 0000000000100001 = '!'
+        DC      13              ; #0020: #000D ::    13 = #000D = 0000000000001101
+        DC      10              ; #0021: #000A ::    10 = #000A = 0000000000001010 = '\n'
+        DC      1               ; #0022: #0001 ::     1 = #0001 = 0000000000000001
+(comet2 monitor) 
\ No newline at end of file

diff --git a/test/system/comet2monitor/revert_hello/Makefile b/test/system/comet2monitor/revert_hello/Makefile
new file mode 100644 (file)
index 0000000..b6dac59
--- /dev/null
+++ b/test/system/comet2monitor/revert_hello/Makefile
@@ -0,0 +1,2 @@
+include ../Define.mk
+include ../Test.mk

diff --git a/test/system/comet2monitor/revert_hello/cmd b/test/system/comet2monitor/revert_hello/cmd
new file mode 100755 (executable)
index 0000000..6df0c0d
--- /dev/null
+++ b/test/system/comet2monitor/revert_hello/cmd
@@ -0,0 +1 @@
+cd ../../../.. && ./comet2monitor <monitor/revert_hello.monitor