diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-01-18 15:48:38 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-01-18 15:48:38 -0500 |
| commit | c389c2e327cc3ee1c988855b05505660c6670172 (patch) | |
| tree | 7861dcb3ed07f03850ee922db9c0c33b038265e4 /dev/baddev.cc | |
| parent | 42f3b4ffb3fedcb70e9ff068ed7160dc6020b8c4 (diff) | |
| parent | 25f54857c9356b7f8608be8d45fec17d6c26bce5 (diff) | |
| download | gem5-c389c2e327cc3ee1c988855b05505660c6670172.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5/
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : c8b7f46e9d0dbff2a12a7375d361098fba352647
Diffstat (limited to 'dev/baddev.cc')
| -rw-r--r-- | dev/baddev.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dev/baddev.cc b/dev/baddev.cc index 73b082d47..bb1d289ab 100644 --- a/dev/baddev.cc +++ b/dev/baddev.cc @@ -37,6 +37,7 @@ #include "base/trace.hh" #include "cpu/exec_context.hh" #include "dev/baddev.hh" +#include "dev/platform.hh" #include "mem/bus/bus.hh" #include "mem/bus/pio_interface.hh" #include "mem/bus/pio_interface_impl.hh" @@ -48,7 +49,7 @@ using namespace std; BadDevice::BadDevice(const string &name, Addr a, MemoryController *mmu, HierParams *hier, Bus *bus, const string &devicename) - : PioDevice(name), addr(a), devname(devicename) + : PioDevice(name, NULL), addr(a), devname(devicename) { mmu->add_child(this, RangeSize(addr, size)); @@ -83,20 +84,24 @@ BadDevice::cacheAccess(MemReqPtr &req) BEGIN_DECLARE_SIM_OBJECT_PARAMS(BadDevice) + SimObjectParam<Platform *> platform; SimObjectParam<MemoryController *> mmu; Param<Addr> addr; SimObjectParam<HierParams *> hier; SimObjectParam<Bus*> io_bus; + Param<Tick> pio_latency; Param<string> devicename; END_DECLARE_SIM_OBJECT_PARAMS(BadDevice) BEGIN_INIT_SIM_OBJECT_PARAMS(BadDevice) + INIT_PARAM(platform, "Platform"), INIT_PARAM(mmu, "Memory Controller"), INIT_PARAM(addr, "Device Address"), INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams), INIT_PARAM_DFLT(io_bus, "The IO Bus to attach to", NULL), + INIT_PARAM_DFLT(pio_latency, "Programmed IO latency", 1000), INIT_PARAM(devicename, "Name of device to error on") END_INIT_SIM_OBJECT_PARAMS(BadDevice) |