diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-14 16:08:32 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-14 16:08:32 -0500 |
| commit | fa763d2ecfae16e84a9f9d689d19f746d84d08e3 (patch) | |
| tree | 52474edfd8d1ab010a376b1eb66f4d9990fe4a54 /arch/sparc/isa/includes.isa | |
| parent | f045b110cf1db6f9fc70589532b48d9cca339897 (diff) | |
| parent | efe46430fac2419a02062e3b282324498a55df28 (diff) | |
| download | gem5-fa763d2ecfae16e84a9f9d689d19f746d84d08e3.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
cpu/cpu_exec_context.cc:
Hand merge
--HG--
rename : arch/alpha/registerfile.hh => arch/alpha/regfile.hh
extra : convert_revision : bd18966f7c37c67c2bc7ca2633b58f70ce64409c
Diffstat (limited to 'arch/sparc/isa/includes.isa')
| -rw-r--r-- | arch/sparc/isa/includes.isa | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/isa/includes.isa b/arch/sparc/isa/includes.isa index a99018b49..860f4657a 100644 --- a/arch/sparc/isa/includes.isa +++ b/arch/sparc/isa/includes.isa @@ -10,7 +10,7 @@ output header {{ #include "cpu/static_inst.hh" #include "arch/sparc/faults.hh" -#include "mem/mem_req.hh" // some constructors use MemReq flags +#include "mem/request.hh" // some constructors use MemReq flags #include "arch/sparc/isa_traits.hh" }}; @@ -34,7 +34,7 @@ output exec {{ #endif #ifdef FULL_SYSTEM -//#include "arch/alpha/pseudo_inst.hh" +//#include "sim/pseudo_inst.hh" #endif #include "cpu/base.hh" #include "cpu/exetrace.hh" |