diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-10-23 17:40:40 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-10-23 17:40:40 -0700 |
| commit | b0e3aab5df9328ddfd13e396456cebdcaf0c8912 (patch) | |
| tree | 95d4320bb73689187b33a3a59fdba7a78a1b877f | |
| parent | 9eda6f7d59fbcc4bb5c9779df85aa1a0b189565c (diff) | |
| download | gem5-b0e3aab5df9328ddfd13e396456cebdcaf0c8912.tar.xz | |
X86: Fix X86_FS compilation.
--HG--
extra : convert_revision : 5f014337e33a9e1ebe4df4063335315539fff69e
| -rw-r--r-- | src/arch/x86/mmaped_ipr.hh | 3 | ||||
| -rw-r--r-- | src/arch/x86/utility.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/arch/x86/mmaped_ipr.hh b/src/arch/x86/mmaped_ipr.hh index c7befa35b..9184ec4dc 100644 --- a/src/arch/x86/mmaped_ipr.hh +++ b/src/arch/x86/mmaped_ipr.hh @@ -65,6 +65,7 @@ */ #include "config/full_system.hh" +#include "cpu/base.hh" #include "cpu/thread_context.hh" #include "mem/packet.hh" @@ -78,6 +79,7 @@ namespace X86ISA #else pkt->set(xc->readMiscReg(pkt->getAddr() / sizeof(MiscReg))); #endif + return xc->getCpuPtr()->ticks(1); } inline Tick @@ -89,6 +91,7 @@ namespace X86ISA xc->setMiscReg(pkt->getAddr() / sizeof(MiscReg), gtoh(pkt->get<uint64_t>())); #endif + return xc->getCpuPtr()->ticks(1); } }; diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc index 96228b6c4..0eee0c93e 100644 --- a/src/arch/x86/utility.cc +++ b/src/arch/x86/utility.cc @@ -170,7 +170,7 @@ void initCPU(ThreadContext *tc, int cpuId) tc->setMiscReg(MISCREG_MTRR_FIX_16K_80000, 0); tc->setMiscReg(MISCREG_MTRR_FIX_16K_A0000, 0); tc->setMiscReg(MISCREG_MTRR_FIX_4K_C0000, 0); - tc->setMiscReg(MISCREG_MTRR_FIX_4k_C8000, 0); + tc->setMiscReg(MISCREG_MTRR_FIX_4K_C8000, 0); tc->setMiscReg(MISCREG_MTRR_FIX_4K_D0000, 0); tc->setMiscReg(MISCREG_MTRR_FIX_4K_D8000, 0); tc->setMiscReg(MISCREG_MTRR_FIX_4K_E0000, 0); |