From: Adam Megacz <adam.megacz@sun.com>
Date: Tue, 10 Mar 2009 22:20:25 +0000 (+0000)
Subject: fix test 1006; now passes
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=24f3e6a3f01ad182da20bf6c1bce1c06978e7457;p=fleet.git

fix test 1006; now passes
---

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 2279c00..d249de0 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -1983,22 +1983,32 @@ public class MarinaTest {
         prln("Begin testSouthRecirculate");
         adjustIndent(2);
 
+        int AMOUNT = Marina.SOUTH_RING_CAPACITY;
+
         marina.enableInstructionSend(false);
         marina.enableInstructionRecirculate(true);
         
         prln("Completely fill south ring");
-        for (int i=0; i<Marina.SOUTH_RING_CAPACITY; i++) {
+        adjustIndent(2);
+        for (int i=0; i<AMOUNT; i++) {
+            prln("inserting item " + (i+1) + " / " + AMOUNT);
             BitVector instr = new BitVector(36, "Instr"+i);
-            instr.setFromLong(i);
+            instr.setFromLong(i+1);
             marina.instrIn.fill(instr);
         }
+        adjustIndent(-2);
+
         prln("Drain south ring and check contents");
+        adjustIndent(2);
         List<BitVector> out = marina.instrIn.drainMany();
-        for (int i=0; i<Marina.SOUTH_RING_CAPACITY; i++) {
-            int expect = (i+Marina.SOUTH_RING_CAPACITY-1) % Marina.SOUTH_RING_CAPACITY;
+        for (int i=0; i<AMOUNT; i++) {
+            prln("extracting item " + (i+1) + " / " + AMOUNT);
+            //int expect = (i+Marina.SOUTH_RING_CAPACITY-1) % Marina.SOUTH_RING_CAPACITY;
+            int expect = i+1;
             long got = out.get(i).toLong();
             fatal(got!=expect, "bad instruction: "+got+" expected: "+expect);
         }
+        adjustIndent(-2);
         
         for (int i=0; i<5; i++) {}