diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-06 18:04:57 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-06 18:04:57 -0400 |
| commit | 62ebe251dac998202403bea45ba69345dc5bf42d (patch) | |
| tree | 779632e0062c10fc0b6c825cf827a69fca5ed6b0 /arch/mips/isa | |
| parent | 832311a17094501a6883100ac9dba8c781211782 (diff) | |
| parent | 61b2bd9d28fa288628d8ef3eb3fd4ab3cef9902f (diff) | |
| download | gem5-62ebe251dac998202403bea45ba69345dc5bf42d.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : a0bfc7495ba0f2916214d6712f67c5c239a210a0
Diffstat (limited to 'arch/mips/isa')
| -rw-r--r-- | arch/mips/isa/base.isa | 2 | ||||
| -rw-r--r-- | arch/mips/isa/includes.isa | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/isa/base.isa b/arch/mips/isa/base.isa index 139a6d876..9ed9651d2 100644 --- a/arch/mips/isa/base.isa +++ b/arch/mips/isa/base.isa @@ -9,8 +9,6 @@ output header {{ #define R31 31 -#include "arch/mips/faults.hh" -#include "arch/mips/isa_traits.hh" using namespace MipsISA; diff --git a/arch/mips/isa/includes.isa b/arch/mips/isa/includes.isa index b81c4eda2..9c370fbe3 100644 --- a/arch/mips/isa/includes.isa +++ b/arch/mips/isa/includes.isa @@ -17,6 +17,8 @@ output decoder {{ #include "base/cprintf.hh" #include "base/loader/symtab.hh" #include "cpu/exec_context.hh" // for Jump::branchTarget() +#include "arch/mips/faults.hh" +#include "arch/mips/isa_traits.hh" #include <math.h> #if defined(linux) @@ -27,6 +29,7 @@ using namespace MipsISA; }}; output exec {{ +#include "arch/mips/faults.hh" #include "arch/mips/isa_traits.hh" #include <math.h> #if defined(linux) |