summaryrefslogtreecommitdiff
path: root/arch/sparc/isa/includes.isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-03-07 04:42:06 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-03-07 04:42:06 -0500
commitab67095b2a43b5f2d44d1e1a517d1079ddf9f104 (patch)
tree6e0cf0ec7d23cd9516d5b6486d47a10849375dc1 /arch/sparc/isa/includes.isa
parentfd69f40e209d1b77ce167bf59c189e513a6815f3 (diff)
parent5aa0669b52cb1a1e5fdb6a372d6b481ebb46b02a (diff)
downloadgem5-ab67095b2a43b5f2d44d1e1a517d1079ddf9f104.tar.xz
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch --HG-- extra : convert_revision : ead388289742233b5e4f0b37d979e54852cc99b2
Diffstat (limited to 'arch/sparc/isa/includes.isa')
-rw-r--r--arch/sparc/isa/includes.isa5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc/isa/includes.isa b/arch/sparc/isa/includes.isa
index ff7cb7d1d..a99018b49 100644
--- a/arch/sparc/isa/includes.isa
+++ b/arch/sparc/isa/includes.isa
@@ -9,8 +9,9 @@ output header {{
#include <iomanip>
#include "cpu/static_inst.hh"
-#include "traps.hh"
+#include "arch/sparc/faults.hh"
#include "mem/mem_req.hh" // some constructors use MemReq flags
+#include "arch/sparc/isa_traits.hh"
}};
output decoder {{
@@ -22,6 +23,8 @@ output decoder {{
#if defined(linux)
#include <fenv.h>
#endif
+
+using namespace SparcISA;
}};
output exec {{