From e99828b06a1b694b7aca09682ae2b1be9089af88 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 15 Apr 2010 16:24:12 -0700 Subject: tick: rename Clock namespace to SimClock --- src/arch/alpha/freebsd/system.cc | 2 +- src/arch/alpha/linux/system.cc | 2 +- src/arch/alpha/tru64/process.cc | 2 +- src/arch/mips/linux/system.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/arch') diff --git a/src/arch/alpha/freebsd/system.cc b/src/arch/alpha/freebsd/system.cc index e541b260c..ac7a92ed3 100644 --- a/src/arch/alpha/freebsd/system.cc +++ b/src/arch/alpha/freebsd/system.cc @@ -77,7 +77,7 @@ FreebsdAlphaSystem::doCalibrateClocks(ThreadContext *tc) ppc_vaddr = (Addr)tc->readIntReg(17); timer_vaddr = (Addr)tc->readIntReg(18); - virtPort.write(ppc_vaddr, (uint32_t)Clock::Frequency); + virtPort.write(ppc_vaddr, (uint32_t)SimClock::Frequency); virtPort.write(timer_vaddr, (uint32_t)TIMER_FREQUENCY); } diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc index 1d9332a58..c2af286dd 100644 --- a/src/arch/alpha/linux/system.cc +++ b/src/arch/alpha/linux/system.cc @@ -86,7 +86,7 @@ LinuxAlphaSystem::LinuxAlphaSystem(Params *p) * calculated it by using the PIT, RTC, etc. */ if (kernelSymtab->findAddress("est_cycle_freq", addr)) - virtPort.write(addr, (uint64_t)(Clock::Frequency / + virtPort.write(addr, (uint64_t)(SimClock::Frequency / p->boot_cpu_frequency)); diff --git a/src/arch/alpha/tru64/process.cc b/src/arch/alpha/tru64/process.cc index b039fbe19..824e0413c 100644 --- a/src/arch/alpha/tru64/process.cc +++ b/src/arch/alpha/tru64/process.cc @@ -183,7 +183,7 @@ tableFunc(SyscallDesc *desc, int callnum, LiveProcess *process, TypedBufferArg elp(bufPtr); const int clk_hz = one_million; - elp->si_user = htog(curTick / (Clock::Frequency / clk_hz)); + elp->si_user = htog(curTick / (SimClock::Frequency / clk_hz)); elp->si_nice = htog(0); elp->si_sys = htog(0); elp->si_idle = htog(0); diff --git a/src/arch/mips/linux/system.cc b/src/arch/mips/linux/system.cc index 295e22a61..ff07f526a 100644 --- a/src/arch/mips/linux/system.cc +++ b/src/arch/mips/linux/system.cc @@ -85,7 +85,7 @@ LinuxMipsSystem::LinuxMipsSystem(Params *p) * calculated it by using the PIT, RTC, etc. */ if (kernelSymtab->findAddress("est_cycle_freq", addr)) - virtPort.write(addr, (uint64_t)(Clock::Frequency / + virtPort.write(addr, (uint64_t)(SimClock::Frequency / p->boot_cpu_frequency)); /** -- cgit v1.2.3