diff options
author | Kevin Lim <ktlim@umich.edu> | 2005-05-04 14:41:36 -0400 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2005-05-04 14:41:36 -0400 |
commit | c03e97b62d2adbe335a883b5fafa10c973e2c4d1 (patch) | |
tree | 8693177258ba24ac957e35ba1a0da97fcbef254b /dev | |
parent | 61d95de4c886911fa0b7dc9d587ffe5b292b739e (diff) | |
parent | 3b0464127e3512ac0865fa8e6207085d49692ae8 (diff) | |
download | gem5-c03e97b62d2adbe335a883b5fafa10c973e2c4d1.tar.xz |
Merge ktlim@zizzer:/bk/m5 into zamp.eecs.umich.edu:/z/ktlim2/current/m5
--HG--
extra : convert_revision : b868e7920eaa3682c6123651f0c598673ebb7f22
Diffstat (limited to 'dev')
-rw-r--r-- | dev/etherpkt.cc | 3 | ||||
-rw-r--r-- | dev/sinic.cc | 26 | ||||
-rw-r--r-- | dev/sinic.hh | 2 |
3 files changed, 17 insertions, 14 deletions
diff --git a/dev/etherpkt.cc b/dev/etherpkt.cc index bf60bc150..475274326 100644 --- a/dev/etherpkt.cc +++ b/dev/etherpkt.cc @@ -46,5 +46,6 @@ PacketData::unserialize(const string &base, Checkpoint *cp, const string §ion) { paramIn(cp, section, base + ".length", length); - arrayParamIn(cp, section, base + ".data", data, length); + if (length) + arrayParamIn(cp, section, base + ".data", data, length); } diff --git a/dev/sinic.cc b/dev/sinic.cc index 4d6ecf668..1f7fceebe 100644 --- a/dev/sinic.cc +++ b/dev/sinic.cc @@ -94,20 +94,20 @@ Device::Device(Params *p) { reset(); - if (p->header_bus) { - pioInterface = newPioInterface(p->name, p->hier, p->header_bus, this, + if (p->io_bus) { + pioInterface = newPioInterface(p->name, p->hier, p->io_bus, this, &Device::cacheAccess); - pioLatency = p->pio_latency * p->header_bus->clockRatio; + pioLatency = p->pio_latency * p->io_bus->clockRatio; if (p->payload_bus) - dmaInterface = new DMAInterface<Bus>(p->name + ".dma", - p->header_bus, p->payload_bus, - 1, p->dma_no_allocate); + dmaInterface = new DMAInterface<Bus>(p->name + ".dma", p->io_bus, + p->payload_bus, 1, + p->dma_no_allocate); else - dmaInterface = new DMAInterface<Bus>(p->name + ".dma", - p->header_bus, p->header_bus, - 1, p->dma_no_allocate); + dmaInterface = new DMAInterface<Bus>(p->name + ".dma", p->io_bus, + p->io_bus, 1, + p->dma_no_allocate); } else if (p->payload_bus) { pioInterface = newPioInterface(p->name, p->hier, p->payload_bus, this, &Device::cacheAccess); @@ -1361,6 +1361,7 @@ REGISTER_SIM_OBJECT("SinicInt", Interface) BEGIN_DECLARE_SIM_OBJECT_PARAMS(Device) + Param<Addr> addr; Param<Tick> cycle_time; Param<Tick> tx_delay; Param<Tick> rx_delay; @@ -1369,7 +1370,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(Device) SimObjectParam<PhysicalMemory *> physmem; Param<bool> rx_filter; Param<string> hardware_address; - SimObjectParam<Bus*> header_bus; + SimObjectParam<Bus*> io_bus; SimObjectParam<Bus*> payload_bus; SimObjectParam<HierParams *> hier; Param<Tick> pio_latency; @@ -1395,6 +1396,7 @@ END_DECLARE_SIM_OBJECT_PARAMS(Device) BEGIN_INIT_SIM_OBJECT_PARAMS(Device) + INIT_PARAM(addr, "Device Address"), INIT_PARAM(cycle_time, "State machine cycle time"), INIT_PARAM_DFLT(tx_delay, "Transmit Delay", 1000), INIT_PARAM_DFLT(rx_delay, "Receive Delay", 1000), @@ -1404,7 +1406,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Device) INIT_PARAM_DFLT(rx_filter, "Enable Receive Filter", true), INIT_PARAM_DFLT(hardware_address, "Ethernet Hardware Address", "00:99:00:00:00:01"), - INIT_PARAM_DFLT(header_bus, "The IO Bus to attach to for headers", NULL), + INIT_PARAM_DFLT(io_bus, "The IO Bus to attach to for headers", NULL), INIT_PARAM_DFLT(payload_bus, "The IO Bus to attach to for payload", NULL), INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams), INIT_PARAM_DFLT(pio_latency, "Programmed IO latency in bus cycles", 1), @@ -1440,7 +1442,7 @@ CREATE_SIM_OBJECT(Device) params->rx_delay = rx_delay; params->mmu = mmu; params->hier = hier; - params->header_bus = header_bus; + params->io_bus = io_bus; params->payload_bus = payload_bus; params->pio_latency = pio_latency; params->configSpace = configspace; diff --git a/dev/sinic.hh b/dev/sinic.hh index 062a5408b..c87a66928 100644 --- a/dev/sinic.hh +++ b/dev/sinic.hh @@ -299,7 +299,7 @@ class Device : public Base Tick tx_delay; Tick rx_delay; HierParams *hier; - Bus *header_bus; + Bus *io_bus; Bus *payload_bus; Tick pio_latency; PhysicalMemory *physmem; |