X86: Fix a stupid typo where WRMSR and RDMSR were switched, and add a debug statement.

--HG--
extra : convert_revision : f1eb17291f4c01f3c0fa8f99650bc1edf09d21de

diff --git a/src/arch/x86/isa/insts/system/msrs.py b/src/arch/x86/isa/insts/system/msrs.py
index ea576510b1a0abc315c5c06c15ea90ab3e693fda..20b9b2a0bebbcb27d9dfd04349b4aadcd6cd41fe 100644 (file)
--- a/src/arch/x86/isa/insts/system/msrs.py
+++ b/src/arch/x86/isa/insts/system/msrs.py
@@ -54,7 +54,7 @@
 # Authors: Gabe Black
 
 microcode = '''
-def macroop WRMSR
+def macroop RDMSR
 {
     limm t1, "IntAddrPrefixMSR >> 3"
     ld t2, intseg, [8, t1, rcx], dataSize=8, addressSize=4
@@ -63,7 +63,7 @@ def macroop WRMSR
     mov rdx, rdx, t2, dataSize=4
 };
 
-def macroop RDMSR
+def macroop WRMSR
 {
     limm t1, "IntAddrPrefixMSR >> 3"
     mov t2, t2, rdx, dataSize=4

diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index 1184bf9de6fcab5dd0382b4755935b458cffc389..dd516d2a0d50ded7deb44b7528a73f399b352a36 100644 (file)
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -641,6 +641,7 @@ TLB::translate(RequestPtr &req, ThreadContext *tc, bool write, bool execute)
     // If this is true, we're dealing with a request to read an internal
     // value.
     if (seg == SEGMENT_REG_INT) {
+        DPRINTF(TLB, "Addresses references internal memory.\n");
         Addr prefix = vaddr & IntAddrPrefixMask;
         if (prefix == IntAddrPrefixCPUID) {
             panic("CPUID memory space not yet implemented!\n");