From: Adam Megacz <adam.megacz@sun.com>
Date: Mon, 23 Mar 2009 00:49:44 +0000 (+0000)
Subject: check the token fifo for emptiness before sendToken() test
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=6e34db409a8a2e0e7d24f9bfe67ad54045678a83;p=fleet.git

check the token fifo for emptiness before sendToken() test
---

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index b669813..871d891 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -479,10 +479,13 @@ public class MarinaTest {
         
         //getCtrsFlags(marina);
         
+        int nbToks = marina.getNumTokens();
+        fatal(nbToks!=0, "Expected no tokens on initialization but got: "+nbToks+" tokens");
+
         prln("send token");
         marina.instrIn.fill(
                             new Instruction.Move(DOCK,
-                                                 Predicate.IgnoreFlagD,   /* predicate   */
+                                                 Predicate.IgnoreFlagD, /* predicate   */
                                                  false,                 /* torpedoable */
                                                  null,                  /* path        */
                                                  false,                 /* tokenIn     */
@@ -495,7 +498,7 @@ public class MarinaTest {
         
         //getCtrsFlags(marina);
         
-        int nbToks = marina.getNumTokens();
+        nbToks = marina.getNumTokens();
         fatal(nbToks!=1, "Expected one token to emerge but got: "+nbToks+" tokens");
         
         adjustIndent(-2);
@@ -1270,7 +1273,7 @@ public class MarinaTest {
 
         marina.instrIn.fill(new Instruction.Set(DOCK,Predicate.IgnoreFlagD, CLEAR_FLAG, CLEAR_FLAG));
         marina.instrIn.fill(new Instruction.Move(DOCK,
-                                                 Predicate.IgnoreFlagD,   /* predicate   */
+                                                 Predicate.IgnoreFlagD, /* predicate   */
                                                  true,                  /* torpedoable */
                                                  null,                  /* path        */
                                                  false,                 /* tokenIn     */