From 44839d6b716f2eb25eabc57fe588a129e290e51c Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Wed, 5 Nov 2008 07:20:03 -0800 Subject: [PATCH] Fix a few more places where the context stuff wasn't changed --- src/arch/sparc/ua2005.cc | 2 +- src/dev/x86/i82094aa.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc index 502033d97..2389c963d 100644 --- a/src/arch/sparc/ua2005.cc +++ b/src/arch/sparc/ua2005.cc @@ -257,7 +257,7 @@ 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->getNumContexts() > tc->contextId()); + assert(sys->numContexts() > tc->contextId()); temp |= tc->contextId() << STS::shft_id; diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc index 0ae7c56f3..a229fffc3 100644 --- a/src/dev/x86/i82094aa.cc +++ b/src/dev/x86/i82094aa.cc @@ -39,7 +39,7 @@ X86ISA::I82094AA::I82094AA(Params *p) : PioDevice(p), IntDev(this), latency(p->pio_latency), pioAddr(p->pio_addr), extIntPic(NULL) { // This assumes there's only one I/O APIC in the system - id = sys->getNumCPUs(); + id = sys->numContexts(); assert(id <= 0xf); arbId = id; regSel = 0; -- 2.30.2