From d857faf073895dcfde97141bd6346fe5d4317f8e Mon Sep 17 00:00:00 2001
From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Sun, 2 Nov 2008 21:57:07 -0500
Subject: Add in Context IDs to the simulator. From now on, cpuId is almost
never used, the primary identifier for a hardware context should be
contextId(). The concept of threads within a CPU remains, in the form of
threadId() because sometimes you need to know which context within a cpu to
manipulate.
---
src/arch/sparc/ua2005.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src/arch/sparc')
diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc
index 6961a24e9..502033d97 100644
--- a/src/arch/sparc/ua2005.cc
+++ b/src/arch/sparc/ua2005.cc
@@ -257,11 +257,11 @@ MiscRegFile::readFSReg(int miscReg, ThreadContext * tc)
temp = readRegNoEffect(miscReg) & (STS::active | STS::speculative);
// Check that the CPU array is fully populated
// (by calling getNumCPus())
- assert(sys->getNumCPUs() > tc->cpuId());
+ assert(sys->getNumContexts() > tc->contextId());
- temp |= tc->cpuId() << STS::shft_id;
+ temp |= tc->contextId() << STS::shft_id;
- for (x = tc->cpuId() & ~3; x < sys->threadContexts.size(); x++) {
+ for (x = tc->contextId() & ~3; x < sys->threadContexts.size(); x++) {
switch (sys->threadContexts[x]->status()) {
case ThreadContext::Active:
temp |= STS::st_run << (STS::shft_fsm0 -
--
cgit v1.2.3