From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Tue, 17 Aug 2010 12:20:39 +0000 (-0700)
Subject: x86: minor checkpointing bug fixes
X-Git-Tag: stable_2012_02_02~962
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=164a211f10aa8ce1801fcd99e71f344238f26634;p=gem5.git

x86: minor checkpointing bug fixes
---

diff --git a/src/arch/x86/interrupts.hh b/src/arch/x86/interrupts.hh
index bc67cdcff..6b5215135 100644
--- a/src/arch/x86/interrupts.hh
+++ b/src/arch/x86/interrupts.hh
@@ -260,13 +260,13 @@ class Interrupts : public BasicPioDevice, IntDev
     void
     serialize(std::ostream &os)
     {
-        panic("Interrupts::serialize unimplemented!\n");
+        warn("Interrupts::serialize unimplemented!\n");
     }
 
     void
     unserialize(Checkpoint *cp, const std::string &section)
     {
-        panic("Interrupts::unserialize unimplemented!\n");
+        warn("Interrupts::unserialize unimplemented!\n");
     }
 
     /*
diff --git a/src/arch/x86/isa.cc b/src/arch/x86/isa.cc
index 47d24ed1e..0b5523864 100644
--- a/src/arch/x86/isa.cc
+++ b/src/arch/x86/isa.cc
@@ -352,6 +352,11 @@ ISA::unserialize(EventManager *em, Checkpoint * cp,
                  const std::string & section)
 {
     UNSERIALIZE_ARRAY(regVal, NumMiscRegs);
+    updateHandyM5Reg(regVal[MISCREG_EFER],
+                     regVal[MISCREG_CR0],
+                     regVal[MISCREG_CS_ATTR],
+                     regVal[MISCREG_SS_ATTR],
+                     regVal[MISCREG_RFLAGS]);
 }
 
 }