X86: Rename the divide count register to divide configuration.

diff --git a/src/arch/x86/miscregfile.cc b/src/arch/x86/miscregfile.cc
index 1e02391e65661336b94bb5a09bc3256195cce0c4..64dac61475e9a28e93fad75f2800d68182fbcf66 100644 (file)
--- a/src/arch/x86/miscregfile.cc
+++ b/src/arch/x86/miscregfile.cc
@@ -158,9 +158,6 @@ MiscReg MiscRegFile::readReg(int miscReg, ThreadContext * tc)
           case MISCREG_APIC_CURRENT_COUNT:
             panic("Local APIC Current Count register unimplemented.\n");
             break;
-          case MISCREG_APIC_DIVIDE_COUNT:
-            panic("Local APIC Divide Count register unimplemented.\n");
-            break;
         }
     }
     switch (miscReg) {
@@ -270,8 +267,8 @@ void MiscRegFile::setReg(int miscReg,
           case MISCREG_APIC_CURRENT_COUNT:
             panic("Local APIC Current Count register unimplemented.\n");
             break;
-          case MISCREG_APIC_DIVIDE_COUNT:
-            panic("Local APIC Divide Count register unimplemented.\n");
+          case MISCREG_APIC_DIVIDE_CONFIGURATION:
+            newVal = val & 0xB;
             break;
         }
         setRegNoEffect(miscReg, newVal);

diff --git a/src/arch/x86/miscregs.hh b/src/arch/x86/miscregs.hh
index caa1e817bd64905eaa4e4e4fb1a0d2a6b884cdbe..5a6ee752d233178f624cd621e30f24a96185a166 100644 (file)
--- a/src/arch/x86/miscregs.hh
+++ b/src/arch/x86/miscregs.hh
@@ -397,8 +397,8 @@ namespace X86ISA
         MISCREG_APIC_LVT_ERROR,
         MISCREG_APIC_INITIAL_COUNT,
         MISCREG_APIC_CURRENT_COUNT,
-        MISCREG_APIC_DIVIDE_COUNT,
-        MISCREG_APIC_END = MISCREG_APIC_DIVIDE_COUNT,
+        MISCREG_APIC_DIVIDE_CONFIGURATION,
+        MISCREG_APIC_END = MISCREG_APIC_DIVIDE_CONFIGURATION,
 
         MISCREG_APIC_INTERNAL_STATE,
 

diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index ba8f63a0e59b94a8dd59ba6cea004b00a21373f3..692d6d02212c990b4c00220a7f73fa1e073ff616 100644 (file)
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -780,7 +780,7 @@ TLB::translate(RequestPtr &req, ThreadContext *tc, bool write, bool execute)
             regNum = MISCREG_APIC_CURRENT_COUNT;
             break;
           case 0x3E0:
-            regNum = MISCREG_APIC_DIVIDE_COUNT;
+            regNum = MISCREG_APIC_DIVIDE_CONFIGURATION;
             break;
           default:
             // A reserved register field.