From: rkao <rkao>
Date: Mon, 10 Nov 2008 21:24:46 +0000 (+0000)
Subject: NOP using set flags A=A, B=B works in torpedo test
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c79c747f526d7a0a070eaa56b79cc2ab07988a5a;p=fleet.git

NOP using set flags A=A, B=B works in torpedo test
---

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 2e06f64..496a7e0 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -457,7 +457,7 @@ public class MarinaTest {
         int olc = inDock.getOLC();
         prln("OLC="+olc);
         
-    	prln(" ILC.zero="+inDock.getIlcZero()+
+    	prln("ILC.zero="+inDock.getIlcZero()+
     		 " ILC.count="+inDock.getIlcCount());
     	
     	boolean a = inDock.getFlagA();
@@ -682,7 +682,7 @@ public class MarinaTest {
         
    		prln("NOP This instruction can't predicate on OLC because of a hardware bug");
    		inDock.instrIn.fill(new 
-            Instruction.Set(DOCK,false,Predicate.Default, CLEAR_FLAG, CLEAR_FLAG));
+            Instruction.Set(DOCK,false,Predicate.Default, A_FLAG, B_FLAG));
 
    		prln("A=1, B=1 This instruction should get torpedoed along with the Move");
    		inDock.instrIn.fill(new 
diff --git a/testCode/sml2008-am01.pdf b/testCode/sml2008-am01.pdf
index e16c0fc..e002e3f 100644
Binary files a/testCode/sml2008-am01.pdf and b/testCode/sml2008-am01.pdf differ