diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/arguments.cc | 2 | ||||
-rw-r--r-- | arch/alpha/arguments.hh | 3 | ||||
-rw-r--r-- | arch/alpha/ev5.cc | 2 | ||||
-rw-r--r-- | arch/alpha/vtophys.hh | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/alpha/arguments.cc b/arch/alpha/arguments.cc index 38f7a400c..2dca3f51e 100644 --- a/arch/alpha/arguments.cc +++ b/arch/alpha/arguments.cc @@ -26,9 +26,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "targetarch/arguments.hh" #include "cpu/exec_context.hh" #include "mem/functional_mem/physical_memory.hh" +#include "targetarch/arguments.hh" #include "targetarch/vtophys.hh" AlphaArguments::Data::~Data() diff --git a/arch/alpha/arguments.hh b/arch/alpha/arguments.hh index 9ac744e17..78e66b3fd 100644 --- a/arch/alpha/arguments.hh +++ b/arch/alpha/arguments.hh @@ -31,9 +31,8 @@ #include <assert.h> -#include "sim/host.hh" -#include "kern/tru64/kernel.hh" #include "base/refcnt.hh" +#include "sim/host.hh" #include "targetarch/vtophys.hh" class ExecContext; diff --git a/arch/alpha/ev5.cc b/arch/alpha/ev5.cc index 476a84d26..e4a9a09e3 100644 --- a/arch/alpha/ev5.cc +++ b/arch/alpha/ev5.cc @@ -560,7 +560,7 @@ ExecContext::simPalCheck(int palFunc) case PAL::bpt: case PAL::bugchk: - if (system->remoteGDB->trap(ALPHA_KENTRY_IF)) + if (system->breakpoint()) return false; break; } diff --git a/arch/alpha/vtophys.hh b/arch/alpha/vtophys.hh index 75a589259..47ee538a6 100644 --- a/arch/alpha/vtophys.hh +++ b/arch/alpha/vtophys.hh @@ -29,6 +29,7 @@ #ifndef __VTOPHYS_H__ #define __VTOPHYS_H__ +#include "targetarch/isa_traits.hh" #include "targetarch/pmap.h" inline bool entry_valid(uint64_t entry) |