17 Nov 2008 design

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 6f3ef4e..2f17ff7 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -709,34 +709,6 @@ public class MarinaTest {
                              false                  /* tokenOut    */
                              );
 
-    private static final Instruction NOP =
-        new Instruction.Move(DOCK,
-                             false,                  /* requeueing  */
-                             Predicate.IgnoreOLC,   /* predicate   */
-                             false,                 /* torpedoable */
-                             null,                  /* path        */
-                             false,                 /* tokenIn     */
-                             false,                 /* dataIn      */
-                             false,                 /* latchData   */
-                             false,                 /* latchPath   */
-                             false,                 /* dataOut     */
-                             false                  /* tokenOut    */
-                             );
-
-    private static final Instruction NOP =
-        new Instruction.Move(DOCK,
-                             false,                  /* requeueing  */
-                             Predicate.IgnoreOLC,   /* predicate   */
-                             false,                 /* torpedoable */
-                             null,                  /* path        */
-                             false,                 /* tokenIn     */
-                             false,                 /* dataIn      */
-                             false,                 /* latchData   */
-                             false,                 /* latchPath   */
-                             false,                 /* dataOut     */
-                             false                  /* tokenOut    */
-                             );
-
     private static final Instruction REQUEUEING_NOP =
         new Instruction.Move(DOCK,
                              true,                  /* requeueing  */