diff options
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/SConscript | 1 | ||||
| -rw-r--r-- | src/python/pybind11/pybind.hh | 1 | ||||
| -rw-r--r-- | src/python/pybind11/pyobject.cc | 126 |
3 files changed, 0 insertions, 128 deletions
diff --git a/src/python/SConscript b/src/python/SConscript index 36e0d5bfc..fb1666cd3 100644 --- a/src/python/SConscript +++ b/src/python/SConscript @@ -70,5 +70,4 @@ PySource('m5.ext.pyfdt', 'm5/ext/pyfdt/__init__.py') Source('pybind11/core.cc', add_tags='python') Source('pybind11/debug.cc', add_tags='python') Source('pybind11/event.cc', add_tags='python') -Source('pybind11/pyobject.cc', add_tags='python') Source('pybind11/stats.cc', add_tags='python') diff --git a/src/python/pybind11/pybind.hh b/src/python/pybind11/pybind.hh index 9a0643c5a..e2e470a18 100644 --- a/src/python/pybind11/pybind.hh +++ b/src/python/pybind11/pybind.hh @@ -46,7 +46,6 @@ void pybind_init_core(pybind11::module &m_native); void pybind_init_debug(pybind11::module &m_native); void pybind_init_event(pybind11::module &m_native); -void pybind_init_pyobject(pybind11::module &m_native); void pybind_init_stats(pybind11::module &m_native); #endif diff --git a/src/python/pybind11/pyobject.cc b/src/python/pybind11/pyobject.cc deleted file mode 100644 index bd363a132..000000000 --- a/src/python/pybind11/pyobject.cc +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) 2017 ARM Limited - * All rights reserved - * - * The license below extends only to copyright in the software and shall - * not be construed as granting a license to any other intellectual - * property including but not limited to intellectual property relating - * to a hardware implementation of the functionality of the software - * licensed hereunder. You may use the software subject to the license - * terms below provided that you ensure that this notice is replicated - * unmodified and in its entirety in all distributions of the software, - * modified or unmodified, in source code or in binary form. - * - * Copyright (c) 2006 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: Nathan Binkert - */ - -#include "pybind11/pybind11.h" - -#include <string> - -#include "config/the_isa.hh" - -#include "dev/net/etherdevice.hh" -#include "dev/net/etherint.hh" -#include "dev/net/etherobject.hh" -#include "mem/mem_object.hh" -#include "mem/ruby/network/Network.hh" -#include "mem/ruby/slicc_interface/AbstractController.hh" -#include "mem/ruby/system/Sequencer.hh" -#include "sim/full_system.hh" - -namespace py = pybind11; - -/** - * Connect the described MemObject ports. Called from Python. - * The indices i1 & i2 will be -1 for regular ports, >= 0 for vector ports. - * SimObject1 is the master, and SimObject2 is the slave - */ -static int -connectPorts(SimObject *o1, const std::string &name1, int i1, - SimObject *o2, const std::string &name2, int i2) -{ - auto *eo1 = dynamic_cast<EtherObject*>(o1); - auto *eo2 = dynamic_cast<EtherObject*>(o2); - - if (eo1 && eo2) { - EtherInt *p1 = eo1->getEthPort(name1, i1); - EtherInt *p2 = eo2->getEthPort(name2, i2); - - if (p1 && p2) { - p1->setPeer(p2); - p2->setPeer(p1); - - return 1; - } - } - - // These could be MessageBuffers from the ruby memory system. If so, they - // need not be connected to anything currently. - MessageBuffer *mb1, *mb2; - mb1 = dynamic_cast<MessageBuffer*>(o1); - mb2 = dynamic_cast<MessageBuffer*>(o2); - Network *nw1, *nw2; - nw1 = dynamic_cast<Network*>(o1); - nw2 = dynamic_cast<Network*>(o2); - - if ((mb1 || nw1) && (mb2 || nw2)) { - // No need to connect anything here currently. MessageBuffer - // connections in Python only serve to print the connections in - // the config output. - // TODO: Add real ports to MessageBuffers and use MemObject connect - // code below to bind MessageBuffer senders and receivers - return 1; - } - - MemObject *mo1, *mo2; - mo1 = dynamic_cast<MemObject*>(o1); - mo2 = dynamic_cast<MemObject*>(o2); - - if (mo1 == NULL || mo2 == NULL) { - panic ("Error casting SimObjects %s and %s to MemObject", o1->name(), - o2->name()); - } - - // generic master/slave port connection - BaseMasterPort& masterPort = mo1->getMasterPort(name1, i1); - BaseSlavePort& slavePort = mo2->getSlavePort(name2, i2); - - masterPort.bind(slavePort); - - return 1; -} - -void -pybind_init_pyobject(py::module &m_native) -{ - py::module m = m_native.def_submodule("pyobject"); - - m.def("connectPorts", &connectPorts); -} |