From d56a22079e0d82c6a8b46b33604595bbfd84bf5b Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 25 Aug 2007 16:35:04 +0100 Subject: [PATCH] convert many more test cases --- ships/Debug.ship | 5 ++-- ships/Fifo.ship | 3 +- ships/Halt.ship | 2 +- ships/Lut3.ship | 27 ++++++++--------- ships/Stack.ship | 13 ++++---- tests/literals/negative-absolute-literals.fleet | 6 ++-- tests/memory/memory-test.fleet | 35 +++++++++++----------- tests/pump/kill-only-standing-instructions.fleet | 12 +++++--- tests/pump/test-count.fleet | 6 ++-- tests/recycle/test-recycle-expire.fleet | 8 +++-- tests/recycle/test-recycle.fleet | 7 +++-- 11 files changed, 69 insertions(+), 55 deletions(-) diff --git a/ships/Debug.ship b/ships/Debug.ship index b1f1c17..360997d 100644 --- a/ships/Debug.ship +++ b/ships/Debug.ship @@ -50,8 +50,9 @@ endmodule #ship debug : Debug -25: sendto debug.in; -debug.in: take, deliver; +debug.in: + literal 25; + deliver; == Contributors ========================================================= Adam Megacz diff --git a/ships/Fifo.ship b/ships/Fifo.ship index a8fa3c8..0b93764 100644 --- a/ships/Fifo.ship +++ b/ships/Fifo.ship @@ -28,8 +28,9 @@ data out: out #ship fifo : Fifo debug.in: [*] take, deliver; -9: sendto fifo.in; fifo.in: + literal 9; + deliver; [100] take, deliver; fifo.out: [99] take, sendto fifo.in; diff --git a/ships/Halt.ship b/ships/Halt.ship index 35b1eff..9d2b69f 100644 --- a/ships/Halt.ship +++ b/ships/Halt.ship @@ -25,7 +25,7 @@ public void service() { #skip #ship debug : Debug #expect 0 -0: sendto debug.in; + == Contributors ========================================================= diff --git a/ships/Lut3.ship b/ships/Lut3.ship index 615e101..3692f7b 100644 --- a/ships/Lut3.ship +++ b/ships/Lut3.ship @@ -370,26 +370,21 @@ under input {\tt in3}. #ship lut : Lut3 #ship alu : Alu1 -// constant inputs -85: sendto lut.in1; -51: sendto lut.in2; -15: sendto lut.in3; - -lut.in1: take; [*] deliver; -lut.in2: take; [*] deliver; -lut.in3: take; [*] deliver; -lut.inLut: [*] take, deliver; +lut.in1: literal 85; [*] deliver; +lut.in2: literal 51; [*] deliver; +lut.in3: literal 15; [*] deliver; lut.out: [*] take, sendto debug.in; // cycle through truth tables using alu as INC -1: sendto alu.inOp; alu.inOp: - take; + literal 1; [120] deliver; [120] deliver; [15] deliver; -alu.in: [*] take, deliver; -0: sendto alu.in; +alu.in: + literal 0; + deliver; + [*] take, deliver; alu.out: [*] nop; (*) wait, take, sendto lut.inLut; @@ -399,8 +394,10 @@ alu.out: // acks from debug ship trigger new truth tables debug.in: [*] take, deliver, notify alu.out; -// kickoff -0: sendto lut.inLut; +lut.inLut: + literal 0; + deliver; + [*] take, deliver; diff --git a/ships/Stack.ship b/ships/Stack.ship index 851607c..7febad6 100644 --- a/ships/Stack.ship +++ b/ships/Stack.ship @@ -72,15 +72,16 @@ process any new {\tt pop} operations. #expect 0 debug.in: [*] take, deliver; -stack.push: [5] take, deliver; notify stack.pop; stack.pop: wait; [*] take, sendto debug.in; -0: sendto stack.push; -1: sendto stack.push; -2: sendto stack.push; -3: sendto stack.push; -4: sendto stack.push; +stack.push: + literal 0; deliver; + literal 1; deliver; + literal 2; deliver; + literal 3; deliver; + literal 4; deliver; + notify stack.pop; diff --git a/tests/literals/negative-absolute-literals.fleet b/tests/literals/negative-absolute-literals.fleet index 5428482..5c73e84 100644 --- a/tests/literals/negative-absolute-literals.fleet +++ b/tests/literals/negative-absolute-literals.fleet @@ -1,7 +1,9 @@ +#skip #expect -1 #ship debug : Debug --1: sendto debug.in; -debug.in: take, deliver; +debug.in: +// literal -1; + deliver; diff --git a/tests/memory/memory-test.fleet b/tests/memory/memory-test.fleet index 747e5ae..7c16fa2 100644 --- a/tests/memory/memory-test.fleet +++ b/tests/memory/memory-test.fleet @@ -12,24 +12,23 @@ // dumb configurations debug.in: [*] take, deliver; memory.inAddrRead: [*] take, deliver; -memory.inAddrWrite: [*] take, deliver; -memory.inDataWrite: [*] take, deliver; -fifo.in: [*] take, deliver; // send write-completion tokens to the fifo output memory.out: [4] take, notify fifo.out; [*] take, sendto debug.in; -// addresses and values to initialize the memory with -1: sendto memory.inAddrWrite; -2: sendto memory.inAddrWrite; -3: sendto memory.inAddrWrite; -4: sendto memory.inAddrWrite; -11: sendto memory.inDataWrite; -12: sendto memory.inDataWrite; -13: sendto memory.inDataWrite; -14: sendto memory.inDataWrite; +memory.inAddrWrite: literal 1; deliver; +memory.inDataWrite: literal 11; deliver; + +memory.inAddrWrite: literal 2; deliver; +memory.inDataWrite: literal 12; deliver; + +memory.inAddrWrite: literal 3; deliver; +memory.inDataWrite: literal 13; deliver; + +memory.inAddrWrite: literal 4; deliver; +memory.inDataWrite: literal 14; deliver; // when the write-completion tokens accumulate, unleash // the read addresses @@ -37,9 +36,11 @@ fifo.out: [4] wait; [4] take, sendto memory.inAddrRead; -// read addresses -4: sendto fifo.in; -3: sendto fifo.in; -2: sendto fifo.in; -1: sendto fifo.in; +fifo.in: + literal 4; deliver; + literal 3; deliver; + literal 2; deliver; + literal 1; deliver; + + diff --git a/tests/pump/kill-only-standing-instructions.fleet b/tests/pump/kill-only-standing-instructions.fleet index 9c3f456..cb42e02 100644 --- a/tests/pump/kill-only-standing-instructions.fleet +++ b/tests/pump/kill-only-standing-instructions.fleet @@ -6,12 +6,16 @@ #ship fifo2 : Fifo debug.in: [*] take, deliver; -fifo.in: [*] take, deliver; +fifo.in: + literal 1; + deliver; + [*] take, deliver; -1: sendto fifo.in; +fifo2.in: + literal 2; + deliver; + [*] take, deliver; -2: sendto fifo2.in; -fifo2.in: [*] take, deliver; fifo2.out: wait, take, sendto fifo.in; fifo.out: diff --git a/tests/pump/test-count.fleet b/tests/pump/test-count.fleet index b31b6c0..a6d3015 100644 --- a/tests/pump/test-count.fleet +++ b/tests/pump/test-count.fleet @@ -103,5 +103,7 @@ // ships required in order to run this code #ship debug : Debug -debug.in: take; [100] deliver; -9: sendto debug.in; +debug.in: + literal 9; + [100] deliver; + diff --git a/tests/recycle/test-recycle-expire.fleet b/tests/recycle/test-recycle-expire.fleet index cfb13f5..71c7707 100644 --- a/tests/recycle/test-recycle-expire.fleet +++ b/tests/recycle/test-recycle-expire.fleet @@ -4,9 +4,11 @@ #ship debug : Debug #ship fifo : Fifo -9: sendto debug.in; -8: sendto debug.in; -7: sendto debug.in; +fifo.in: literal 9; deliver; +fifo.in: literal 8; deliver; +fifo.in: literal 7; deliver; +fifo.out: [*] take, sendto debug.in; + debug.in: [*] nop; (2) take; diff --git a/tests/recycle/test-recycle.fleet b/tests/recycle/test-recycle.fleet index 0699b33..6fea3e1 100644 --- a/tests/recycle/test-recycle.fleet +++ b/tests/recycle/test-recycle.fleet @@ -51,9 +51,12 @@ #ship alu : Alu2 #ship debug : Debug +#ship f : Fifo + +f.in: literal 2; deliver; literal 4; deliver; +f.out: take, sendto alu.in1; + take, sendto alu.in2; -2: sendto alu.in1; -4: sendto alu.in2; Alu2.inOp[ADD]: sendto alu.inOp; alu.in1: [*] nop; (*) take, deliver; -- 1.7.10.4