From: rkao <rkao>
Date: Thu, 11 Sep 2008 21:57:28 +0000 (+0000)
Subject: Stuff items into instruction port of isolated input dock
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=937f8a7192a289e5490d39eda9189b1014de83f3;p=fleet.git

Stuff items into instruction port of isolated input dock
---

diff --git a/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java b/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java
index 69ec064..dccf73f 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java
@@ -18,7 +18,7 @@ public class IsolatedInDock implements Design {
     private final ChainControl cc;           // specifies the scan chain
     private final ChipModel model;
     public final ProperStopper datIn, tokOut, insIn, shipOut;
-
+    
     public IsolatedInDock(ChainControl cc, ChipModel model, Indenter indenter) {
         this.cc = cc;
         this.model = model;
diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 1d580a9..e766b0d 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -136,12 +136,12 @@ public class MarinaTest {
         switch (cmdArgs.mode) {
         case ISOLATED_IN_DOCK:
         	netListName = "isolatedInDock.spi";
-            cc = new ChainControl("../testCode/isolatedInDock.xml", tester, 1.8f, khz);
+            cc = new ChainControl("isolatedInDock.xml", tester, 1.8f, khz);
             design = new IsolatedInDock(cc, model, indenter);
         	break;
         case ISOLATED_OUT_DOCK:
         	netListName = "isolatedOutDock.spi";
-            cc = new ChainControl("../testCode/isolatedOutDock.xml", tester, 1.8f, khz);
+            cc = new ChainControl("isolatedOutDock.xml", tester, 1.8f, khz);
             design = null;
         	break;
         case WHOLE_CHIP_SCHEMATIC_PARASITICS:
@@ -326,6 +326,16 @@ public class MarinaTest {
     private void stopToStopThreeItems(IsolatedInDock inDock) {
     	stopToStopThree(inDock.datIn, inDock.tokOut, null, -1);
     }
+    private void sendInstructions(IsolatedInDock inDock) {
+    	prln("Begin sendInstructions");
+    	adjustIndent(2);
+    	
+    	List<BitVector> din = makeIncrDataConstAdr(3, 0);
+    	inDock.insIn.fillMany(din);
+
+    	adjustIndent(-2);
+    	prln("End sendInstructions");
+    }
 	private void doOneTest(int testNum) {
         prln("MarinaTest: performing test: "+testNum);
         design.masterClear(tester);
@@ -333,6 +343,7 @@ public class MarinaTest {
 		switch (testNum) {
 		case 0:			stopToStopOneItem((IsolatedInDock)design);       break;
 		case 1:			stopToStopThreeItems((IsolatedInDock)design);	 break;
+		case 2:			sendInstructions((IsolatedInDock)design);	 	 break;
 		default:
 			fatal(true, "Test number: "+testNum+" doesn't exist.");
 			break;
diff --git a/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java b/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java
index d4482c6..1d0aa97 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java
@@ -132,7 +132,7 @@ public class ProperStopper {
     	block();				// go = 1
     	idle();					// go = 0
     }
-    /** get value of the state wire preceeding the fill stage */
+    /** get value of the state wire preceding the fill stage */
     public StateWireState getPrevStateWire() {
     	BitVector b = cc.getOutBits(reportPath);
     	int n = b.getNumBits();