From 5caf34520b9a7b40cae33a36f1f13c427dd9f5b2 Mon Sep 17 00:00:00 2001
From: Adam Megacz <adam.megacz@sun.com>
Date: Tue, 9 Dec 2008 21:19:22 +0000
Subject: [PATCH] remove GROSS_HACK -- no longer necessary

---
 testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java |    5 -----
 testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java         |    1 -
 2 files changed, 6 deletions(-)

diff --git a/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java b/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java
index 4e1a368..d1ffead 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java
@@ -28,12 +28,7 @@ public class InstructionStopper extends ProperStopper {
 	// Convert a Berkeley BitVector into a Sun BitVector
 	private BitVector berkToSun(edu.berkeley.fleet.api.BitVector berkBits) {
         BitVector sunBits = new BitVector(INSTR_SZ, "instr");
-        if (MarinaTest.GROSS_HACK) {
-            for(int i=0; i<=29; i++) sunBits.set(i, berkBits.get(i));
-            for(int i=30; i<=35; i++) sunBits.set(i, !berkBits.get(i));
-        } else {
             for(int i=0; i<INSTR_SZ; i++) sunBits.set(i, berkBits.get(i));
-        }
         return sunBits;
 	}
 	private String formatDecodedInstr(BitVector dta) {
diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 007e3e5..9f33b93 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -38,7 +38,6 @@ public class MarinaTest {
 	//--------------------------  constants -----------------------------------
 	public static final boolean NEW = false;
 	/** Hack until Adam updates his instruction encoder 21 Nov 2008*/
-	public static final boolean GROSS_HACK = false;
 	private static final String SCAN_CHAIN = false ? "marinaNew.xml" : "marina.xml";
 	private static final String NET_LIST = false ? "marinaNew.spi" : "marina.spi";
 
-- 
1.7.10.4