From 5146a69835bc9ba37fba7d3b0ff72ecaf9b98b74 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Mon, 7 Jan 2013 13:05:33 -0500 Subject: cpu: rename the misleading inSyscall to noSquashFromTC isSyscall was originally created because during handling of a syscall in SE mode the threadcontext had to be updated. However, in many places this is used in FS mode (e.g. fault handlers) and the name doesn't make much sense. The boolean actually stops gem5 from squashing speculative and non-committed state when a write to a threadcontext happens, so re-name the variable to something more appropriate --- src/cpu/checker/cpu_impl.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cpu/checker/cpu_impl.hh') diff --git a/src/cpu/checker/cpu_impl.hh b/src/cpu/checker/cpu_impl.hh index 5637eb08b..49ff8eaa1 100644 --- a/src/cpu/checker/cpu_impl.hh +++ b/src/cpu/checker/cpu_impl.hh @@ -573,12 +573,12 @@ Checker::validateState() "registers from main CPU", curTick(), unverifiedInst->instAddr()); // Terribly convoluted way to make sure O3 model does not implode - bool inSyscall = unverifiedInst->thread->inSyscall; - unverifiedInst->thread->inSyscall = true; + bool no_squash_from_TC = unverifiedInst->thread->noSquashFromTC; + unverifiedInst->thread->noSquashFromTC = true; // Heavy-weight copying of all registers thread->copyArchRegs(unverifiedInst->tcBase()); - unverifiedInst->thread->inSyscall = inSyscall; + unverifiedInst->thread->noSquashFromTC = no_squash_from_TC; // Set curStaticInst to unverifiedInst->staticInst curStaticInst = unverifiedInst->staticInst; -- cgit v1.2.3