Merge ktlim@zizzer:/bk/newmem

into  zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 1a00a3970c6064cb59cd2f788094569fc431bf70
This commit is contained in:
Kevin Lim 2006-06-13 11:58:05 -04:00
commit 66af2a7bf4
2 changed files with 2 additions and 0 deletions

View file

@ -38,6 +38,7 @@
#include "cpu/simple_thread.hh" #include "cpu/simple_thread.hh"
#include "cpu/thread_context.hh" #include "cpu/thread_context.hh"
#include "cpu/static_inst.hh" #include "cpu/static_inst.hh"
#include "mem/packet_impl.hh"
#include "sim/byteswap.hh" #include "sim/byteswap.hh"
#include "sim/sim_object.hh" #include "sim/sim_object.hh"
#include "sim/stats.hh" #include "sim/stats.hh"

View file

@ -32,6 +32,7 @@
#include "cpu/checker/cpu.hh" #include "cpu/checker/cpu.hh"
#include "cpu/o3/lsq_unit.hh" #include "cpu/o3/lsq_unit.hh"
#include "base/str.hh" #include "base/str.hh"
#include "mem/packet.hh"
#include "mem/request.hh" #include "mem/request.hh"
template<class Impl> template<class Impl>