diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-22 09:24:33 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-22 09:24:33 -0700 |
| commit | 4d1bcbcd36e5735e76b38abb151de716c31a2272 (patch) | |
| tree | 58c29ad6905c45332e1d1d12b9d66596ae6d30d4 /src/arch/x86/isa/includes.isa | |
| parent | bdd5fd20fb19eb52ef812cd284094e5513646e36 (diff) | |
| parent | 470a6a9a74eb28a5052e6492c0a3aa9724c57500 (diff) | |
| download | gem5-4d1bcbcd36e5735e76b38abb151de716c31a2272.tar.xz | |
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2
--HG--
extra : convert_revision : 1da75335907fee2d1745ec13e515819dfe2aad89
Diffstat (limited to 'src/arch/x86/isa/includes.isa')
| -rw-r--r-- | src/arch/x86/isa/includes.isa | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa index 14406931b..3ef204850 100644 --- a/src/arch/x86/isa/includes.isa +++ b/src/arch/x86/isa/includes.isa @@ -97,7 +97,6 @@ output header {{ #include <iostream> #include "arch/x86/emulenv.hh" -#include "arch/x86/faults.hh" #include "arch/x86/isa_traits.hh" #include "arch/x86/regfile.hh" #include "arch/x86/types.hh" @@ -105,10 +104,12 @@ output header {{ #include "cpu/static_inst.hh" #include "mem/packet.hh" #include "mem/request.hh" // some constructors use MemReq flags +#include "sim/faults.hh" }}; output decoder {{ - +#include "arch/x86/faults.hh" +#include "arch/x86/segmentregs.hh" #include "base/cprintf.hh" #include "base/loader/symtab.hh" #include "cpu/thread_context.hh" // for Jump::branchTarget() |