f58d85128d
which is evaluated slightly differently than in previous versions of gcc.
arch/alpha/alpha_linux_process.cc:
Alphabetize includes.
arch/alpha/vptr.hh:
Change the constants that are being used for alpha pagebytes to come from the ISA.
base/random.hh:
cpu/static_inst.cc:
sim/param.cc:
Fix up template syntax.
base/range.hh:
Include iostream for << operator.
base/res_list.hh:
base/statistics.hh:
cpu/simple_cpu/simple_cpu.hh:
cpu/static_inst.hh:
sim/eventq.hh:
sim/param.hh:
Fixup for templated code to resolve different scope lookup in gcc 3.4. This defers the lookup of the
function/variable until actual instantiation time by making it dependent on the templated class/function.
base/trace.cc:
Fix call to new.
base/trace.hh:
Fix up #define to have full path.
cpu/base_cpu.cc:
Fix up call to new.
dev/etherlink.hh:
dev/ns_gige.hh:
dev/sinic.hh:
Fixup for friend class/function declaration. g++ 3.4 no longer allows typedefs to be declared as
a friend class.
dev/pcidev.hh:
Fix up re-definition of access level to params.
kern/linux/linux_syscalls.hh:
kern/tru64/tru64_syscalls.hh:
Fix up header. Fix up template syntax.
sim/serialize.cc:
Include errno.h.
sim/startup.cc:
Change startupq. queue was getting destructed before all things had called ~StartupCallback(), which lead
to a segfault. This puts startupq in global space, and we allocate it ourselves. Other code may be similar
to this and may need changing in the future.
sim/syscall_emul.hh:
Include cpu/exec_context.hh and sim/process.hh, as forward declarations are no longer sufficient.
sim/universe.cc:
Include errno.h
--HG--
extra : convert_revision : e49d08ee89eb06a28351f02bafc028ca6652d5af
127 lines
3.9 KiB
C++
127 lines
3.9 KiB
C++
/*
|
|
* Copyright (c) 2002-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.
|
|
*/
|
|
|
|
/* @file
|
|
* Device module for modelling a fixed bandwidth full duplex ethernet link
|
|
*/
|
|
|
|
#ifndef __DEV_ETHERLINK_HH__
|
|
#define __DEV_ETHERLINK_HH__
|
|
|
|
#include "dev/etherint.hh"
|
|
#include "dev/etherpkt.hh"
|
|
#include "sim/eventq.hh"
|
|
#include "sim/host.hh"
|
|
#include "sim/sim_object.hh"
|
|
|
|
class EtherDump;
|
|
|
|
/*
|
|
* Model for a fixed bandwidth full duplex ethernet link
|
|
*/
|
|
class EtherLink : public SimObject
|
|
{
|
|
protected:
|
|
class Interface;
|
|
|
|
friend class LinkDelayEvent;
|
|
/*
|
|
* Model for a single uni-directional link
|
|
*/
|
|
class Link : public Serializable {
|
|
protected:
|
|
std::string objName;
|
|
|
|
Interface *txint;
|
|
Interface *rxint;
|
|
|
|
double ticksPerByte;
|
|
Tick linkDelay;
|
|
EtherDump *dump;
|
|
|
|
protected:
|
|
/*
|
|
* Transfer is complete
|
|
*/
|
|
PacketPtr packet;
|
|
void txDone();
|
|
typedef EventWrapper<Link, &Link::txDone> DoneEvent;
|
|
friend void DoneEvent::process();
|
|
DoneEvent doneEvent;
|
|
|
|
friend class LinkDelayEvent;
|
|
void txComplete(PacketPtr packet);
|
|
|
|
public:
|
|
Link(const std::string &name, double rate, Tick delay,
|
|
EtherDump *dump);
|
|
~Link() {}
|
|
|
|
virtual const std::string name() const { return objName; }
|
|
|
|
bool busy() const { return (bool)packet; }
|
|
bool transmit(PacketPtr packet);
|
|
|
|
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);
|
|
};
|
|
|
|
/*
|
|
* Interface at each end of the link
|
|
*/
|
|
class Interface : public EtherInt
|
|
{
|
|
private:
|
|
Link *txlink;
|
|
|
|
public:
|
|
Interface(const std::string &name, Link *txlink, Link *rxlink);
|
|
bool recvPacket(PacketPtr packet) { return txlink->transmit(packet); }
|
|
void sendDone() { peer->sendDone(); }
|
|
};
|
|
|
|
Link *link1;
|
|
Link *link2;
|
|
|
|
EtherInt *int1;
|
|
EtherInt *int2;
|
|
|
|
public:
|
|
EtherLink(const std::string &name, EtherInt *i1, EtherInt *i2,
|
|
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__
|