diff options
| -rw-r--r-- | arch/alpha/isa_traits.hh | 5 | ||||
| -rw-r--r-- | cpu/simple/cpu.cc | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh index 5aa14a118..1ab3b989d 100644 --- a/arch/alpha/isa_traits.hh +++ b/arch/alpha/isa_traits.hh @@ -30,7 +30,6 @@ #define __ARCH_ALPHA_ISA_TRAITS_HH__ namespace LittleEndianGuest {} -using namespace LittleEndianGuest; #include "arch/alpha/types.hh" #include "arch/alpha/constants.hh" @@ -79,6 +78,8 @@ class SyscallReturn { namespace AlphaISA { +using namespace LittleEndianGuest; + // redirected register map, really only used for the full system case. extern const int reg_redir[NumIntRegs]; @@ -109,6 +110,4 @@ extern const int reg_redir[NumIntRegs]; #endif }; -using namespace AlphaISA; - #endif // __ARCH_ALPHA_ISA_TRAITS_HH__ diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index 44521a542..6e8764709 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -75,11 +75,7 @@ #endif // FULL_SYSTEM using namespace std; - -//The SimpleCPU does alpha only -//Change this to include arch/isa_traits.hh? -//using namespace AlphaISA; -#include "arch/isa_traits.hh" +using namespace TheISA; SimpleCPU::TickEvent::TickEvent(SimpleCPU *c, int w) : Event(&mainEventQueue, CPU_Tick_Pri), cpu(c), width(w) |