merge with m5 head
--HG-- extra : convert_revision : c90339248d1ee74df1c6b90a77ec9ea41f646311
This commit is contained in:
@@ -43,6 +43,9 @@
|
||||
#include "dev/console.hh"
|
||||
#include "dev/simple_disk.hh"
|
||||
#include "dev/tlaser_clock.hh"
|
||||
#include "mem/bus/bus.hh"
|
||||
#include "mem/bus/pio_interface.hh"
|
||||
#include "mem/bus/pio_interface_impl.hh"
|
||||
#include "mem/functional_mem/memory_control.hh"
|
||||
#include "sim/builder.hh"
|
||||
#include "sim/system.hh"
|
||||
@@ -50,14 +53,21 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
AlphaConsole::AlphaConsole(const string &name, SimConsole *cons,
|
||||
SimpleDisk *d, System *system,
|
||||
BaseCPU *cpu, TsunamiIO *clock, int num_cpus,
|
||||
Addr a, MemoryController *mmu)
|
||||
: FunctionalMemory(name), disk(d), console(cons), addr(a)
|
||||
AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d,
|
||||
System *system, BaseCPU *cpu, TsunamiIO *clock,
|
||||
int num_cpus, MemoryController *mmu, Addr a,
|
||||
HierParams *hier, Bus *bus)
|
||||
: PioDevice(name), disk(d), console(cons), addr(a)
|
||||
>>>>>>>
|
||||
{
|
||||
mmu->add_child(this, Range<Addr>(addr, addr + size));
|
||||
|
||||
if (bus) {
|
||||
pioInterface = newPioInterface(name, hier, bus, this,
|
||||
&AlphaConsole::cacheAccess);
|
||||
pioInterface->addAddrRange(addr, addr + size);
|
||||
}
|
||||
|
||||
consoleData = new uint8_t[size];
|
||||
memset(consoleData, 0, size);
|
||||
|
||||
@@ -185,6 +195,12 @@ AlphaConsole::write(MemReqPtr &req, const uint8_t *data)
|
||||
return No_Fault;
|
||||
}
|
||||
|
||||
Tick
|
||||
AlphaConsole::cacheAccess(MemReqPtr &req)
|
||||
{
|
||||
return curTick + 1000;
|
||||
}
|
||||
|
||||
void
|
||||
AlphaAccess::serialize(ostream &os)
|
||||
{
|
||||
@@ -253,6 +269,8 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole)
|
||||
SimObjectParam<System *> system;
|
||||
SimObjectParam<BaseCPU *> cpu;
|
||||
SimObjectParam<TsunamiIO *> clock;
|
||||
SimObjectParam<Bus*> io_bus;
|
||||
SimObjectParam<HierParams *> hier;
|
||||
|
||||
END_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole)
|
||||
|
||||
@@ -265,14 +283,17 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(AlphaConsole)
|
||||
INIT_PARAM(addr, "Device Address"),
|
||||
INIT_PARAM(system, "system object"),
|
||||
INIT_PARAM(cpu, "Processor"),
|
||||
INIT_PARAM(clock, "Turbolaser Clock")
|
||||
INIT_PARAM(clock, "Turbolaser Clock"),
|
||||
INIT_PARAM_DFLT(io_bus, "The IO Bus to attach to", NULL),
|
||||
INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams)
|
||||
|
||||
END_INIT_SIM_OBJECT_PARAMS(AlphaConsole)
|
||||
|
||||
CREATE_SIM_OBJECT(AlphaConsole)
|
||||
{
|
||||
return new AlphaConsole(getInstanceName(), sim_console, disk,
|
||||
system, cpu, clock, num_cpus, addr, mmu);
|
||||
return new AlphaConsole(getInstanceName(), sim_console, disk,
|
||||
system, cpu, clock, num_cpus, mmu,
|
||||
addr, hier, io_bus);
|
||||
}
|
||||
|
||||
REGISTER_SIM_OBJECT("AlphaConsole", AlphaConsole)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/alpha_access.h"
|
||||
#include "mem/functional_mem/functional_memory.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "sim/host.hh"
|
||||
#include "dev/tsunami_io.hh"
|
||||
|
||||
@@ -70,7 +70,7 @@ class SimpleDisk;
|
||||
* primarily used doing boot before the kernel has loaded its device
|
||||
* drivers.
|
||||
*/
|
||||
class AlphaConsole : public FunctionalMemory
|
||||
class AlphaConsole : public PioDevice
|
||||
{
|
||||
protected:
|
||||
union {
|
||||
@@ -89,10 +89,10 @@ class AlphaConsole : public FunctionalMemory
|
||||
|
||||
public:
|
||||
/** Standard Constructor */
|
||||
AlphaConsole(const std::string &name, SimConsole *cons,
|
||||
SimpleDisk *d, System *system, BaseCPU *cpu,
|
||||
TsunamiIO *clock, int num_cpus,
|
||||
Addr a, MemoryController *mmu);
|
||||
AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
|
||||
System *system, BaseCPU *cpu, TsunamiIO *clock,
|
||||
int num_cpus, MemoryController *mmu, Addr addr,
|
||||
HierParams *hier, Bus *bus);
|
||||
|
||||
/**
|
||||
* memory mapped reads and writes
|
||||
@@ -105,6 +105,9 @@ class AlphaConsole : public FunctionalMemory
|
||||
*/
|
||||
virtual void serialize(std::ostream &os);
|
||||
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
||||
|
||||
public:
|
||||
Tick cacheAccess(MemReqPtr &req);
|
||||
};
|
||||
|
||||
#endif // __ALPHA_CONSOLE_HH__
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "base/misc.hh"
|
||||
#include "dev/etherdump.hh"
|
||||
#include "sim/builder.hh"
|
||||
#include "sim/universe.hh"
|
||||
@@ -43,11 +44,8 @@ using std::string;
|
||||
EtherDump::EtherDump(const string &name, const string &file)
|
||||
: SimObject(name)
|
||||
{
|
||||
if (!file.empty()) {
|
||||
if (!file.empty())
|
||||
stream.open(file.c_str());
|
||||
if (stream.is_open())
|
||||
init();
|
||||
}
|
||||
}
|
||||
|
||||
#define DLT_EN10MB 1 // Ethernet (10Mb)
|
||||
@@ -66,7 +64,8 @@ struct pcap_file_header {
|
||||
};
|
||||
|
||||
struct pcap_pkthdr {
|
||||
struct timeval ts; // time stamp
|
||||
uint32_t seconds;
|
||||
uint32_t microseconds;
|
||||
uint32_t caplen; // length of portion present
|
||||
uint32_t len; // length this packet (off wire)
|
||||
};
|
||||
@@ -74,6 +73,9 @@ struct pcap_pkthdr {
|
||||
void
|
||||
EtherDump::init()
|
||||
{
|
||||
if (!stream.is_open())
|
||||
return;
|
||||
|
||||
curtime = time(NULL);
|
||||
s_freq = ticksPerSecond;
|
||||
us_freq = ticksPerSecond / ULL(1000000);
|
||||
@@ -96,8 +98,8 @@ EtherDump::init()
|
||||
* to sim_cycles.
|
||||
*/
|
||||
pcap_pkthdr pkthdr;
|
||||
pkthdr.ts.tv_sec = curtime;
|
||||
pkthdr.ts.tv_usec = 0;
|
||||
pkthdr.seconds = curtime;
|
||||
pkthdr.microseconds = 0;
|
||||
pkthdr.caplen = 0;
|
||||
pkthdr.len = 0;
|
||||
stream.write(reinterpret_cast<char *>(&pkthdr), sizeof(pkthdr));
|
||||
@@ -109,8 +111,8 @@ void
|
||||
EtherDump::dumpPacket(PacketPtr &packet)
|
||||
{
|
||||
pcap_pkthdr pkthdr;
|
||||
pkthdr.ts.tv_sec = curtime + (curTick / s_freq);
|
||||
pkthdr.ts.tv_usec = (curTick / us_freq) % ULL(1000000);
|
||||
pkthdr.seconds = curtime + (curTick / s_freq);
|
||||
pkthdr.microseconds = (curTick / us_freq) % ULL(1000000);
|
||||
pkthdr.caplen = packet->length;
|
||||
pkthdr.len = packet->length;
|
||||
stream.write(reinterpret_cast<char *>(&pkthdr), sizeof(pkthdr));
|
||||
|
||||
180
dev/etherlink.cc
180
dev/etherlink.cc
@@ -42,17 +42,19 @@
|
||||
#include "dev/etherpkt.hh"
|
||||
#include "sim/builder.hh"
|
||||
#include "sim/universe.hh"
|
||||
#include "sim/system.hh"
|
||||
|
||||
using namespace std;
|
||||
|
||||
EtherLink::EtherLink(const std::string &name, EtherInt *i1, EtherInt *i2,
|
||||
Tick speed, EtherDump *dump)
|
||||
EtherLink::EtherLink(const string &name, EtherInt *i1, EtherInt *i2,
|
||||
Tick speed, Tick dly, EtherDump *dump)
|
||||
: SimObject(name)
|
||||
{
|
||||
double rate = ((double)ticksPerSecond * 8.0) / (double)speed;
|
||||
Tick delay = US2Ticks(dly);
|
||||
|
||||
link1 = new Link(name + ".link1", rate, dump);
|
||||
link2 = new Link(name + ".link2", rate, dump);
|
||||
link1 = new Link(name + ".link1", rate, delay, dump);
|
||||
link2 = new Link(name + ".link2", rate, delay, dump);
|
||||
|
||||
int1 = new Interface(name + ".int1", link1, link2);
|
||||
int2 = new Interface(name + ".int2", link2, link1);
|
||||
@@ -72,28 +74,76 @@ EtherLink::~EtherLink()
|
||||
delete int2;
|
||||
}
|
||||
|
||||
EtherLink::Interface::Interface(const std::string &name, Link *tx, Link *rx)
|
||||
EtherLink::Interface::Interface(const string &name, Link *tx, Link *rx)
|
||||
: EtherInt(name), txlink(tx)
|
||||
{
|
||||
tx->setTxInt(this);
|
||||
rx->setRxInt(this);
|
||||
}
|
||||
|
||||
EtherLink::Link::Link(const std::string &name, double rate, EtherDump *d)
|
||||
: objName(name), txint(NULL), rxint(NULL), ticks_per_byte(rate),
|
||||
dump(d), event(&mainEventQueue, this)
|
||||
EtherLink::Link::Link(const string &name, double rate, Tick delay,
|
||||
EtherDump *d)
|
||||
: objName(name), txint(NULL), rxint(NULL), ticksPerByte(rate),
|
||||
linkDelay(delay), dump(d), doneEvent(this)
|
||||
{}
|
||||
|
||||
void
|
||||
EtherLink::serialize(ostream &os)
|
||||
{
|
||||
nameOut(os, name() + ".link1");
|
||||
link1->serialize(os);
|
||||
nameOut(os, name() + ".link2");
|
||||
link2->serialize(os);
|
||||
}
|
||||
|
||||
void
|
||||
EtherLink::unserialize(Checkpoint *cp, const string §ion)
|
||||
{
|
||||
link1->unserialize(cp, section + ".link1");
|
||||
link2->unserialize(cp, section + ".link2");
|
||||
}
|
||||
|
||||
void
|
||||
EtherLink::Link::txComplete(PacketPtr &packet)
|
||||
{
|
||||
DPRINTF(Ethernet, "packet received: len=%d\n", packet->length);
|
||||
DDUMP(EthernetData, packet->data, packet->length);
|
||||
rxint->sendPacket(packet);
|
||||
}
|
||||
|
||||
class LinkDelayEvent : public Event
|
||||
{
|
||||
protected:
|
||||
EtherLink::Link *link;
|
||||
PacketPtr packet;
|
||||
|
||||
// non-scheduling version for createForUnserialize()
|
||||
LinkDelayEvent(EtherLink::Link *link);
|
||||
|
||||
public:
|
||||
LinkDelayEvent(EtherLink::Link *link, PacketPtr &pkt, Tick when);
|
||||
|
||||
void process();
|
||||
|
||||
virtual void serialize(ostream &os);
|
||||
virtual void unserialize(Checkpoint *cp, const string §ion);
|
||||
static Serializable *createForUnserialize(Checkpoint *cp,
|
||||
const string §ion);
|
||||
};
|
||||
|
||||
|
||||
void
|
||||
EtherLink::Link::txDone()
|
||||
{
|
||||
if (dump)
|
||||
dump->dump(packet);
|
||||
|
||||
DPRINTF(Ethernet, "EtherLink packet received: len=%d\n", packet->length);
|
||||
DDUMP(EthernetData, packet->data, packet->length);
|
||||
|
||||
rxint->sendPacket(packet);
|
||||
if (linkDelay > 0) {
|
||||
DPRINTF(Ethernet, "packet delayed: delay=%d\n", linkDelay);
|
||||
new LinkDelayEvent(this, packet, curTick + linkDelay);
|
||||
} else {
|
||||
txComplete(packet);
|
||||
}
|
||||
|
||||
packet = 0;
|
||||
assert(!busy());
|
||||
@@ -105,27 +155,118 @@ bool
|
||||
EtherLink::Link::transmit(PacketPtr &pkt)
|
||||
{
|
||||
if (busy()) {
|
||||
DPRINTF(Ethernet, "EtherLink packet not sent, link busy\n");
|
||||
DPRINTF(Ethernet, "packet not sent, link busy\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
DPRINTF(Ethernet, "EtherLink packet sent: len=%d\n", pkt->length);
|
||||
DPRINTF(Ethernet, "packet sent: len=%d\n", pkt->length);
|
||||
DDUMP(EthernetData, pkt->data, pkt->length);
|
||||
|
||||
packet = pkt;
|
||||
int delay = (int)ceil(((double)pkt->length * ticks_per_byte) + 1.0);
|
||||
DPRINTF(Ethernet, "EtherLink scheduling packet: delay=%d, (rate=%f)\n",
|
||||
delay, ticks_per_byte);
|
||||
event.schedule(curTick + delay);
|
||||
Tick delay = (Tick)ceil(((double)pkt->length * ticksPerByte) + 1.0);
|
||||
DPRINTF(Ethernet, "scheduling packet: delay=%d, (rate=%f)\n",
|
||||
delay, ticksPerByte);
|
||||
doneEvent.schedule(curTick + delay);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
EtherLink::Link::serialize(ostream &os)
|
||||
{
|
||||
bool packet_exists = packet;
|
||||
SERIALIZE_SCALAR(packet_exists);
|
||||
|
||||
bool event_scheduled = doneEvent.scheduled();
|
||||
SERIALIZE_SCALAR(event_scheduled);
|
||||
if (event_scheduled) {
|
||||
Tick event_time = doneEvent.when();
|
||||
SERIALIZE_SCALAR(event_time);
|
||||
}
|
||||
|
||||
if (packet_exists) {
|
||||
nameOut(os, csprintf("%s.packet", name()));
|
||||
packet->serialize(os);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
EtherLink::Link::unserialize(Checkpoint *cp, const string §ion)
|
||||
{
|
||||
bool packet_exists;
|
||||
UNSERIALIZE_SCALAR(packet_exists);
|
||||
if (packet_exists) {
|
||||
packet = new EtherPacket;
|
||||
packet->unserialize(cp, csprintf("%s.packet", section));
|
||||
}
|
||||
|
||||
bool event_scheduled;
|
||||
UNSERIALIZE_SCALAR(event_scheduled);
|
||||
if (event_scheduled) {
|
||||
Tick event_time;
|
||||
UNSERIALIZE_SCALAR(event_time);
|
||||
doneEvent.schedule(event_time);
|
||||
}
|
||||
}
|
||||
|
||||
LinkDelayEvent::LinkDelayEvent(EtherLink::Link *l)
|
||||
: Event(&mainEventQueue), link(l)
|
||||
{
|
||||
setFlags(AutoSerialize);
|
||||
setFlags(AutoDelete);
|
||||
}
|
||||
|
||||
LinkDelayEvent::LinkDelayEvent(EtherLink::Link *l, PacketPtr &p, Tick when)
|
||||
: Event(&mainEventQueue), link(l), packet(p)
|
||||
{
|
||||
setFlags(AutoSerialize);
|
||||
setFlags(AutoDelete);
|
||||
schedule(when);
|
||||
}
|
||||
|
||||
void
|
||||
LinkDelayEvent::process()
|
||||
{
|
||||
link->txComplete(packet);
|
||||
}
|
||||
|
||||
void
|
||||
LinkDelayEvent::serialize(ostream &os)
|
||||
{
|
||||
paramOut(os, "type", string("LinkDelayEvent"));
|
||||
Event::serialize(os);
|
||||
SERIALIZE_OBJPTR(link);
|
||||
|
||||
nameOut(os, csprintf("%s.packet", name()));
|
||||
packet->serialize(os);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
LinkDelayEvent::unserialize(Checkpoint *cp, const string §ion)
|
||||
{
|
||||
Event::unserialize(cp, section);
|
||||
packet = new EtherPacket;
|
||||
packet->unserialize(cp, csprintf("%s.packet", section));
|
||||
}
|
||||
|
||||
|
||||
Serializable *
|
||||
LinkDelayEvent::createForUnserialize(Checkpoint *cp, const string §ion)
|
||||
{
|
||||
EtherLink::Link *link;
|
||||
UNSERIALIZE_OBJPTR(link);
|
||||
return new LinkDelayEvent(link);
|
||||
}
|
||||
|
||||
REGISTER_SERIALIZEABLE("LinkDelayEvent", LinkDelayEvent)
|
||||
|
||||
BEGIN_DECLARE_SIM_OBJECT_PARAMS(EtherLink)
|
||||
|
||||
SimObjectParam<EtherInt *> interface1;
|
||||
SimObjectParam<EtherInt *> interface2;
|
||||
Param<Tick> link_speed;
|
||||
Param<Tick> link_delay;
|
||||
SimObjectParam<EtherDump *> packet_dump;
|
||||
|
||||
END_DECLARE_SIM_OBJECT_PARAMS(EtherLink)
|
||||
@@ -135,6 +276,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(EtherLink)
|
||||
INIT_PARAM(interface1, "interface 1"),
|
||||
INIT_PARAM(interface2, "interface 2"),
|
||||
INIT_PARAM_DFLT(link_speed, "link speed in bits per second", 100000000),
|
||||
INIT_PARAM_DFLT(link_delay, "transmit delay of packets in us", 0),
|
||||
INIT_PARAM_DFLT(packet_dump, "object to dump network packets to", NULL)
|
||||
|
||||
END_INIT_SIM_OBJECT_PARAMS(EtherLink)
|
||||
@@ -142,7 +284,7 @@ END_INIT_SIM_OBJECT_PARAMS(EtherLink)
|
||||
CREATE_SIM_OBJECT(EtherLink)
|
||||
{
|
||||
return new EtherLink(getInstanceName(), interface1, interface2, link_speed,
|
||||
packet_dump);
|
||||
link_delay, packet_dump);
|
||||
}
|
||||
|
||||
REGISTER_SIM_OBJECT("EtherLink", EtherLink)
|
||||
|
||||
@@ -49,6 +49,7 @@ class EtherLink : public SimObject
|
||||
protected:
|
||||
class Interface;
|
||||
|
||||
friend class LinkDelayEvent;
|
||||
/*
|
||||
* Model for a single uni-directional link
|
||||
*/
|
||||
@@ -59,34 +60,26 @@ class EtherLink : public SimObject
|
||||
Interface *txint;
|
||||
Interface *rxint;
|
||||
|
||||
double ticks_per_byte;
|
||||
double ticksPerByte;
|
||||
Tick linkDelay;
|
||||
EtherDump *dump;
|
||||
|
||||
protected:
|
||||
/*
|
||||
* Transfer is complete
|
||||
*/
|
||||
class DoneEvent : public Event
|
||||
{
|
||||
protected:
|
||||
Link *link;
|
||||
|
||||
public:
|
||||
DoneEvent(EventQueue *q, Link *l)
|
||||
: Event(q), link(l) {}
|
||||
virtual void process() { link->txDone(); }
|
||||
virtual const char *description()
|
||||
{ return "ethernet link completion"; }
|
||||
};
|
||||
|
||||
friend class DoneEvent;
|
||||
DoneEvent event;
|
||||
PacketPtr packet;
|
||||
|
||||
void txDone();
|
||||
typedef EventWrapper<Link, &Link::txDone> DoneEvent;
|
||||
friend class DoneEvent;
|
||||
DoneEvent doneEvent;
|
||||
|
||||
friend class LinkDelayEvent;
|
||||
void txComplete(PacketPtr &packet);
|
||||
|
||||
public:
|
||||
Link(const std::string &name, double rate, EtherDump *dump);
|
||||
Link(const std::string &name, double rate, Tick delay,
|
||||
EtherDump *dump);
|
||||
~Link() {}
|
||||
|
||||
virtual const std::string name() const { return objName; }
|
||||
@@ -96,6 +89,9 @@ class EtherLink : public SimObject
|
||||
|
||||
void setTxInt(Interface *i) { assert(!txint); txint = i; }
|
||||
void setRxInt(Interface *i) { assert(!rxint); rxint = i; }
|
||||
|
||||
virtual void serialize(std::ostream &os);
|
||||
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -120,8 +116,12 @@ class EtherLink : public SimObject
|
||||
|
||||
public:
|
||||
EtherLink(const std::string &name, EtherInt *i1, EtherInt *i2,
|
||||
Tick speed, EtherDump *dump);
|
||||
Tick speed, Tick delay, EtherDump *dump);
|
||||
virtual ~EtherLink();
|
||||
|
||||
virtual void serialize(std::ostream &os);
|
||||
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
||||
|
||||
};
|
||||
|
||||
#endif // __ETHERLINK_HH__
|
||||
|
||||
50
dev/etherpkt.cc
Normal file
50
dev/etherpkt.cc
Normal file
@@ -0,0 +1,50 @@
|
||||
/*
|
||||
* Copyright (c) 2004 The Regents of The University of Michigan
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met: redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer;
|
||||
* redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution;
|
||||
* neither the name of the copyright holders nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "dev/etherpkt.hh"
|
||||
#include "sim/serialize.hh"
|
||||
|
||||
using namespace std;
|
||||
|
||||
void
|
||||
EtherPacket::serialize(ostream &os)
|
||||
{
|
||||
SERIALIZE_SCALAR(length);
|
||||
SERIALIZE_ARRAY(data, length);
|
||||
}
|
||||
|
||||
void
|
||||
EtherPacket::unserialize(Checkpoint *cp, const std::string §ion)
|
||||
{
|
||||
UNSERIALIZE_SCALAR(length);
|
||||
data = new uint8_t[length];
|
||||
UNSERIALIZE_ARRAY(data, length);
|
||||
}
|
||||
|
||||
@@ -33,10 +33,10 @@
|
||||
#ifndef __ETHERPKT_HH__
|
||||
#define __ETHERPKT_HH__
|
||||
|
||||
#include <iosfwd>
|
||||
#include <memory>
|
||||
|
||||
#include "sim/host.hh"
|
||||
|
||||
#include "base/refcnt.hh"
|
||||
|
||||
class Checkpoint;
|
||||
|
||||
52
dev/io_device.cc
Normal file
52
dev/io_device.cc
Normal file
@@ -0,0 +1,52 @@
|
||||
/*
|
||||
* Copyright (c) 2003 The Regents of The University of Michigan
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met: redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer;
|
||||
* redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution;
|
||||
* neither the name of the copyright holders nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "dev/io_device.hh"
|
||||
#include "mem/bus/base_interface.hh"
|
||||
#include "mem/bus/dma_interface.hh"
|
||||
|
||||
PioDevice::PioDevice(const std::string &name)
|
||||
: FunctionalMemory(name), pioInterface(NULL)
|
||||
{}
|
||||
|
||||
PioDevice::~PioDevice()
|
||||
{
|
||||
if (pioInterface)
|
||||
delete pioInterface;
|
||||
}
|
||||
|
||||
DmaDevice::DmaDevice(const std::string &name)
|
||||
: PioDevice(name), dmaInterface(NULL)
|
||||
{}
|
||||
|
||||
DmaDevice::~DmaDevice()
|
||||
{
|
||||
if (dmaInterface)
|
||||
delete dmaInterface;
|
||||
}
|
||||
|
||||
59
dev/io_device.hh
Normal file
59
dev/io_device.hh
Normal file
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright (c) 2003 The Regents of The University of Michigan
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met: redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer;
|
||||
* redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution;
|
||||
* neither the name of the copyright holders nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef __IO_DEVICE_HH__
|
||||
#define __IO_DEVICE_HH__
|
||||
|
||||
#include "mem/functional_mem/functional_memory.hh"
|
||||
|
||||
class BaseInterface;
|
||||
class Bus;
|
||||
class HierParams;
|
||||
template <class Bus> class DMAInterface;
|
||||
|
||||
class PioDevice : public FunctionalMemory
|
||||
{
|
||||
protected:
|
||||
BaseInterface *pioInterface;
|
||||
|
||||
public:
|
||||
PioDevice(const std::string &name);
|
||||
virtual ~PioDevice();
|
||||
};
|
||||
|
||||
class DmaDevice : public PioDevice
|
||||
{
|
||||
protected:
|
||||
DMAInterface<Bus> *dmaInterface;
|
||||
|
||||
public:
|
||||
DmaDevice(const std::string &name);
|
||||
virtual ~DmaDevice();
|
||||
};
|
||||
|
||||
#endif // __IO_DEVICE_HH__
|
||||
Reference in New Issue
Block a user