diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-03-07 20:01:34 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-03-07 20:01:34 -0500 |
| commit | 97c4a84985b0f9168f60f28d5cc96be448eef4fa (patch) | |
| tree | 5d385f2410979c4b4b2164686c87b8a083ad108d /arch/sparc/isa/includes.isa | |
| parent | 11aead894d4186916b587b1449075f276319a235 (diff) | |
| parent | ab67095b2a43b5f2d44d1e1a517d1079ddf9f104 (diff) | |
| download | gem5-97c4a84985b0f9168f60f28d5cc96be448eef4fa.tar.xz | |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
arch/alpha/faults.cc:
Hand merge.
--HG--
rename : arch/alpha/linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/tru64_process.cc => arch/alpha/tru64/process.cc
extra : convert_revision : 6ea1fae5be0ebd02eff330423d16da63b790516d
Diffstat (limited to 'arch/sparc/isa/includes.isa')
| -rw-r--r-- | arch/sparc/isa/includes.isa | 5 |
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 {{ |