more tests pass now

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 234a611..de40372 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -1295,7 +1295,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   */
-                                                 true,                  /* torpedoable */
+                                                 false,                 /* torpedoable */
                                                  null,                  /* path        */
                                                  false,                 /* tokenIn     */
                                                  true,                  /* dataIn      */
@@ -1349,15 +1349,15 @@ public class MarinaTest {
                   "found a data item waiting in the north proper stopper, but should not have");
 
             marina.instrIn.fill(new Instruction.Move(dock,
-                                                     Predicate.IgnoreFlagD,   // predicate   
-                                                     true,                  // torpedoable 
-                                                     null,                  // path        
-                                                     false,                 // tokenIn     
-                                                     true,                  // dataIn      
-                                                     true,                  // latchData   
-                                                     false,                 // latchPath   
-                                                     true,                  // dataOut     
-                                                     false                  // tokenOut    
+                                                     Predicate.IgnoreFlagD,  // predicate   
+                                                     false,                  // torpedoable 
+                                                     null_path,              // path        
+                                                     false,                  // tokenIn     
+                                                     true,                   // dataIn      
+                                                     true,                   // latchData   
+                                                     false,                  // latchPath   
+                                                     true,                   // dataOut     
+                                                     false                   // tokenOut    
                                                      ));
 
             dataItems = marina.data.drainMany(2);
@@ -2046,14 +2046,17 @@ public class MarinaTest {
                 doOneTest(3000);
                 doOneTest(3001);
                 doOneTest(3006);
+                doOneTest(3011);
                 doOneTest(3013);
                 doOneTest(3014);
+                doOneTest(3015);
                 doOneTest(3018);
 
                 // these tests take a while and usually pass
                 doOneTest(1000);
                 doOneTest(1004);
                 doOneTest(1006);
+                doOneTest(3024);
 
                 break;
             }
@@ -2087,11 +2090,11 @@ public class MarinaTest {
             case 3008: testWaitForTail(marina);                break;
             case 3009: testRequeueStageDrop(marina);           break;         
             case 3010: testRequeueStage0to2to3to0(marina);     break;
-            case 3011: recvData(marina);                       break;
+            case 3011: recvData(marina);                       break; //         21-Apr (+verilog)
             case 3012: testFlagC(marina);                      break;
             case 3013: testSignExtendedLiteral(marina);        break; //         20-Apr (+verilog)
             case 3014: testShiftedLiteral(marina);             break; //         20-Apr (+verilog)
-            case 3015: testSendAndRecvToken(marina);           break;
+            case 3015: testSendAndRecvToken(marina);           break; //         21-Apr (+verilog)
             case 3016: sendDataIlcInfinite(marina);            break;
             case 3017: testFlagTruthTable(marina);             break;
             case 3018: sendDataWithPath(marina);               break; // passes, 13-Apr (+verilog)
@@ -2100,7 +2103,7 @@ public class MarinaTest {
             case 3021: recvPath(marina);                       break;
             case 3022: testILC(marina);                        break;
             case 3023: testTorpedoOnAnInfiniteNop(marina);     break;
-            case 3024: testRecvAndSendWalkingOne(marina);      break;
+            case 3024: testRecvAndSendWalkingOne(marina);      break; //         21-Apr (+verilog)
             case 3025: testOlcDecrementAtHighSpeed(marina);    break;
 
             default: