X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=marina%2FtestCode%2Fcom%2Fsun%2Fvlsi%2Fchips%2Fmarina%2Ftest%2FMarinaTest.java;h=6531a915ddb7ba450a869cce41623f958ca93d69;hb=39482b03a060f579d5eb494b2868d2f430b35409;hp=4e33b584ce730523a60945e6ba62f97bd9e73308;hpb=9d0ce1223b0090d437e8d35e0a855332ab843e5c;p=fleet.git

diff --git a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 4e33b58..6531a91 100644
--- a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -888,6 +888,19 @@ public class MarinaTest {
                              false                  /* tokenOut    */
                              );
 
+    private static final Instruction SEND_DATA_IF_D_SET =
+        new Instruction.Move(dock,
+                             Predicate.FlagD,       /* predicate   */
+                             false,                 /* torpedoable */
+                             null_path,             /* path        */
+                             false,                 /* tokenIn     */
+                             false,                 /* dataIn      */
+                             false,                 /* latchData   */
+                             false,                 /* latchPath   */
+                             true,                  /* dataOut     */
+                             false                  /* tokenOut    */
+                             );
+
     private static final Instruction TORPEDOABLE_RECV_DATA =
         new Instruction.Move(dock,
                              Predicate.IgnoreFlagD, /* predicate   */
@@ -955,6 +968,13 @@ public class MarinaTest {
               "Expected exactly "+num+
               " data items to emerge but got at least: "+dataItems.size());
     }
+    private void expectNorthFifoAtLeast(int num) {
+        model.waitNS(128 * CYCLE_TIME_NS);
+        List<BitVector> dataItems = marina.data.drainMany(num);
+        fatal(dataItems.size()<num,
+              "Expected at least "+num+
+              " data items to emerge but got only: "+dataItems.size());
+    }
     private void expectTokensNoMoreThan(int num) {
         int x = marina.getNumTokens();
         List<BitVector> dataItems = marina.data.drainMany(num+1);