diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-31 20:32:18 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-31 20:32:18 -0500 |
| commit | adeb458b878d0768fd4de82bc1997512dc65e6d3 (patch) | |
| tree | d7b27950803618125f7c2fcfa3353e4e40e0166c /cpu/exetrace.cc | |
| parent | 5c79eb04104e6e3dd2fd957c071fef3ceb47b722 (diff) | |
| parent | 5936c79ba0f3fd29ef2bbf41fcaddc78fcd9c75c (diff) | |
| download | gem5-adeb458b878d0768fd4de82bc1997512dc65e6d3.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 08ae5e999d9b313e3e40cb6d58863905b70ca781
Diffstat (limited to 'cpu/exetrace.cc')
| -rw-r--r-- | cpu/exetrace.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu/exetrace.cc b/cpu/exetrace.cc index ebb719b2c..4db72320c 100644 --- a/cpu/exetrace.cc +++ b/cpu/exetrace.cc @@ -29,11 +29,12 @@ #include <fstream> #include <iomanip> -#include "sim/param.hh" -#include "cpu/exetrace.hh" #include "base/loader/symtab.hh" #include "cpu/base.hh" +#include "cpu/exetrace.hh" #include "cpu/static_inst.hh" +#include "sim/param.hh" +#include "sim/system.hh" using namespace std; |