From 6f1187943cf78c2fd0334bd7e4372ae79a587fa4 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 7 Jan 2011 21:50:29 -0800 Subject: Replace curTick global variable with accessor functions. This step makes it easy to replace the accessor functions (which still access a global variable) with ones that access per-thread curTick values. --- src/arch/alpha/isa/decoder.isa | 2 +- src/arch/alpha/kernel_stats.cc | 4 ++-- src/arch/alpha/tru64/process.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/arch/alpha') diff --git a/src/arch/alpha/isa/decoder.isa b/src/arch/alpha/isa/decoder.isa index d829ad744..f0aa5a3fd 100644 --- a/src/arch/alpha/isa/decoder.isa +++ b/src/arch/alpha/isa/decoder.isa @@ -791,7 +791,7 @@ decode OPCODE default Unknown::unknown() { Ra = xc->readMiscReg(IPR_CC) + (Rb & 0); #else - Ra = curTick; + Ra = curTick(); #endif }}, IsUnverifiable); diff --git a/src/arch/alpha/kernel_stats.cc b/src/arch/alpha/kernel_stats.cc index 6e9dc1611..70eeadd8e 100644 --- a/src/arch/alpha/kernel_stats.cc +++ b/src/arch/alpha/kernel_stats.cc @@ -143,9 +143,9 @@ Statistics::changeMode(cpu_mode newmode, ThreadContext *tc) Linux::ThreadInfo(tc).curTaskPID()); _modeGood[newmode]++; - _modeTicks[themode] += curTick - lastModeTick; + _modeTicks[themode] += curTick() - lastModeTick; - lastModeTick = curTick; + lastModeTick = curTick(); themode = newmode; } diff --git a/src/arch/alpha/tru64/process.cc b/src/arch/alpha/tru64/process.cc index 9aae7e155..b10fea02b 100644 --- a/src/arch/alpha/tru64/process.cc +++ b/src/arch/alpha/tru64/process.cc @@ -184,7 +184,7 @@ tableFunc(SyscallDesc *desc, int callnum, LiveProcess *process, TypedBufferArg elp(bufPtr); const int clk_hz = one_million; - elp->si_user = htog(curTick / (SimClock::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); -- cgit v1.2.3