diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-06-28 14:03:04 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-06-28 14:03:04 -0400 |
| commit | bc76a807af2a2a874be461f0c6be9a6c5ec8bfad (patch) | |
| tree | 423bd4e153fcc425dc9b7266978bd42778e55c32 /arch/alpha | |
| parent | 8b042182626b94ed6380f0ba6b99c0e862aa710f (diff) | |
| parent | 036a8ceb8da8aff10b819b4aab32584d41282a64 (diff) | |
| download | gem5-bc76a807af2a2a874be461f0c6be9a6c5ec8bfad.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision : 453615c8194ae9ca96330b7493c6b19fc89c3a72
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/ev5.hh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/alpha/ev5.hh b/arch/alpha/ev5.hh index 8508162ed..a5a76b5bd 100644 --- a/arch/alpha/ev5.hh +++ b/arch/alpha/ev5.hh @@ -58,6 +58,16 @@ const Addr PAddrUncachedBit39 = ULL(0x8000000000); const Addr PAddrUncachedBit40 = ULL(0x10000000000); const Addr PAddrUncachedBit43 = ULL(0x80000000000); const Addr PAddrUncachedMask = ULL(0x807ffffffff); // Clear PA<42:35> +inline Addr Phys2K0Seg(Addr addr) +{ +#ifndef ALPHA_TLASER + if (addr & PAddrUncachedBit43) { + addr &= PAddrUncachedMask; + addr |= PAddrUncachedBit40; + } +#endif + return addr | AlphaISA::K0SegBase; +} inline int DTB_ASN_ASN(uint64_t reg) { return reg >> 57 & AsnMask; } inline Addr DTB_PTE_PPN(uint64_t reg) |