summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2010-08-17 05:20:39 -0700
committerSteve Reinhardt <steve.reinhardt@amd.com>2010-08-17 05:20:39 -0700
commit164a211f10aa8ce1801fcd99e71f344238f26634 (patch)
treed9dfa8d9f322fe495c276e8f10850fc74ae80bff /src/arch
parentf064aa306061ecc468efd8cf148ed08398ca824d (diff)
downloadgem5-164a211f10aa8ce1801fcd99e71f344238f26634.tar.xz
x86: minor checkpointing bug fixes
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/interrupts.hh4
-rw-r--r--src/arch/x86/isa.cc5
2 files changed, 7 insertions, 2 deletions
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]);
}
}