From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 3 Jul 2011 05:31:22 +0000 (-0700)
Subject: X86: Fix store microops so they don't drop faults in timing mode.
X-Git-Tag: stable_2012_02_02~187^2~5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f72d6a1f4a9a44699e271608c7edc3ed90cfff9;p=gem5.git

X86: Fix store microops so they don't drop faults in timing mode.

If a fault was returned by the CPU when a store initiated it's write, the
store instruction would ignore the fault. This change fixes that.
---

diff --git a/src/arch/x86/isa/microops/ldstop.isa b/src/arch/x86/isa/microops/ldstop.isa
index 811b35c8a..f7a38b486 100644
--- a/src/arch/x86/isa/microops/ldstop.isa
+++ b/src/arch/x86/isa/microops/ldstop.isa
@@ -201,7 +201,7 @@ def template MicroStoreInitiateAcc {{
 
         if(fault == NoFault)
         {
-            write(xc, Mem, EA, memFlags);
+            fault = write(xc, Mem, EA, memFlags);
         }
         return fault;
     }