summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2009-07-09 20:29:02 -0700
committerGabe Black <gblack@eecs.umich.edu>2009-07-09 20:29:02 -0700
commit9993ca8280b03a390d860b9dfb6597c7ecc98a27 (patch)
treee9467da7e824e12d4761114c373e88294734ad66
parent60d47aa5f9018bf29651ec33ae1f20793fcdc4eb (diff)
downloadgem5-9993ca8280b03a390d860b9dfb6597c7ecc98a27.tar.xz
X86: Fold the MiscRegFile all the way into the ISA object.
-rw-r--r--src/arch/x86/SConscript1
-rw-r--r--src/arch/x86/isa.cc322
-rw-r--r--src/arch/x86/isa.hh23
-rw-r--r--src/arch/x86/isa/includes.isa1
-rw-r--r--src/arch/x86/miscregfile.cc406
-rw-r--r--src/arch/x86/miscregfile.hh134
6 files changed, 318 insertions, 569 deletions
diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript
index 1cb0edaf2..96af0767c 100644
--- a/src/arch/x86/SConscript
+++ b/src/arch/x86/SConscript
@@ -95,7 +95,6 @@ if env['TARGET_ISA'] == 'x86':
Source('insts/microregop.cc')
Source('insts/static_inst.cc')
Source('isa.cc')
- Source('miscregfile.cc')
Source('pagetable.cc')
Source('predecoder.cc')
Source('predecoder_tables.cc')
diff --git a/src/arch/x86/isa.cc b/src/arch/x86/isa.cc
index 4d8c8bb67..d19a2a6cc 100644
--- a/src/arch/x86/isa.cc
+++ b/src/arch/x86/isa.cc
@@ -28,41 +28,331 @@
* Authors: Gabe Black
*/
-#include "arch/x86/isa.hh"
#include "arch/x86/floatregs.hh"
+#include "arch/x86/isa.hh"
+#include "arch/x86/tlb.hh"
+#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "sim/serialize.hh"
namespace X86ISA
{
void
+ISA::updateHandyM5Reg(Efer efer, CR0 cr0,
+ SegAttr csAttr, SegAttr ssAttr, RFLAGS rflags)
+{
+ HandyM5Reg m5reg;
+ if (efer.lma) {
+ m5reg.mode = LongMode;
+ if (csAttr.longMode)
+ m5reg.submode = SixtyFourBitMode;
+ else
+ m5reg.submode = CompatabilityMode;
+ } else {
+ m5reg.mode = LegacyMode;
+ if (cr0.pe) {
+ if (rflags.vm)
+ m5reg.submode = Virtual8086Mode;
+ else
+ m5reg.submode = ProtectedMode;
+ } else {
+ m5reg.submode = RealMode;
+ }
+ }
+ m5reg.cpl = csAttr.dpl;
+ m5reg.paging = cr0.pg;
+ m5reg.prot = cr0.pe;
+
+ // Compute the default and alternate operand size.
+ if (m5reg.submode == SixtyFourBitMode || csAttr.defaultSize) {
+ m5reg.defOp = 2;
+ m5reg.altOp = 1;
+ } else {
+ m5reg.defOp = 1;
+ m5reg.altOp = 2;
+ }
+
+ // Compute the default and alternate address size.
+ if (m5reg.submode == SixtyFourBitMode) {
+ m5reg.defAddr = 3;
+ m5reg.altAddr = 2;
+ } else if (csAttr.defaultSize) {
+ m5reg.defAddr = 2;
+ m5reg.altAddr = 1;
+ } else {
+ m5reg.defAddr = 1;
+ m5reg.altAddr = 2;
+ }
+
+ // Compute the stack size
+ if (m5reg.submode == SixtyFourBitMode) {
+ m5reg.stack = 3;
+ } else if (ssAttr.defaultSize) {
+ m5reg.stack = 2;
+ } else {
+ m5reg.stack = 1;
+ }
+
+ regVal[MISCREG_M5_REG] = m5reg;
+}
+
+void
ISA::clear()
{
- miscRegFile.clear();
+ // Blank everything. 0 might not be an appropriate value for some things,
+ // but it is for most.
+ memset(regVal, 0, NumMiscRegs * sizeof(MiscReg));
+ regVal[MISCREG_DR6] = (mask(8) << 4) | (mask(16) << 16);
+ regVal[MISCREG_DR7] = 1 << 10;
}
MiscReg
ISA::readMiscRegNoEffect(int miscReg)
{
- return miscRegFile.readRegNoEffect((MiscRegIndex)miscReg);
+ // Make sure we're not dealing with an illegal control register.
+ // Instructions should filter out these indexes, and nothing else should
+ // attempt to read them directly.
+ assert( miscReg != MISCREG_CR1 &&
+ !(miscReg > MISCREG_CR4 &&
+ miscReg < MISCREG_CR8) &&
+ !(miscReg > MISCREG_CR8 &&
+ miscReg <= MISCREG_CR15));
+
+ return regVal[miscReg];
}
MiscReg
-ISA::readMiscReg(int miscReg, ThreadContext *tc)
+ISA::readMiscReg(int miscReg, ThreadContext * tc)
{
- return miscRegFile.readReg((MiscRegIndex)miscReg, tc);
+ if (miscReg == MISCREG_TSC) {
+ return regVal[MISCREG_TSC] + tc->getCpuPtr()->curCycle();
+ }
+ return readMiscRegNoEffect(miscReg);
}
void
-ISA::setMiscRegNoEffect(int miscReg, const MiscReg val)
+ISA::setMiscRegNoEffect(int miscReg, MiscReg val)
{
- miscRegFile.setRegNoEffect((MiscRegIndex)miscReg, val);
+ // Make sure we're not dealing with an illegal control register.
+ // Instructions should filter out these indexes, and nothing else should
+ // attempt to write to them directly.
+ assert( miscReg != MISCREG_CR1 &&
+ !(miscReg > MISCREG_CR4 &&
+ miscReg < MISCREG_CR8) &&
+ !(miscReg > MISCREG_CR8 &&
+ miscReg <= MISCREG_CR15));
+ regVal[miscReg] = val;
}
void
-ISA::setMiscReg(int miscReg, const MiscReg val, ThreadContext *tc)
+ISA::setMiscReg(int miscReg, MiscReg val, ThreadContext * tc)
{
- miscRegFile.setReg((MiscRegIndex)miscReg, val, tc);
+ MiscReg newVal = val;
+ switch(miscReg)
+ {
+ case MISCREG_CR0:
+ {
+ CR0 toggled = regVal[miscReg] ^ val;
+ CR0 newCR0 = val;
+ Efer efer = regVal[MISCREG_EFER];
+ if (toggled.pg && efer.lme) {
+ if (newCR0.pg) {
+ //Turning on long mode
+ efer.lma = 1;
+ regVal[MISCREG_EFER] = efer;
+ } else {
+ //Turning off long mode
+ efer.lma = 0;
+ regVal[MISCREG_EFER] = efer;
+ }
+ }
+ if (toggled.pg) {
+ tc->getITBPtr()->invalidateAll();
+ tc->getDTBPtr()->invalidateAll();
+ }
+ //This must always be 1.
+ newCR0.et = 1;
+ newVal = newCR0;
+ updateHandyM5Reg(regVal[MISCREG_EFER],
+ newCR0,
+ regVal[MISCREG_CS_ATTR],
+ regVal[MISCREG_SS_ATTR],
+ regVal[MISCREG_RFLAGS]);
+ }
+ break;
+ case MISCREG_CR2:
+ break;
+ case MISCREG_CR3:
+ tc->getITBPtr()->invalidateNonGlobal();
+ tc->getDTBPtr()->invalidateNonGlobal();
+ break;
+ case MISCREG_CR4:
+ {
+ CR4 toggled = regVal[miscReg] ^ val;
+ if (toggled.pae || toggled.pse || toggled.pge) {
+ tc->getITBPtr()->invalidateAll();
+ tc->getDTBPtr()->invalidateAll();
+ }
+ }
+ break;
+ case MISCREG_CR8:
+ break;
+ case MISCREG_CS_ATTR:
+ {
+ SegAttr toggled = regVal[miscReg] ^ val;
+ SegAttr newCSAttr = val;
+ if (toggled.longMode) {
+ if (newCSAttr.longMode) {
+ regVal[MISCREG_ES_EFF_BASE] = 0;
+ regVal[MISCREG_CS_EFF_BASE] = 0;
+ regVal[MISCREG_SS_EFF_BASE] = 0;
+ regVal[MISCREG_DS_EFF_BASE] = 0;
+ } else {
+ regVal[MISCREG_ES_EFF_BASE] = regVal[MISCREG_ES_BASE];
+ regVal[MISCREG_CS_EFF_BASE] = regVal[MISCREG_CS_BASE];
+ regVal[MISCREG_SS_EFF_BASE] = regVal[MISCREG_SS_BASE];
+ regVal[MISCREG_DS_EFF_BASE] = regVal[MISCREG_DS_BASE];
+ }
+ }
+ updateHandyM5Reg(regVal[MISCREG_EFER],
+ regVal[MISCREG_CR0],
+ newCSAttr,
+ regVal[MISCREG_SS_ATTR],
+ regVal[MISCREG_RFLAGS]);
+ }
+ break;
+ case MISCREG_SS_ATTR:
+ updateHandyM5Reg(regVal[MISCREG_EFER],
+ regVal[MISCREG_CR0],
+ regVal[MISCREG_CS_ATTR],
+ val,
+ regVal[MISCREG_RFLAGS]);
+ break;
+ // These segments always actually use their bases, or in other words
+ // their effective bases must stay equal to their actual bases.
+ case MISCREG_FS_BASE:
+ case MISCREG_GS_BASE:
+ case MISCREG_HS_BASE:
+ case MISCREG_TSL_BASE:
+ case MISCREG_TSG_BASE:
+ case MISCREG_TR_BASE:
+ case MISCREG_IDTR_BASE:
+ regVal[MISCREG_SEG_EFF_BASE(miscReg - MISCREG_SEG_BASE_BASE)] = val;
+ break;
+ // These segments ignore their bases in 64 bit mode.
+ // their effective bases must stay equal to their actual bases.
+ case MISCREG_ES_BASE:
+ case MISCREG_CS_BASE:
+ case MISCREG_SS_BASE:
+ case MISCREG_DS_BASE:
+ {
+ Efer efer = regVal[MISCREG_EFER];
+ SegAttr csAttr = regVal[MISCREG_CS_ATTR];
+ if (!efer.lma || !csAttr.longMode) // Check for non 64 bit mode.
+ regVal[MISCREG_SEG_EFF_BASE(miscReg -
+ MISCREG_SEG_BASE_BASE)] = val;
+ }
+ break;
+ case MISCREG_TSC:
+ regVal[MISCREG_TSC] = val - tc->getCpuPtr()->curCycle();
+ return;
+ case MISCREG_DR0:
+ case MISCREG_DR1:
+ case MISCREG_DR2:
+ case MISCREG_DR3:
+ /* These should eventually set up breakpoints. */
+ break;
+ case MISCREG_DR4:
+ miscReg = MISCREG_DR6;
+ /* Fall through to have the same effects as DR6. */
+ case MISCREG_DR6:
+ {
+ DR6 dr6 = regVal[MISCREG_DR6];
+ DR6 newDR6 = val;
+ dr6.b0 = newDR6.b0;
+ dr6.b1 = newDR6.b1;
+ dr6.b2 = newDR6.b2;
+ dr6.b3 = newDR6.b3;
+ dr6.bd = newDR6.bd;
+ dr6.bs = newDR6.bs;
+ dr6.bt = newDR6.bt;
+ newVal = dr6;
+ }
+ break;
+ case MISCREG_DR5:
+ miscReg = MISCREG_DR7;
+ /* Fall through to have the same effects as DR7. */
+ case MISCREG_DR7:
+ {
+ DR7 dr7 = regVal[MISCREG_DR7];
+ DR7 newDR7 = val;
+ dr7.l0 = newDR7.l0;
+ dr7.g0 = newDR7.g0;
+ if (dr7.l0 || dr7.g0) {
+ panic("Debug register breakpoints not implemented.\n");
+ } else {
+ /* Disable breakpoint 0. */
+ }
+ dr7.l1 = newDR7.l1;
+ dr7.g1 = newDR7.g1;
+ if (dr7.l1 || dr7.g1) {
+ panic("Debug register breakpoints not implemented.\n");
+ } else {
+ /* Disable breakpoint 1. */
+ }
+ dr7.l2 = newDR7.l2;
+ dr7.g2 = newDR7.g2;
+ if (dr7.l2 || dr7.g2) {
+ panic("Debug register breakpoints not implemented.\n");
+ } else {
+ /* Disable breakpoint 2. */
+ }
+ dr7.l3 = newDR7.l3;
+ dr7.g3 = newDR7.g3;
+ if (dr7.l3 || dr7.g3) {
+ panic("Debug register breakpoints not implemented.\n");
+ } else {
+ /* Disable breakpoint 3. */
+ }
+ dr7.gd = newDR7.gd;
+ dr7.rw0 = newDR7.rw0;
+ dr7.len0 = newDR7.len0;
+ dr7.rw1 = newDR7.rw1;
+ dr7.len1 = newDR7.len1;
+ dr7.rw2 = newDR7.rw2;
+ dr7.len2 = newDR7.len2;
+ dr7.rw3 = newDR7.rw3;
+ dr7.len3 = newDR7.len3;
+ }
+ break;
+ case MISCREG_M5_REG:
+ // Writing anything to the m5reg with side effects makes it update
+ // based on the current values of the relevant registers. The actual
+ // value written is discarded.
+ updateHandyM5Reg(regVal[MISCREG_EFER],
+ regVal[MISCREG_CR0],
+ regVal[MISCREG_CS_ATTR],
+ regVal[MISCREG_SS_ATTR],
+ regVal[MISCREG_RFLAGS]);
+ return;
+ default:
+ break;
+ }
+ setMiscRegNoEffect(miscReg, newVal);
+}
+
+void
+ISA::serialize(EventManager *em, std::ostream & os)
+{
+ SERIALIZE_ARRAY(regVal, NumMiscRegs);
+}
+
+void
+ISA::unserialize(EventManager *em, Checkpoint * cp,
+ const std::string & section)
+{
+ UNSERIALIZE_ARRAY(regVal, NumMiscRegs);
}
int
@@ -80,22 +370,10 @@ int
ISA::flattenFloatIndex(int reg)
{
if (reg >= NUM_FLOATREGS) {
- int top = miscRegFile.readRegNoEffect(MISCREG_X87_TOP);
+ int top = readMiscRegNoEffect(MISCREG_X87_TOP);
reg = FLOATREG_STACK(reg - NUM_FLOATREGS, top);
}
return reg;
}
-void
-ISA::serialize(EventManager *em, std::ostream &os)
-{
- miscRegFile.serialize(os);
-}
-
-void
-ISA::unserialize(EventManager *em, Checkpoint *cp, const std::string &section)
-{
- miscRegFile.unserialize(cp, section);
-}
-
}
diff --git a/src/arch/x86/isa.hh b/src/arch/x86/isa.hh
index 5b120d69e..285f0aa82 100644
--- a/src/arch/x86/isa.hh
+++ b/src/arch/x86/isa.hh
@@ -31,28 +31,39 @@
#ifndef __ARCH_X86_ISA_HH__
#define __ARCH_X86_ISA_HH__
-#include "arch/x86/miscregfile.hh"
-#include "arch/x86/types.hh"
+#include "arch/x86/miscregs.hh"
+#include "arch/x86/registers.hh"
+#include "base/types.hh"
+
+#include <string>
+#include <iostream>
class Checkpoint;
class EventManager;
+class ThreadContext;
namespace X86ISA
{
class ISA
{
protected:
- MiscRegFile miscRegFile;
+ MiscReg regVal[NUM_MISCREGS];
+ void updateHandyM5Reg(Efer efer, CR0 cr0,
+ SegAttr csAttr, SegAttr ssAttr, RFLAGS rflags);
public:
void clear();
+ ISA()
+ {
+ clear();
+ }
+
MiscReg readMiscRegNoEffect(int miscReg);
MiscReg readMiscReg(int miscReg, ThreadContext *tc);
- void setMiscRegNoEffect(int miscReg, const MiscReg val);
- void setMiscReg(int miscReg, const MiscReg val,
- ThreadContext *tc);
+ void setMiscRegNoEffect(int miscReg, MiscReg val);
+ void setMiscReg(int miscReg, MiscReg val, ThreadContext *tc);
int flattenIntIndex(int reg);
int flattenFloatIndex(int reg);
diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 93685cd9f..3ac9cd4f9 100644
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -149,6 +149,7 @@ output exec {{
#include <cmath>
#include "arch/x86/cpuid.hh"
+#include "arch/x86/faults.hh"
#include "arch/x86/miscregs.hh"
#include "arch/x86/tlb.hh"
#include "base/bigint.hh"
diff --git a/src/arch/x86/miscregfile.cc b/src/arch/x86/miscregfile.cc
deleted file mode 100644
index 317cdadc5..000000000
--- a/src/arch/x86/miscregfile.cc
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Copyright (c) 2003-2006, 2008 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Gabe Black
- */
-
-/*
- * Copyright (c) 2007-2008 The Hewlett-Packard Development Company
- * All rights reserved.
- *
- * Redistribution and use of this software in source and binary forms,
- * with or without modification, are permitted provided that the
- * following conditions are met:
- *
- * The software must be used only for Non-Commercial Use which means any
- * use which is NOT directed to receiving any direct monetary
- * compensation for, or commercial advantage from such use. Illustrative
- * examples of non-commercial use are academic research, personal study,
- * teaching, education and corporate research & development.
- * Illustrative examples of commercial use are distributing products for
- * commercial advantage and providing services using the software for
- * commercial advantage.
- *
- * If you wish to use this software or functionality therein that may be
- * covered by patents for commercial use, please contact:
- * Director of Intellectual Property Licensing
- * Office of Strategy and Technology
- * Hewlett-Packard Company
- * 1501 Page Mill Road
- * Palo Alto, California 94304
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer. Redistributions
- * in binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution. Neither the name of
- * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission. No right of
- * sublicense is granted herewith. Derivatives of the software and
- * output created using the software may be prepared, but only for
- * Non-Commercial Uses. Derivatives of the software may be shared with
- * others provided: (i) the others agree to abide by the list of
- * conditions herein which includes the Non-Commercial Use restrictions;
- * and (ii) such Derivatives of the software include the above copyright
- * notice to acknowledge the contribution from this software where
- * applicable, this list of conditions and the disclaimer below.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Gabe Black
- */
-
-#include "arch/x86/miscregfile.hh"
-#include "arch/x86/tlb.hh"
-#include "cpu/base.hh"
-#include "cpu/thread_context.hh"
-#include "sim/serialize.hh"
-
-using namespace X86ISA;
-using namespace std;
-
-class Checkpoint;
-
-void MiscRegFile::updateHandyM5Reg(Efer efer, CR0 cr0,
- SegAttr csAttr, SegAttr ssAttr, RFLAGS rflags)
-{
- HandyM5Reg m5reg;
- if (efer.lma) {
- m5reg.mode = LongMode;
- if (csAttr.longMode)
- m5reg.submode = SixtyFourBitMode;
- else
- m5reg.submode = CompatabilityMode;
- } else {
- m5reg.mode = LegacyMode;
- if (cr0.pe) {
- if (rflags.vm)
- m5reg.submode = Virtual8086Mode;
- else
- m5reg.submode = ProtectedMode;
- } else {
- m5reg.submode = RealMode;
- }
- }
- m5reg.cpl = csAttr.dpl;
- m5reg.paging = cr0.pg;
- m5reg.prot = cr0.pe;
-
- // Compute the default and alternate operand size.
- if (m5reg.submode == SixtyFourBitMode || csAttr.defaultSize) {
- m5reg.defOp = 2;
- m5reg.altOp = 1;
- } else {
- m5reg.defOp = 1;
- m5reg.altOp = 2;
- }
-
- // Compute the default and alternate address size.
- if (m5reg.submode == SixtyFourBitMode) {
- m5reg.defAddr = 3;
- m5reg.altAddr = 2;
- } else if (csAttr.defaultSize) {
- m5reg.defAddr = 2;
- m5reg.altAddr = 1;
- } else {
- m5reg.defAddr = 1;
- m5reg.altAddr = 2;
- }
-
- // Compute the stack size
- if (m5reg.submode == SixtyFourBitMode) {
- m5reg.stack = 3;
- } else if (ssAttr.defaultSize) {
- m5reg.stack = 2;
- } else {
- m5reg.stack = 1;
- }
-
- regVal[MISCREG_M5_REG] = m5reg;
-}
-
-void MiscRegFile::clear()
-{
- // Blank everything. 0 might not be an appropriate value for some things,
- // but it is for most.
- memset(regVal, 0, NumMiscRegs * sizeof(MiscReg));
- regVal[MISCREG_DR6] = (mask(8) << 4) | (mask(16) << 16);
- regVal[MISCREG_DR7] = 1 << 10;
-}
-
-MiscReg MiscRegFile::readRegNoEffect(MiscRegIndex miscReg)
-{
- // Make sure we're not dealing with an illegal control register.
- // Instructions should filter out these indexes, and nothing else should
- // attempt to read them directly.
- assert( miscReg != MISCREG_CR1 &&
- !(miscReg > MISCREG_CR4 &&
- miscReg < MISCREG_CR8) &&
- !(miscReg > MISCREG_CR8 &&
- miscReg <= MISCREG_CR15));
-
- return regVal[miscReg];
-}
-
-MiscReg MiscRegFile::readReg(MiscRegIndex miscReg, ThreadContext * tc)
-{
- if (miscReg == MISCREG_TSC) {
- return regVal[MISCREG_TSC] + tc->getCpuPtr()->curCycle();
- }
- return readRegNoEffect(miscReg);
-}
-
-void MiscRegFile::setRegNoEffect(MiscRegIndex miscReg, const MiscReg &val)
-{
- // Make sure we're not dealing with an illegal control register.
- // Instructions should filter out these indexes, and nothing else should
- // attempt to write to them directly.
- assert( miscReg != MISCREG_CR1 &&
- !(miscReg > MISCREG_CR4 &&
- miscReg < MISCREG_CR8) &&
- !(miscReg > MISCREG_CR8 &&
- miscReg <= MISCREG_CR15));
- regVal[miscReg] = val;
-}
-
-void MiscRegFile::setReg(MiscRegIndex miscReg,
- const MiscReg &val, ThreadContext * tc)
-{
- MiscReg newVal = val;
- switch(miscReg)
- {
- case MISCREG_CR0:
- {
- CR0 toggled = regVal[miscReg] ^ val;
- CR0 newCR0 = val;
- Efer efer = regVal[MISCREG_EFER];
- if (toggled.pg && efer.lme) {
- if (newCR0.pg) {
- //Turning on long mode
- efer.lma = 1;
- regVal[MISCREG_EFER] = efer;
- } else {
- //Turning off long mode
- efer.lma = 0;
- regVal[MISCREG_EFER] = efer;
- }
- }
- if (toggled.pg) {
- tc->getITBPtr()->invalidateAll();
- tc->getDTBPtr()->invalidateAll();
- }
- //This must always be 1.
- newCR0.et = 1;
- newVal = newCR0;
- updateHandyM5Reg(regVal[MISCREG_EFER],
- newCR0,
- regVal[MISCREG_CS_ATTR],
- regVal[MISCREG_SS_ATTR],
- regVal[MISCREG_RFLAGS]);
- }
- break;
- case MISCREG_CR2:
- break;
- case MISCREG_CR3:
- tc->getITBPtr()->invalidateNonGlobal();
- tc->getDTBPtr()->invalidateNonGlobal();
- break;
- case MISCREG_CR4:
- {
- CR4 toggled = regVal[miscReg] ^ val;
- if (toggled.pae || toggled.pse || toggled.pge) {
- tc->getITBPtr()->invalidateAll();
- tc->getDTBPtr()->invalidateAll();
- }
- }
- break;
- case MISCREG_CR8:
- break;
- case MISCREG_CS_ATTR:
- {
- SegAttr toggled = regVal[miscReg] ^ val;
- SegAttr newCSAttr = val;
- if (toggled.longMode) {
- if (newCSAttr.longMode) {
- regVal[MISCREG_ES_EFF_BASE] = 0;
- regVal[MISCREG_CS_EFF_BASE] = 0;
- regVal[MISCREG_SS_EFF_BASE] = 0;
- regVal[MISCREG_DS_EFF_BASE] = 0;
- } else {
- regVal[MISCREG_ES_EFF_BASE] = regVal[MISCREG_ES_BASE];
- regVal[MISCREG_CS_EFF_BASE] = regVal[MISCREG_CS_BASE];
- regVal[MISCREG_SS_EFF_BASE] = regVal[MISCREG_SS_BASE];
- regVal[MISCREG_DS_EFF_BASE] = regVal[MISCREG_DS_BASE];
- }
- }
- updateHandyM5Reg(regVal[MISCREG_EFER],
- regVal[MISCREG_CR0],
- newCSAttr,
- regVal[MISCREG_SS_ATTR],
- regVal[MISCREG_RFLAGS]);
- }
- break;
- case MISCREG_SS_ATTR:
- updateHandyM5Reg(regVal[MISCREG_EFER],
- regVal[MISCREG_CR0],
- regVal[MISCREG_CS_ATTR],
- val,
- regVal[MISCREG_RFLAGS]);
- break;
- // These segments always actually use their bases, or in other words
- // their effective bases must stay equal to their actual bases.
- case MISCREG_FS_BASE:
- case MISCREG_GS_BASE:
- case MISCREG_HS_BASE:
- case MISCREG_TSL_BASE:
- case MISCREG_TSG_BASE:
- case MISCREG_TR_BASE:
- case MISCREG_IDTR_BASE:
- regVal[MISCREG_SEG_EFF_BASE(miscReg - MISCREG_SEG_BASE_BASE)] = val;
- break;
- // These segments ignore their bases in 64 bit mode.
- // their effective bases must stay equal to their actual bases.
- case MISCREG_ES_BASE:
- case MISCREG_CS_BASE:
- case MISCREG_SS_BASE:
- case MISCREG_DS_BASE:
- {
- Efer efer = regVal[MISCREG_EFER];
- SegAttr csAttr = regVal[MISCREG_CS_ATTR];
- if (!efer.lma || !csAttr.longMode) // Check for non 64 bit mode.
- regVal[MISCREG_SEG_EFF_BASE(miscReg -
- MISCREG_SEG_BASE_BASE)] = val;
- }
- break;
- case MISCREG_TSC:
- regVal[MISCREG_TSC] = val - tc->getCpuPtr()->curCycle();
- return;
- case MISCREG_DR0:
- case MISCREG_DR1:
- case MISCREG_DR2:
- case MISCREG_DR3:
- /* These should eventually set up breakpoints. */
- break;
- case MISCREG_DR4:
- miscReg = MISCREG_DR6;
- /* Fall through to have the same effects as DR6. */
- case MISCREG_DR6:
- {
- DR6 dr6 = regVal[MISCREG_DR6];
- DR6 newDR6 = val;
- dr6.b0 = newDR6.b0;
- dr6.b1 = newDR6.b1;
- dr6.b2 = newDR6.b2;
- dr6.b3 = newDR6.b3;
- dr6.bd = newDR6.bd;
- dr6.bs = newDR6.bs;
- dr6.bt = newDR6.bt;
- newVal = dr6;
- }
- break;
- case MISCREG_DR5:
- miscReg = MISCREG_DR7;
- /* Fall through to have the same effects as DR7. */
- case MISCREG_DR7:
- {
- DR7 dr7 = regVal[MISCREG_DR7];
- DR7 newDR7 = val;
- dr7.l0 = newDR7.l0;
- dr7.g0 = newDR7.g0;
- if (dr7.l0 || dr7.g0) {
- panic("Debug register breakpoints not implemented.\n");
- } else {
- /* Disable breakpoint 0. */
- }
- dr7.l1 = newDR7.l1;
- dr7.g1 = newDR7.g1;
- if (dr7.l1 || dr7.g1) {
- panic("Debug register breakpoints not implemented.\n");
- } else {
- /* Disable breakpoint 1. */
- }
- dr7.l2 = newDR7.l2;
- dr7.g2 = newDR7.g2;
- if (dr7.l2 || dr7.g2) {
- panic("Debug register breakpoints not implemented.\n");
- } else {
- /* Disable breakpoint 2. */
- }
- dr7.l3 = newDR7.l3;
- dr7.g3 = newDR7.g3;
- if (dr7.l3 || dr7.g3) {
- panic("Debug register breakpoints not implemented.\n");
- } else {
- /* Disable breakpoint 3. */
- }
- dr7.gd = newDR7.gd;
- dr7.rw0 = newDR7.rw0;
- dr7.len0 = newDR7.len0;
- dr7.rw1 = newDR7.rw1;
- dr7.len1 = newDR7.len1;
- dr7.rw2 = newDR7.rw2;
- dr7.len2 = newDR7.len2;
- dr7.rw3 = newDR7.rw3;
- dr7.len3 = newDR7.len3;
- }
- break;
- case MISCREG_M5_REG:
- // Writing anything to the m5reg with side effects makes it update
- // based on the current values of the relevant registers. The actual
- // value written is discarded.
- updateHandyM5Reg(regVal[MISCREG_EFER],
- regVal[MISCREG_CR0],
- regVal[MISCREG_CS_ATTR],
- regVal[MISCREG_SS_ATTR],
- regVal[MISCREG_RFLAGS]);
- return;
- default:
- break;
- }
- setRegNoEffect(miscReg, newVal);
-}
-
-void MiscRegFile::serialize(std::ostream & os)
-{
- SERIALIZE_ARRAY(regVal, NumMiscRegs);
-}
-
-void MiscRegFile::unserialize(Checkpoint * cp, const std::string & section)
-{
- UNSERIALIZE_ARRAY(regVal, NumMiscRegs);
-}
diff --git a/src/arch/x86/miscregfile.hh b/src/arch/x86/miscregfile.hh
deleted file mode 100644
index 8e8adc63b..000000000
--- a/src/arch/x86/miscregfile.hh
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2003-2006 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Gabe Black
- */
-
-/*
- * Copyright (c) 2007-2008 The Hewlett-Packard Development Company
- * All rights reserved.
- *
- * Redistribution and use of this software in source and binary forms,
- * with or without modification, are permitted provided that the
- * following conditions are met:
- *
- * The software must be used only for Non-Commercial Use which means any
- * use which is NOT directed to receiving any direct monetary
- * compensation for, or commercial advantage from such use. Illustrative
- * examples of non-commercial use are academic research, personal study,
- * teaching, education and corporate research & development.
- * Illustrative examples of commercial use are distributing products for
- * commercial advantage and providing services using the software for
- * commercial advantage.
- *
- * If you wish to use this software or functionality therein that may be
- * covered by patents for commercial use, please contact:
- * Director of Intellectual Property Licensing
- * Office of Strategy and Technology
- * Hewlett-Packard Company
- * 1501 Page Mill Road
- * Palo Alto, California 94304
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer. Redistributions
- * in binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution. Neither the name of
- * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission. No right of
- * sublicense is granted herewith. Derivatives of the software and
- * output created using the software may be prepared, but only for
- * Non-Commercial Uses. Derivatives of the software may be shared with
- * others provided: (i) the others agree to abide by the list of
- * conditions herein which includes the Non-Commercial Use restrictions;
- * and (ii) such Derivatives of the software include the above copyright
- * notice to acknowledge the contribution from this software where
- * applicable, this list of conditions and the disclaimer below.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Gabe Black
- */
-
-#ifndef __ARCH_X86_MISCREGFILE_HH__
-#define __ARCH_X86_MISCREGFILE_HH__
-
-#include <string>
-
-#include "arch/x86/faults.hh"
-#include "arch/x86/miscregs.hh"
-#include "arch/x86/registers.hh"
-#include "base/types.hh"
-
-class Checkpoint;
-
-namespace X86ISA
-{
- class MiscRegFile
- {
- protected:
- MiscReg regVal[NUM_MISCREGS];
- void updateHandyM5Reg(Efer efer, CR0 cr0,
- SegAttr csAttr, SegAttr ssAttr, RFLAGS rflags);
-
- public:
- void clear();
-
- MiscRegFile()
- {
- clear();
- }
-
- MiscReg readRegNoEffect(MiscRegIndex miscReg);
-
- MiscReg readReg(MiscRegIndex miscReg, ThreadContext *tc);
-
- void setRegNoEffect(MiscRegIndex miscReg, const MiscReg &val);
-
- void setReg(MiscRegIndex miscReg,
- const MiscReg &val, ThreadContext *tc);
-
- void serialize(std::ostream & os);
-
- void unserialize(Checkpoint * cp, const std::string &section);
-
- void copyMiscRegs(ThreadContext * tc);
- };
-}
-
-#endif //__ARCH_X86_MISCREGFILE_HH__