correct bit ordering in InstructionStopper

diff --git a/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java b/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java
index 689ee9b..b9103c3 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java
@@ -23,7 +23,7 @@ public class InstructionStopper extends ProperStopper {
                BitVector d = new BitVector(37, "token");  d.setFromLong(0);
        BitVector t = new BitVector(1, "token");   t.setFromLong(0);
        BitVector a = new BitVector(14, "addr");   a.setFromLong(0);
-               TORPEDO = d.cat(t).cat(a); 
+        TORPEDO = t.cat(a).cat(d); 
     }
        // Convert a Berkeley BitVector into a Sun BitVector
        private BitVector berkToSun(edu.berkeley.fleet.api.BitVector berkBits) {
@@ -66,7 +66,8 @@ public class InstructionStopper extends ProperStopper {
                }
        BitVector t = new BitVector(1, "token");   t.setFromLong(1);
        BitVector a = new BitVector(14, "addr");   a.setFromLong(0);
-       super.fill(instr.cat(t).cat(a));
+       //super.fill(instr.cat(t).cat(a));
+       super.fill(t.cat(a).cat(instr));
     }
        @Override 
        public BitVector drain() {