diff options
Diffstat (limited to 'src/arch/mips/mips_core_specific.hh')
| -rw-r--r-- | src/arch/mips/mips_core_specific.hh | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/arch/mips/mips_core_specific.hh b/src/arch/mips/mips_core_specific.hh index ff517316e..4e20c11f2 100644 --- a/src/arch/mips/mips_core_specific.hh +++ b/src/arch/mips/mips_core_specific.hh @@ -1,5 +1,5 @@ /* - * Copyright .AN) 2007 MIPS Technologies, Inc. All Rights Reserved + * Copyright N) 2007 MIPS Technologies, Inc. All Rights Reserved * * This software is part of the M5 simulator. * @@ -13,12 +13,12 @@ * and the disclaimer below appear in all copies and derivative works * made, (2) the copyright notice above is augmented as appropriate to * reflect the addition of any new copyrightable work in a derivative - * work (e.g., Copyright .AN) <Publication Year> Copyright Owner), and (3) - * the name of MIPS Technologies, Inc. ($B!H(BMIPS$B!I(B) is not used in any + * work (e.g., Copyright N) <Publication Year> Copyright Owner), and (3) + * the name of MIPS Technologies, Inc. ($(B!H(BMIPS$(B!I(B) is not used in any * advertising or publicity pertaining to the use or distribution of * this software without specific, written prior authorization. * - * THIS SOFTWARE IS PROVIDED $B!H(BAS IS.$B!I(B MIPS MAKES NO WARRANTIES AND + * THIS SOFTWARE IS PROVIDED $(B!H(BAS IS.$(B!I(B MIPS MAKES NO WARRANTIES AND * DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS, STATUTORY, IMPLIED OR * OTHERWISE, INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND @@ -41,22 +41,11 @@ #include "arch/mips/isa_traits.hh" -namespace MipsCore { +namespace MipsISA { -//It seems like a safe assumption MipsCore only applies to mips -using namespace MipsISA; -const unsigned VABits = 32; -const unsigned PABits = 32; // Is this correct? -const Addr VAddrImplMask = (ULL(1) << VABits) - 1; -const Addr VAddrUnImplMask = ~VAddrImplMask; -inline Addr VAddrImpl(Addr a) { return a & VAddrImplMask; } -inline Addr VAddrVPN(Addr a) { return a >> MipsISA::PageShift; } -inline Addr VAddrOffset(Addr a) { return a & MipsISA::PageOffset; } -const Addr PAddrImplMask = (ULL(1) << PABits) - 1; - -/* namespace MipsCore */ } +}; #endif // __ARCH_MIPS_CORE_SPECIFIC_HH__ |