into Python.
Add Port and VectorPort objects and support for
specifying port connections via assignment.
The whole C++ ConfigNode hierarchy is gone now, as are
C++ Connector objects.
configs/test/fs.py:
configs/test/test.py:
Rewrite for new port connector syntax.
src/SConscript:
Remove unneeded files:
- mem/connector.*
- sim/config*
src/dev/io_device.hh:
src/mem/bridge.cc:
src/mem/bridge.hh:
src/mem/bus.cc:
src/mem/bus.hh:
src/mem/mem_object.hh:
src/mem/physical.cc:
src/mem/physical.hh:
Allow getPort() to take an optional index to
support vector ports (eventually).
src/python/m5/__init__.py:
Move SimObject construction and port connection
operations into Python (with C++ calls).
src/python/m5/config.py:
Move SimObject construction and port connection
operations into Python (with C++ calls).
Add support for declaring and connecting MemObject
ports in Python.
src/python/m5/objects/Bus.py:
src/python/m5/objects/PhysicalMemory.py:
Add port declaration.
src/sim/builder.cc:
src/sim/builder.hh:
src/sim/serialize.cc:
src/sim/serialize.hh:
ConfigNodes are gone; builder just gets the
name of a .ini file section now.
src/sim/main.cc:
Move SimObject construction and port connection
operations into Python (with C++ calls).
Split remaining initialization operations into two parts,
loadIniFile() and finalInit().
src/sim/param.cc:
src/sim/param.hh:
SimObject resolution done globally in Python now
(not via ConfigNode hierarchy).
src/sim/sim_object.cc:
Remove unneeded #include.
--HG--
extra : convert_revision : 2fa4001eaaec0c9a4231ef6e854f8e156d930dfe
174 lines
5.9 KiB
C++
174 lines
5.9 KiB
C++
/*
|
|
* Copyright (c) 2002-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.
|
|
*
|
|
* Authors: Ron Dreslinski
|
|
*/
|
|
|
|
/**
|
|
* @file Decleration of a bus object.
|
|
*/
|
|
|
|
#ifndef __MEM_BUS_HH__
|
|
#define __MEM_BUS_HH__
|
|
|
|
#include <string>
|
|
#include <list>
|
|
#include <inttypes.h>
|
|
|
|
#include "base/range.hh"
|
|
#include "mem/mem_object.hh"
|
|
#include "mem/packet.hh"
|
|
#include "mem/port.hh"
|
|
#include "mem/request.hh"
|
|
|
|
class Bus : public MemObject
|
|
{
|
|
/** a globally unique id for this bus. */
|
|
int busId;
|
|
|
|
struct DevMap {
|
|
int portId;
|
|
Range<Addr> range;
|
|
};
|
|
std::vector<DevMap> portList;
|
|
|
|
|
|
/** Function called by the port when the bus is recieving a Timing
|
|
transaction.*/
|
|
bool recvTiming(Packet *pkt);
|
|
|
|
/** Function called by the port when the bus is recieving a Atomic
|
|
transaction.*/
|
|
Tick recvAtomic(Packet *pkt);
|
|
|
|
/** Function called by the port when the bus is recieving a Functional
|
|
transaction.*/
|
|
void recvFunctional(Packet *pkt);
|
|
|
|
/** Timing function called by port when it is once again able to process
|
|
* requests. */
|
|
void recvRetry(int id);
|
|
|
|
/** Function called by the port when the bus is recieving a status change.*/
|
|
void recvStatusChange(Port::Status status, int id);
|
|
|
|
/** Find which port connected to this bus (if any) should be given a packet
|
|
* with this address.
|
|
* @param addr Address to find port for.
|
|
* @param id Id of the port this packet was received from (to prevent
|
|
* loops)
|
|
* @return pointer to port that the packet should be sent out of.
|
|
*/
|
|
Port *findPort(Addr addr, int id);
|
|
|
|
/** Process address range request.
|
|
* @param resp addresses that we can respond to
|
|
* @param snoop addresses that we would like to snoop
|
|
* @param id ide of the busport that made the request.
|
|
*/
|
|
void addressRanges(AddrRangeList &resp, AddrRangeList &snoop, int id);
|
|
|
|
|
|
/** Decleration of the buses port type, one will be instantiated for each
|
|
of the interfaces connecting to the bus. */
|
|
class BusPort : public Port
|
|
{
|
|
/** A pointer to the bus to which this port belongs. */
|
|
Bus *bus;
|
|
|
|
/** A id to keep track of the intercafe ID this port is connected to. */
|
|
int id;
|
|
|
|
public:
|
|
|
|
/** Constructor for the BusPort.*/
|
|
BusPort(const std::string &_name, Bus *_bus, int _id)
|
|
: Port(_name), bus(_bus), id(_id)
|
|
{ }
|
|
|
|
protected:
|
|
|
|
/** When reciving a timing request from the peer port (at id),
|
|
pass it to the bus. */
|
|
virtual bool recvTiming(Packet *pkt)
|
|
{ pkt->setSrc(id); return bus->recvTiming(pkt); }
|
|
|
|
/** When reciving a Atomic requestfrom the peer port (at id),
|
|
pass it to the bus. */
|
|
virtual Tick recvAtomic(Packet *pkt)
|
|
{ pkt->setSrc(id); return bus->recvAtomic(pkt); }
|
|
|
|
/** When reciving a Functional requestfrom the peer port (at id),
|
|
pass it to the bus. */
|
|
virtual void recvFunctional(Packet *pkt)
|
|
{ pkt->setSrc(id); bus->recvFunctional(pkt); }
|
|
|
|
/** When reciving a status changefrom the peer port (at id),
|
|
pass it to the bus. */
|
|
virtual void recvStatusChange(Status status)
|
|
{ bus->recvStatusChange(status, id); }
|
|
|
|
/** When reciving a retry from the peer port (at id),
|
|
pass it to the bus. */
|
|
virtual void recvRetry()
|
|
{ bus->recvRetry(id); }
|
|
|
|
// This should return all the 'owned' addresses that are
|
|
// downstream from this bus, yes? That is, the union of all
|
|
// the 'owned' address ranges of all the other interfaces on
|
|
// this bus...
|
|
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
|
AddrRangeList &snoop)
|
|
{ bus->addressRanges(resp, snoop, id); }
|
|
|
|
// Hack to make translating port work without changes
|
|
virtual int deviceBlockSize() { return 32; }
|
|
|
|
};
|
|
|
|
/** An array of pointers to the peer port interfaces
|
|
connected to this bus.*/
|
|
std::vector<Port*> interfaces;
|
|
|
|
/** An array of pointers to ports that retry should be called on because the
|
|
* original send failed for whatever reason.*/
|
|
std::list<Port*> retryList;
|
|
|
|
public:
|
|
|
|
/** A function used to return the port associated with this bus object. */
|
|
virtual Port *getPort(const std::string &if_name, int idx = -1);
|
|
|
|
virtual void init();
|
|
|
|
Bus(const std::string &n, int bus_id)
|
|
: MemObject(n), busId(bus_id) {}
|
|
|
|
};
|
|
|
|
#endif //__MEM_BUS_HH__
|