modify test 3004 to use data stopper rather than token stopper

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 0d4fd3f..726f169 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -472,10 +472,7 @@ public class MarinaTest {
                      "olc=="+olc+" and "+
                      "predicate olc"+(predicate_olc_nonzero?"!=0":"==0"));
                 adjustIndent(2);
-                marina.instrIn.fill(new Instruction.Set(DOCK,false,Predicate.IgnoreOLC,SetDest.OuterLoopCounter, 1));
-                if (olc==0)
-                    marina.instrIn.fill(new Instruction.Set(DOCK,false,Predicate.IgnoreOLC, SetDest.OuterLoopCounter, SetSource.Decrement));
-                marina.instrIn.fill(new Instruction.Set(DOCK,false,Predicate.IgnoreOLC,SetDest.InnerLoopCounter, 1));
+                marina.instrIn.fill(new Instruction.Set(DOCK,false,Predicate.IgnoreOLC,SetDest.OuterLoopCounter, olc));
                 marina.instrIn.fill(new Instruction.Move(DOCK,
                                                          false,                 /* requeueing  */
                                                          predicate_olc_nonzero  /* predicate   */
@@ -488,10 +485,10 @@ public class MarinaTest {
                                                          false,                 /* dataIn      */
                                                          false,                 /* latchData   */
                                                          false,                 /* latchPath   */
-                                                         false,                 /* dataOut     */
-                                                         true                   /* tokenOut    */
+                                                         true,                  /* dataOut     */
+                                                         false                  /* tokenOut    */
                                                          ));
-                toks = marina.tokOut.drainMany();
+                toks = marina.data.drainMany();
                 int expected = (predicate_olc_nonzero == (olc!=0)) ? 1 : 0;
                 fatal(toks.size()!=expected, "Expected "+expected+" token to emerge but got: "+toks.size()+" token(s)");
                 adjustIndent(-2);