Fix a few more places where the context stuff wasn't changed

diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc
index 502033d9766a7d4363efd2cfec89c4979113317b..2389c963d7c061c13c364a4d7883d8e39baef677 100644 (file)
--- 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 0ae7c56f3b27159151ea684c2a178f0acf95db1f..a229fffc3fb388d8f8f78f9c0ae491b921b3827d 100644 (file)
--- 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;