fix bug Russell noticed today, add INDEX_OF_ADDRESS_BIT_COPIED_TO_C_FLAG_WHEN_DC_EQUALS_*

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index faeefce..758ea23 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -41,6 +41,9 @@ public class MarinaTest {
        private static final String NET_LIST = "marina.spi";
 
        public static final int INSTR_SZ = 36;
+
+    public static final int INDEX_OF_ADDRESS_BIT_COPIED_TO_C_FLAG_WHEN_DC_EQUALS_ONE  = 13;
+    public static final int INDEX_OF_ADDRESS_BIT_COPIED_TO_C_FLAG_WHEN_DC_EQUALS_ZERO = 0;
        
        public static final Dock DOCK = InstructionStopper.DOCK;
     public static final Instruction.Set.FlagFunction CLEAR_FLAG 
@@ -1212,7 +1215,7 @@ public class MarinaTest {
                                     BitVector addr = new BitVector(14, "empty");
                                     for(int i=0; i<data.getNumBits(); i++) data.set(i, false);
                                     for(int i=0; i<addr.getNumBits(); i++) addr.set(i, false);
-                                    addr.set(0, c_state);
+                                    addr.set(INDEX_OF_ADDRESS_BIT_COPIED_TO_C_FLAG_WHEN_DC_EQUALS_ONE, c_state);
                                     marina.fillNorthProperStopper(new MarinaPacket(data, false, addr));
                                     marina.instrIn.fill(RECV_DATA);
                                     
@@ -1490,7 +1493,9 @@ public class MarinaTest {
                 for(int i=0; i<data.getNumBits(); i++) data.set(i, false);
                 for(int i=0; i<addr.getNumBits(); i++) addr.set(i, false);
 
-                int whichbit = dc ? 13 : 0;
+                int whichbit = dc
+                    ? INDEX_OF_ADDRESS_BIT_COPIED_TO_C_FLAG_WHEN_DC_EQUALS_ONE
+                    : INDEX_OF_ADDRESS_BIT_COPIED_TO_C_FLAG_WHEN_DC_EQUALS_ZERO;
                 prln("setting addr["+whichbit+"] to "+(c_flag?"1":"0"));
                 addr.set(whichbit, c_flag);