diff options
author | Korey Sewell <ksewell@umich.edu> | 2006-03-12 05:58:28 -0500 |
---|---|---|
committer | Korey Sewell <ksewell@umich.edu> | 2006-03-12 05:58:28 -0500 |
commit | 57d53f8a9d738b43e0de41a70813e3a6de8d4dfb (patch) | |
tree | 2bd45bf1d4a23ca8696b76fbffff3754dd244d4a /arch/mips/isa/includes.isa | |
parent | 18ba0f85486f0dd919064ba2b0ed8c53a7861298 (diff) | |
parent | 4d19bbeeebd026b0aab52e381ee77e4141ed9dd1 (diff) | |
download | gem5-57d53f8a9d738b43e0de41a70813e3a6de8d4dfb.tar.xz |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem
--HG--
extra : convert_revision : b101fa550567d5a9f5de6c2d8c3f67829ae050c1
Diffstat (limited to 'arch/mips/isa/includes.isa')
-rw-r--r-- | arch/mips/isa/includes.isa | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips/isa/includes.isa b/arch/mips/isa/includes.isa index da919be00..b81c4eda2 100644 --- a/arch/mips/isa/includes.isa +++ b/arch/mips/isa/includes.isa @@ -9,10 +9,11 @@ output header {{ #include <iomanip> #include "cpu/static_inst.hh" -#include "mem/mem_req.hh" // some constructors use MemReq flags +#include "arch/mips/isa_traits.hh" }}; output decoder {{ +#include "arch/mips/isa_traits.hh" #include "base/cprintf.hh" #include "base/loader/symtab.hh" #include "cpu/exec_context.hh" // for Jump::branchTarget() @@ -21,9 +22,12 @@ output decoder {{ #if defined(linux) #include <fenv.h> #endif + +using namespace MipsISA; }}; output exec {{ +#include "arch/mips/isa_traits.hh" #include <math.h> #if defined(linux) #include <fenv.h> @@ -35,5 +39,7 @@ output exec {{ #include "cpu/base.hh" #include "cpu/exetrace.hh" #include "sim/sim_exit.hh" + +using namespace MipsISA; }}; |