From: Adam Megacz Date: Tue, 24 Mar 2009 17:56:23 +0000 (+0000) Subject: remove unused methods X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8ea58a3c696b7064d1442be7ed23711511b68946;p=fleet.git remove unused methods --- diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaUtils.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaUtils.java index 23bf242..6de097d 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/MarinaUtils.java +++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaUtils.java @@ -41,11 +41,13 @@ public class MarinaUtils { public static enum StateWireState {FULL, EMPTY}; public static class CmdArgs { - public enum Mode {//ISOLATED_IN_DOCK, + public enum Mode { + //ISOLATED_IN_DOCK, //ISOLATED_OUT_DOCK, WHOLE_CHIP_SCHEMATIC_PARASITICS, WHOLE_CHIP_LAYOUT_PARASITICS, - TEST_SILICON}; + TEST_SILICON + }; public Mode mode = Mode.WHOLE_CHIP_SCHEMATIC_PARASITICS; public int testNum, ringNum, numTokensOther, chipNum=-1; public boolean jtagShift = false; @@ -434,35 +436,6 @@ public class MarinaUtils { } - private static String reverse(String s) { - StringBuffer ret = new StringBuffer(); - for(int i=s.length()-1; i>=0; i--) - ret.append(s.charAt(i)); - return ret.toString(); - } - - public static String formatDataTokAddr(BitVector dta) { - if (dta.getNumBits()!=(37+1+14)) { - Infrastructure.fatal("wrong number of bits"); - } - return - "tokenhood[1]="+dta.get(0,1).getState() - + ", addr[14:1]=" + reverse(dta.get(1,14).getState()) - + ", data[37:1]=" + reverse(dta.get(15,37).getState()); - } - public static BitVector extractAddr(BitVector dataTokAddr) { - fatal(dataTokAddr.getNumBits()!=37+1+14, "wrong length for data token addr"); - return dataTokAddr.get((37+1), 14); - } - public static BitVector extractToken(BitVector dataTokAddr) { - fatal(dataTokAddr.getNumBits()!=37+1+14, "wrong length for data token addr"); - return dataTokAddr.get(37, 1); - } - public static BitVector extractData(BitVector dataTokAddr) { - fatal(dataTokAddr.getNumBits()!=37+1+14, "wrong length for data token addr"); - return dataTokAddr.get(0, 37); - } - public static BitVector berkToSun(edu.berkeley.fleet.api.BitVector berkBits) { BitVector sunBits = new BitVector(berkBits.length(), "berkToSun()"); for(int i=0; i