diff options
| -rw-r--r-- | src/arch/alpha/faults.hh | 6 | ||||
| -rw-r--r-- | src/arch/alpha/pagetable.hh | 3 | ||||
| -rw-r--r-- | src/cpu/exetrace.cc | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/arch/alpha/faults.hh b/src/arch/alpha/faults.hh index 3ef4d5521..e2c3441e9 100644 --- a/src/arch/alpha/faults.hh +++ b/src/arch/alpha/faults.hh @@ -32,9 +32,13 @@ #ifndef __ALPHA_FAULTS_HH__ #define __ALPHA_FAULTS_HH__ -#include "arch/alpha/pagetable.hh" +#include "config/full_system.hh" #include "sim/faults.hh" +#if FULL_SYSTEM +#include "arch/alpha/pagetable.hh" +#endif + // The design of the "name" and "vect" functions is in sim/faults.hh namespace AlphaISA diff --git a/src/arch/alpha/pagetable.hh b/src/arch/alpha/pagetable.hh index 3108c0a3e..7ec4a6a75 100644 --- a/src/arch/alpha/pagetable.hh +++ b/src/arch/alpha/pagetable.hh @@ -38,7 +38,6 @@ namespace AlphaISA { -#if FULL_SYSTEM struct VAddr { static const int ImplBits = 43; @@ -106,7 +105,7 @@ namespace AlphaISA { void serialize(std::ostream &os); void unserialize(Checkpoint *cp, const std::string §ion); }; -#endif + }; #endif // __ARCH_ALPHA_PAGETABLE_H__ diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc index 8662f6ae1..113f0fe74 100644 --- a/src/cpu/exetrace.cc +++ b/src/cpu/exetrace.cc @@ -38,14 +38,18 @@ #include "arch/regfile.hh" #include "arch/utility.hh" -#include "arch/tlb.hh" #include "base/loader/symtab.hh" +#include "config/full_system.hh" #include "cpu/base.hh" #include "cpu/exetrace.hh" #include "cpu/static_inst.hh" #include "sim/param.hh" #include "sim/system.hh" +#if FULL_SYSTEM +#include "arch/tlb.hh" +#endif + //XXX This is temporary #include "arch/isa_specific.hh" #include "cpu/m5legion_interface.h" |