Automated merge with ssh://m5sim.org//repo/m5
This commit is contained in:
commit
be679b8e5e
2 changed files with 2 additions and 2 deletions
|
@ -257,7 +257,7 @@ MiscRegFile::readFSReg(int miscReg, ThreadContext * tc)
|
||||||
temp = readRegNoEffect(miscReg) & (STS::active | STS::speculative);
|
temp = readRegNoEffect(miscReg) & (STS::active | STS::speculative);
|
||||||
// Check that the CPU array is fully populated
|
// Check that the CPU array is fully populated
|
||||||
// (by calling getNumCPus())
|
// (by calling getNumCPus())
|
||||||
assert(sys->getNumContexts() > tc->contextId());
|
assert(sys->numContexts() > tc->contextId());
|
||||||
|
|
||||||
temp |= tc->contextId() << STS::shft_id;
|
temp |= tc->contextId() << STS::shft_id;
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ X86ISA::I82094AA::I82094AA(Params *p) : PioDevice(p), IntDev(this),
|
||||||
latency(p->pio_latency), pioAddr(p->pio_addr), extIntPic(NULL)
|
latency(p->pio_latency), pioAddr(p->pio_addr), extIntPic(NULL)
|
||||||
{
|
{
|
||||||
// This assumes there's only one I/O APIC in the system
|
// This assumes there's only one I/O APIC in the system
|
||||||
id = sys->getNumCPUs();
|
id = sys->numContexts();
|
||||||
assert(id <= 0xf);
|
assert(id <= 0xf);
|
||||||
arbId = id;
|
arbId = id;
|
||||||
regSel = 0;
|
regSel = 0;
|
||||||
|
|
Loading…
Reference in a new issue