X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=testCode%2Fcom%2Fsun%2Fvlsi%2Fchips%2Fmarina%2Ftest%2FMarina.java;h=158e6df49b8cbca3524f5ec0de1852f0ccb6a2fd;hb=fbf13864a7ed37e017e95888ae61da8678813ec1;hp=e91f8a99d25dd1653d2b34173eb970426b69d13d;hpb=f13693939481283ab8ccab807792ba04cfa9bb04;p=fleet.git diff --git a/testCode/com/sun/vlsi/chips/marina/test/Marina.java b/testCode/com/sun/vlsi/chips/marina/test/Marina.java index e91f8a9..158e6df 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/Marina.java +++ b/testCode/com/sun/vlsi/chips/marina/test/Marina.java @@ -275,15 +275,18 @@ public class Marina { /** Get the 6 bit outer loop counter. */ public int getOLC() { shiftReport(true, false); - BitVector odd = cc.getOutBits(REPORT_CHAIN+"."+OLC_PATH_ODD).bitReverse().not(); - BitVector even = cc.getOutBits(REPORT_CHAIN+"."+OLC_PATH_EVEN).bitReverse().not(); + BitVector odd = cc.getOutBits(REPORT_CHAIN+"."+OLC_PATH_ODD).bitReverse(); + BitVector even = cc.getOutBits(REPORT_CHAIN+"."+OLC_PATH_EVEN).bitReverse(); + if (!kesselsCounter) { + odd = odd.not(); + even = even.not(); + } BitVector bv = new BitVector(6, "olc"); for(int i=0; i<3; i++) { bv.set(i*2, odd.get(i)); bv.set(i*2+1, even.get(i)); } - int ret = (int)bv.toLong(); - return kesselsCounter ? (64-ret) : ret; + return (int)bv.toLong(); } /** Get the 7 bit inner loop counter. The MSB is the zero bit. * The low order 6 bits are the count */ @@ -334,6 +337,7 @@ public class Marina { } /** Fill the "North" Fifo ring */ public void fillNorthProperStopper(MarinaPacket mp) { + prln("inserting into north: " + mp); this.data.fill(mp.toSingleBitVector()); } /** Enable the transmission of instructions from the instruction