From 520f613031b8ca86a34c2a5972ea12804b1c76c1 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Tue, 24 Mar 2009 17:57:04 +0000 Subject: [PATCH] remove uses of extractData() and formatDataTokAddr() in MarinaTest --- testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java index 871d891..097a2ea 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java +++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java @@ -534,7 +534,7 @@ public class MarinaTest { List dataItems = marina.data.drainMany(); fatal(dataItems.size()!=1, "Expected one data item to emerge but got: "+dataItems.size()+" data items"); - prln("Datum="+MarinaUtils.formatDataTokAddr(dataItems.get(0))); + prln("Datum="+new MarinaPacket(dataItems.get(0))); adjustIndent(-2); prln("End sendData"); @@ -1442,7 +1442,8 @@ public class MarinaTest { fatal(dataItems.size()!=1, "expected exactly one data item, got " + dataItems.size()); BitVector bv = dataItems.get(0); - prln("got back " + MarinaUtils.extractData(bv).getState()); + MarinaPacket mp = new MarinaPacket(bv); + prln("got back " + mp); boolean mismatch = false; String err = ""; @@ -1492,7 +1493,7 @@ public class MarinaTest { List dataItems = marina.data.drainMany(3); fatal(dataItems.size()!=1, "expected exactly one data item, got " + dataItems.size()); - BitVector bv = MarinaUtils.extractData(dataItems.get(0)); + BitVector bv = new MarinaPacket(dataItems.get(0)).data; fatal(!bv.equals(dreg), "data read back did not match inserted literal.\n" + "got: "+bv.bitReverse().getState()+"\n"+ "expected:"+dreg.bitReverse().getState()); -- 1.7.10.4