x86, kvm: Fix bug in the RFlags get and set functions

The getRFlags and setRFlags utility functions were not updated
correctly when condition registers were separated into their own
register class. This lead to incorrect state transfer in calls from
kvm into the simulator (e.g., m5 readfile ended up in an infinite
loop) and when switching CPUs. This patch makes these utility
functions use getCCReg and setCCReg instead of getIntReg and setIntReg
which read and write the integer registers.

Reviewed-by: Andreas Sandberg <andreas@sandberg.pp.se>

diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc
index f7358341b89d7808b01364ef58f06aafdf224f1d..8f1a419f12c681db7fdc4db2a027235aadb4de7f 100644 (file)
--- a/src/arch/x86/utility.cc
+++ b/src/arch/x86/utility.cc
@@ -261,9 +261,9 @@ uint64_t
 getRFlags(ThreadContext *tc)
 {
     const uint64_t ncc_flags(tc->readMiscRegNoEffect(MISCREG_RFLAGS));
-    const uint64_t cc_flags(tc->readIntReg(X86ISA::CCREG_ZAPS));
-    const uint64_t cfof_bits(tc->readIntReg(X86ISA::CCREG_CFOF));
-    const uint64_t df_bit(tc->readIntReg(X86ISA::CCREG_DF));
+    const uint64_t cc_flags(tc->readCCReg(X86ISA::CCREG_ZAPS));
+    const uint64_t cfof_bits(tc->readCCReg(X86ISA::CCREG_CFOF));
+    const uint64_t df_bit(tc->readCCReg(X86ISA::CCREG_DF));
     // ecf (PSEUDO(3)) & ezf (PSEUDO(4)) are only visible to
     // microcode, so we can safely ignore them.
 
@@ -276,13 +276,13 @@ getRFlags(ThreadContext *tc)
 void
 setRFlags(ThreadContext *tc, uint64_t val)
 {
-    tc->setIntReg(X86ISA::CCREG_ZAPS, val & ccFlagMask);
-    tc->setIntReg(X86ISA::CCREG_CFOF, val & cfofMask);
-    tc->setIntReg(X86ISA::CCREG_DF, val & DFBit);
+    tc->setCCReg(X86ISA::CCREG_ZAPS, val & ccFlagMask);
+    tc->setCCReg(X86ISA::CCREG_CFOF, val & cfofMask);
+    tc->setCCReg(X86ISA::CCREG_DF, val & DFBit);
 
     // Internal microcode registers (ECF & EZF)
-    tc->setIntReg(X86ISA::CCREG_ECF, 0);
-    tc->setIntReg(X86ISA::CCREG_EZF, 0);
+    tc->setCCReg(X86ISA::CCREG_ECF, 0);
+    tc->setCCReg(X86ISA::CCREG_EZF, 0);
 
     // Update the RFLAGS misc reg with whatever didn't go into the
     // magic registers.