From 678376f0ba3f3440b1fc1b6ace48455db5d75ca9 Mon Sep 17 00:00:00 2001
From: Korey Sewell <ksewell@umich.edu>
Date: Thu, 7 Jul 2011 21:32:49 -0400
Subject: [PATCH] alpha:hwrei:rollback for o3 change hwrei back to being a
 non-control instruction so O3-FS mode will work add squash in inorder that
 will catch a hwrei (or any other genric instruction) that isnt a control inst
 but changes the PC. Additional testing still needs to be done for inorder-FS
 mode but this change will free O3 development back up in the interim

---
 src/arch/alpha/isa/decoder.isa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arch/alpha/isa/decoder.isa b/src/arch/alpha/isa/decoder.isa
index 3cc2a1006..f0aa5a3fd 100644
--- a/src/arch/alpha/isa/decoder.isa
+++ b/src/arch/alpha/isa/decoder.isa
@@ -935,7 +935,7 @@ decode OPCODE default Unknown::unknown() {
   0x1e: decode PALMODE {
       0: OpcdecFault::hw_rei();
         format BasicOperate {
-          1: hw_rei({{ xc->hwrei(); }}, IsSerializing, IsSerializeBefore, IsControl);
+          1: hw_rei({{ xc->hwrei(); }}, IsSerializing, IsSerializeBefore);
         }
     }