reformatting only

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 7005f95..1b6cc05 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -459,8 +459,8 @@ public class MarinaTest {
         
         List<BitVector> din = new ArrayList<BitVector>();
 
-        BitVector count = new BitVector(36,"count");
-        BitVector one = new BitVector(36, "one");
+        BitVector count = new BitVector(MarinaPacket.WORD_WIDTH,"count");
+        BitVector one = new BitVector(MarinaPacket.WORD_WIDTH, "one");
         count.setFromLong(0);
         one.setFromLong(1);
         for (int i=0; i<3; i++) {
@@ -1584,7 +1584,7 @@ public class MarinaTest {
 
         prln("send data with path="+bv);
         marina.instrIn.fill(new Instruction.Move(dock,
-                                                 Predicate.IgnoreFlagD,   /* predicate   */
+                                                 Predicate.IgnoreFlagD, /* predicate   */
                                                  false,                 /* torpedoable */
                                                  path,                  /* path        */
                                                  false,                 /* tokenIn     */
@@ -1607,7 +1607,7 @@ public class MarinaTest {
 
         prln("send data with no change to path");
         marina.instrIn.fill(new Instruction.Move(dock,
-                                                 Predicate.IgnoreFlagD,   /* predicate   */
+                                                 Predicate.IgnoreFlagD, /* predicate   */
                                                  false,                 /* torpedoable */
                                                  null,                  /* path        */
                                                  false,                 /* tokenIn     */
@@ -2013,51 +2013,52 @@ public class MarinaTest {
         marina.enableInstructionSend(true);
         
         switch (testNum) {
-            case 1:                 testProperStoppers(marina);             break;
-            case 2:                 sendInstructions(marina);               break;
-            case 3:                 sendToken(marina);                              break;
-            case 4:                 getCtrsFlags(marina);                   break;
-            case 5:                 walkOneOLC(marina);                             break;
+            case 1:    testProperStoppers(marina);             break; // passes, 24-Mar
+            case 2:    sendInstructions(marina);               break; // passes, 24-Mar
+            case 3:    sendToken(marina);                      break; // passes, 24-Mar
+
+            case 4:    getCtrsFlags(marina);                   break;
+            case 5:    walkOneOLC(marina);                     break;
                 
                 // Russell's tests begin with 1000
-            case 1000:              walkOneILC(marina);                     break;
-            case 1001:              countIlc(marina);                               break;
-            case 1002:              countOlc(marina);                               break;
-            case 1003:              sendTorpedo(marina);                    break;
-            case 1004:              flipIlcBit(marina);                         break;
-            case 1005:              flipOlcBit(marina);                         break;
-            case 1006:      testSouthRecirculate(marina);   break;
+            case 1000: walkOneILC(marina);                     break;
+            case 1001: countIlc(marina);                       break;
+            case 1002: countOlc(marina);                       break;
+
+            case 1003: sendTorpedo(marina);                    break;
+
+            case 1004: flipIlcBit(marina);                     break;
+            case 1005: flipOlcBit(marina);                     break;
+
+            case 1006: testSouthRecirculate(marina);           break; // passes, 24-Mar
                 
-                // Bill's tests begin with 2000
-            case 2000: break;
-                    
                 // Adam's tests begin with 3000
-            case 3000: sendToken(marina); break;
-            case 3001: testFlagAB(marina); break;
-            case 3002: testRequeueStage0(marina); break;
-            case 3003: testRequeueStage0to1(marina); break;
-            case 3004: testFlagZ(marina); break;
-            case 3005: testPredicationOnAB(marina); break;
-            case 3006: sendData(marina); break;
-            case 3007: testRequeueStage0to1to3to0(marina); break;
-            case 3008: testWaitForTail(marina); break;
-            case 3009: testRequeueStageDrop(marina); break;         
-            case 3010: testRequeueStage0to2to3to0(marina); break;
-            case 3011: recvData(marina); break;
-            case 3012: testFlagC(marina); break;
-            case 3013: testSignExtendedLiteral(marina); break;
-            case 3014: testShiftedLiteral(marina); break;
-            case 3015: testSendAndRecvToken(marina); break;
-            case 3016: sendDataIlcInfinite(marina); break;
-            case 3017: testFlagTruthTable(marina); break;
-            case 3018: sendDataWithPath(marina); break;
-            case 3019: setOlcFromDataLatch(marina); break;
-            case 3020: setIlcFromDataLatch(marina); break;
-            case 3021: recvPath(marina); break;
-            case 3022: testILC(marina); break;
-            case 3023: testTorpedoOnAnInfiniteNop(marina); break;
-            case 3024: testRecvAndSendWalkingOne(marina); break;
-            case 3025: testOlcDecrementAtHighSpeed(marina); break;
+            case 3000: sendToken(marina);                      break; // passes, 24-Mar
+            case 3001: testFlagAB(marina);                     break; // passes, 08-Apr
+            case 3002: testRequeueStage0(marina);              break;
+            case 3003: testRequeueStage0to1(marina);           break;
+            case 3004: testFlagZ(marina);                      break;
+            case 3005: testPredicationOnAB(marina);            break;
+            case 3006: sendData(marina);                       break; // passes, 24-Mar
+            case 3007: testRequeueStage0to1to3to0(marina);     break;
+            case 3008: testWaitForTail(marina);                break;
+            case 3009: testRequeueStageDrop(marina);           break;         
+            case 3010: testRequeueStage0to2to3to0(marina);     break;
+            case 3011: recvData(marina);                       break;
+            case 3012: testFlagC(marina);                      break;
+            case 3013: testSignExtendedLiteral(marina);        break;
+            case 3014: testShiftedLiteral(marina);             break;
+            case 3015: testSendAndRecvToken(marina);           break;
+            case 3016: sendDataIlcInfinite(marina);            break;
+            case 3017: testFlagTruthTable(marina);             break;
+            case 3018: sendDataWithPath(marina);               break; // this should pass once Ivan swaps take[dp] and take[ps]
+            case 3019: setOlcFromDataLatch(marina);            break;
+            case 3020: setIlcFromDataLatch(marina);            break;
+            case 3021: recvPath(marina);                       break;
+            case 3022: testILC(marina);                        break;
+            case 3023: testTorpedoOnAnInfiniteNop(marina);     break;
+            case 3024: testRecvAndSendWalkingOne(marina);      break;
+            case 3025: testOlcDecrementAtHighSpeed(marina);    break;
 
             default:
                 fatal(true, "Test number: "+testNum+" doesn't exist.");