X86: Sometimes CPUID depends on ecx, so pass that in.

diff --git a/src/arch/x86/cpuid.cc b/src/arch/x86/cpuid.cc
index cbd1defee0c6ae0c72e8e48c462388c3b46b1276..6b686f38a6a26ca9b4613eb6634c61a14e21a00b 100644 (file)
--- a/src/arch/x86/cpuid.cc
+++ b/src/arch/x86/cpuid.cc
@@ -79,7 +79,8 @@ namespace X86ISA {
     }
 
     bool
-    doCpuid(ThreadContext * tc, uint32_t function, CpuidResult &result)
+    doCpuid(ThreadContext * tc, uint32_t function,
+            uint32_t index, CpuidResult &result)
     {
         uint16_t family = bits(function, 31, 16);
         uint16_t funcNum = bits(function, 15, 0);

diff --git a/src/arch/x86/cpuid.hh b/src/arch/x86/cpuid.hh
index d8b013ba1e04cb57592443f3ee5503dd81487e9e..8d318181922bb319d79d154a2207b16ee228d1ef 100644 (file)
--- a/src/arch/x86/cpuid.hh
+++ b/src/arch/x86/cpuid.hh
@@ -55,7 +55,8 @@ namespace X86ISA
         {}
     };
 
-    bool doCpuid(ThreadContext * tc, uint32_t function, CpuidResult &result);
+    bool doCpuid(ThreadContext * tc, uint32_t function,
+            uint32_t index, CpuidResult &result);
 } // namespace X86ISA
 
 #endif

diff --git a/src/arch/x86/isa/decoder/two_byte_opcodes.isa b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
index 288c5e5a866db21fd27201d9f9ffb3a670faef1c..4b892cda27ac340b42e9c087d4e496e2cb724a93 100644 (file)
--- a/src/arch/x86/isa/decoder/two_byte_opcodes.isa
+++ b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
@@ -767,7 +767,8 @@
                 0x1: pop_fs();
                 0x2: CPUIDInst::CPUID({{
                     CpuidResult result;
-                    success = doCpuid(xc->tcBase(), bits(Rax, 31, 0), result);
+                    success = doCpuid(xc->tcBase(), bits(Rax, 31, 0),
+                        bits(Rcx, 31, 0), result);
                     Rax = result.rax;
                     Rbx = result.rbx;
                     Rcx = result.rcx;