diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-12 13:56:30 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-12 13:56:30 -0400 |
| commit | 1356fb953de3d61698a962d7a213e14adae68a79 (patch) | |
| tree | 747cc8271598384bed225a5ff269a6c606133ee6 /src | |
| parent | 1aef5c06a3702d7722dcd38e342eae950839cecb (diff) | |
| parent | 9ad24e22481665ae626b0e4ed44e2eea91c1b553 (diff) | |
| download | gem5-1356fb953de3d61698a962d7a213e14adae68a79.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : c6fbe09348b606b94bbb35f911dea94353f076f9
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/sparc/miscregfile.cc | 8 | ||||
| -rw-r--r-- | src/arch/sparc/ua2005.cc | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/arch/sparc/miscregfile.cc b/src/arch/sparc/miscregfile.cc index 20bc4ae5d..f3be1c4c2 100644 --- a/src/arch/sparc/miscregfile.cc +++ b/src/arch/sparc/miscregfile.cc @@ -231,14 +231,6 @@ MiscReg MiscRegFile::readRegNoEffect(int miscReg) return hintp; case MISCREG_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: return strandStatusReg; case MISCREG_HSTICK_CMPR: diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc index 439f38457..865280038 100644 --- a/src/arch/sparc/ua2005.cc +++ b/src/arch/sparc/ua2005.cc @@ -235,7 +235,13 @@ MiscRegFile::readFSReg(int miscReg, ThreadContext * tc) case MISCREG_HTBA: return readRegNoEffect(miscReg) & ULL(~0x7FFF); 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: System *sys; |