move 52->36 bit conversion from drain() to drainNoCheck()

diff --git a/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java b/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java
index 3d071be..a463074 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java
@@ -52,7 +52,7 @@ public class InstructionStopper extends ProperStopper {
         super(propInst, controlChain, dataChain, reportChain, cc, model, clockHack, indenter);
     }
     @Override
-        public void fill(BitVector instr) {
+    public void fill(BitVector instr) {
         // allow user to pass in complete item: data + token + addr
         if (instr.getNumBits()==(37+1+14)) {super.fill(instr); return;}
                 
@@ -69,15 +69,16 @@ public class InstructionStopper extends ProperStopper {
         //super.fill(instr.cat(t).cat(a));
         super.fill(t.cat(a).cat(instr));
     }
-    @Override 
-        public BitVector drain() {
-        BitVector dta = super.drain();
-        return dta.get(0, INSTR_SZ);
+    public BitVector drainNoCheck() {
+        BitVector dta = super.drainNoCheck();
+        return dta.get(15, INSTR_SZ);
     }
+    /*
     @Override
-        public String formatDataTokAddr(BitVector dta) {
+    public String formatDataTokAddr(BitVector dta) {
         return formatDecodedInstr(dta);
     }
+    */
     /** put one Instruction into InstructionStopper */
     public void fill(Instruction instr) {
         fill(berkToSun(MARINA.encodeInstruction(DOCK, instr)));