From eb9f3b7789a820edc7ae03d6843f3b4b7cc34467 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Tue, 24 Mar 2009 17:56:08 +0000 Subject: [PATCH] remove formatDataTokAddr() from ProperStopper --- testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java b/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java index 2a304c0..3c8c435 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java +++ b/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java @@ -102,13 +102,6 @@ public class ProperStopper { } //-------------------------- public methods ---------------------------- - - /** Allow subclasses to override the formating of the data. For example, - * the Instruction stopper only uses the 37 bits of data so it only - * wants to print the 37 instruction bits */ - public String formatDataTokAddr(BitVector dta) { - return MarinaUtils.formatDataTokAddr(dta); - } /** Put stopper in RUN state */ public void run() { @@ -247,7 +240,7 @@ public class ProperStopper { fatal(myState!=StateWireState.EMPTY, "fill: fill stage already full"); - if (traceFill) prln("writing data: "+formatDataTokAddr(dta)); + if (traceFill) prln("writing data: "+new MarinaPacket(dta)); idle(); // block = 1, go = 0 @@ -315,7 +308,7 @@ public class ProperStopper { idle(); // clear = 0 stop(); // block = 0 - if (traceDrain) prln("drain stopper="+name+" data="+formatDataTokAddr(ans)); + if (traceDrain) prln("drain stopper="+name+" data="+new MarinaPacket(ans)); return ans; } /** Remove as many items as possible from the fill stage. -- 1.7.10.4