sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Automated merge with ssh://m5sim.org//repo/m5

Browse source
This commit is contained in:
Lisa Hsu 2008-11-05 18:12:21 -05:00
parent 2435918ac2 44839d6b71
commit be679b8e5e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/arch/sparc/ua2005.cc
View file

@ -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;

2
src/dev/x86/i82094aa.cc
View file

@ -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;