From: rkao <rkao>
Date: Fri, 31 Oct 2008 21:22:23 +0000 (+0000)
Subject: update predicate field
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=6ce40c4245a6b8a030458ae038b465d3372802fb;p=fleet.git

update predicate field
---

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 932ddca..779dd62 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -359,13 +359,16 @@ public class MarinaTest {
         Dock dock = marina.getOnlyInputDock();
         Instruction sendTokenInstruction =
             new Instruction.Move(dock,
-                                 null,    /* path      */
-                                 false,   /* tokenIn   */
-                                 false,   /* dataIn    */
-                                 false,   /* latchData */
-                                 false,   /* latchPath */
-                                 false,   /* dataOut   */
-                                 true     /* tokenOut  */
+            		             true, /* requeueing */
+                                 Predicate.IgnoreOLC,   /* predicate   */
+                                 false,                 /* torpedoable */
+                                 null,                  /* path        */
+                                 false,                 /* tokenIn     */
+                                 false,                 /* dataIn      */
+                                 false,                 /* latchData   */
+                                 false,                 /* latchPath   */
+                                 false,                 /* dataOut     */
+                                 true                   /* tokenOut    */
                                  );
         edu.berkeley.fleet.api.BitVector bits =
             marina.encodeInstruction(dock, /* dispatch dock -- irrelevant for MARINA */
@@ -374,9 +377,6 @@ public class MarinaTest {
         BitVector bitVector = new BitVector(INSTR_SZ, "instr");
         for(int i=0; i<INSTR_SZ; i++) bitVector.set(i, bits.get(i));
         
-//        // override to check OLC==0 predicate encoding
-//        bitVector.set(35, false);
-
         inDock.instrIn.fill(bitVector);
         
         /* FIXME: check to see if the token actually emerges! */