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

Merge zizzer:/bk/newmem

Browse source 
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : c6fbe09348b606b94bbb35f911dea94353f076f9
This commit is contained in:
Ali Saidi 2007-03-12 13:56:30 -04:00
commit 1356fb953d
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/arch/sparc/miscregfile.cc
View file

@ -231,14 +231,6 @@ MiscReg MiscRegFile::readRegNoEffect(int miscReg)
return hintp; return hintp;
case MISCREG_HTBA: case MISCREG_HTBA:
return htba; return htba;
case MISCREG_HVER:
// XXX set to match Legion
return ULL(0x3e) << 48 |
ULL(0x23) << 32 |
ULL(0x20) << 24 |
//MaxGL << 16 | XXX For some reason legion doesn't set GL
MaxTL << 8 |
(NWindows -1) << 0;
case MISCREG_STRAND_STS_REG: case MISCREG_STRAND_STS_REG:
return strandStatusReg; return strandStatusReg;
case MISCREG_HSTICK_CMPR: case MISCREG_HSTICK_CMPR:

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

@ -235,7 +235,13 @@ MiscRegFile::readFSReg(int miscReg, ThreadContext * tc)
case MISCREG_HTBA: case MISCREG_HTBA:
return readRegNoEffect(miscReg) & ULL(~0x7FFF); return readRegNoEffect(miscReg) & ULL(~0x7FFF);
case MISCREG_HVER: case MISCREG_HVER:
return NWindows | MaxTL << 8 | MaxGL << 16; // XXX set to match Legion
return ULL(0x3e) << 48 |
ULL(0x23) << 32 |
ULL(0x20) << 24 |
//MaxGL << 16 | XXX For some reason legion doesn't set GL
MaxTL << 8 |
(NWindows -1) << 0;
case MISCREG_STRAND_STS_REG: case MISCREG_STRAND_STS_REG:
System *sys; System *sys;