8f8d09538f
after merge from head. Checkpointing may need some work now. Endian-happiness still not complete.
SConscript:
add all devices back into make file
base/inet.hh:
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherdump.cc:
dev/etherdump.hh:
dev/etherint.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/etherpkt.cc:
dev/etherpkt.hh:
dev/ethertap.cc:
dev/ethertap.hh:
dev/pktfifo.cc:
dev/pktfifo.hh:
rename PacketPtr EthPacketPtr so it doesn't conflict with the PacketPtr type in the memory system
configs/test/fs.py:
add nics to fs.py
cpu/cpu_exec_context.cc:
remove this check, as it's not valid. We may want to add something else back in to make sure that no one can delete the
static virtual ports in the exec context
cpu/simple/cpu.cc:
cpu/simple/cpu.hh:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
use new methods for accessing packet data
dev/ide_disk.cc:
add some more dprintfs
dev/io_device.cc:
delete packets when we are done with them. Update for new packet methods to access data
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart8250.cc:
dev/uart8250.hh:
mem/physical.cc:
mem/port.cc:
dUpdate for new packet methods to access data
dev/ns_gige.cc:
Update for new memory system
dev/ns_gige.hh:
python/m5/objects/Ethernet.py:
update for new memory system
dev/sinic.cc:
dev/sinic.hh:
Update for new memory system. Untested as need to merge in head because of kernel driver differences between versions
mem/packet.hh:
Add methods to access data instead of accessing it directly.
--HG--
extra : convert_revision : 223f43876afd404e68337270cd9a5e44d0bf553e
99 lines
3.3 KiB
C++
99 lines
3.3 KiB
C++
/*
|
|
* Copyright (c) 2004-2005 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 "base/misc.hh"
|
|
#include "dev/pktfifo.hh"
|
|
|
|
using namespace std;
|
|
|
|
bool
|
|
PacketFifo::copyout(void *dest, int offset, int len)
|
|
{
|
|
char *data = (char *)dest;
|
|
if (offset + len >= size())
|
|
return false;
|
|
|
|
list<EthPacketPtr>::iterator p = fifo.begin();
|
|
list<EthPacketPtr>::iterator end = fifo.end();
|
|
while (len > 0) {
|
|
while (offset >= (*p)->length) {
|
|
offset -= (*p)->length;
|
|
++p;
|
|
}
|
|
|
|
if (p == end)
|
|
panic("invalid fifo");
|
|
|
|
int size = min((*p)->length - offset, len);
|
|
memcpy(data, (*p)->data, size);
|
|
offset = 0;
|
|
len -= size;
|
|
data += size;
|
|
++p;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
void
|
|
PacketFifo::serialize(const string &base, ostream &os)
|
|
{
|
|
paramOut(os, base + ".size", _size);
|
|
paramOut(os, base + ".maxsize", _maxsize);
|
|
paramOut(os, base + ".reserved", _reserved);
|
|
paramOut(os, base + ".packets", fifo.size());
|
|
|
|
int i = 0;
|
|
list<EthPacketPtr>::iterator p = fifo.begin();
|
|
list<EthPacketPtr>::iterator end = fifo.end();
|
|
while (p != end) {
|
|
(*p)->serialize(csprintf("%s.packet%d", base, i), os);
|
|
++p;
|
|
++i;
|
|
}
|
|
}
|
|
|
|
void
|
|
PacketFifo::unserialize(const string &base, Checkpoint *cp,
|
|
const string §ion)
|
|
{
|
|
paramIn(cp, section, base + ".size", _size);
|
|
// paramIn(cp, section, base + ".maxsize", _maxsize);
|
|
paramIn(cp, section, base + ".reserved", _reserved);
|
|
int fifosize;
|
|
paramIn(cp, section, base + ".packets", fifosize);
|
|
|
|
fifo.clear();
|
|
|
|
for (int i = 0; i < fifosize; ++i) {
|
|
EthPacketPtr p = new EthPacketData(16384);
|
|
p->unserialize(csprintf("%s.packet%d", base, i), cp, section);
|
|
fifo.push_back(p);
|
|
}
|
|
}
|