From: Gabe Black <gblack@eecs.umich.edu>
Date: Tue, 14 Sep 2010 19:31:37 +0000 (-0700)
Subject: X86: Make the halt microop non-speculative.
X-Git-Tag: stable_2012_02_02~813
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2dd9f4fcf02c68eb86a6742576eecb3eef3b9ddf;p=gem5.git

X86: Make the halt microop non-speculative.

Executing this microop makes the CPU halt even if it was misspeculated.
---

diff --git a/src/arch/x86/isa/microops/specop.isa b/src/arch/x86/isa/microops/specop.isa
index f6978075b..52420f175 100644
--- a/src/arch/x86/isa/microops/specop.isa
+++ b/src/arch/x86/isa/microops/specop.isa
@@ -61,7 +61,9 @@ output header {{
       public:
         MicroHalt(ExtMachInst _machInst, const char * instMnem,
                 uint64_t setFlags) :
-            X86MicroopBase(_machInst, "halt", instMnem, setFlags, No_OpClass)
+            X86MicroopBase(_machInst, "halt", instMnem,
+                           setFlags | (ULL(1) << StaticInst::IsNonSpeculative),
+                           No_OpClass)
         {
         }