From a56ab04598be184427e8dd71fa5528b016738306 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 11 Sep 2019 13:32:35 -0700 Subject: [PATCH] mem: Delete the now unused Message*Port classes. This port type is no longer used. Change-Id: If4abbb774819644bea58fd82e00dfdec8f79b5a6 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20822 Tested-by: kokoro Reviewed-by: Gabe Black Reviewed-by: Jason Lowe-Power Maintainer: Gabe Black Maintainer: Jason Lowe-Power --- src/mem/SConscript | 1 - src/mem/mport.cc | 54 ------------------------ src/mem/mport.hh | 101 --------------------------------------------- 3 files changed, 156 deletions(-) delete mode 100644 src/mem/mport.cc delete mode 100644 src/mem/mport.hh diff --git a/src/mem/SConscript b/src/mem/SConscript index 4ba2b5d34..2daa6bd9a 100644 --- a/src/mem/SConscript +++ b/src/mem/SConscript @@ -66,7 +66,6 @@ Source('drampower.cc') Source('dram_ctrl.cc') Source('external_master.cc') Source('external_slave.cc') -Source('mport.cc') Source('noncoherent_xbar.cc') Source('packet.cc') Source('port.cc') diff --git a/src/mem/mport.cc b/src/mem/mport.cc deleted file mode 100644 index 6b5ae774b..000000000 --- a/src/mem/mport.cc +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2012 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) 2008 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: Gabe Black - */ - -#include "mem/mport.hh" - -Tick -MessageSlavePort::recvAtomic(PacketPtr pkt) -{ - if (pkt->cmd == MemCmd::MessageReq) { - return recvMessage(pkt); - } else { - panic("%s received unexpected atomic command %s from %s.\n", - name(), pkt->cmd.toString(), getPeer()); - } -} diff --git a/src/mem/mport.hh b/src/mem/mport.hh deleted file mode 100644 index 6655b1143..000000000 --- a/src/mem/mport.hh +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2012 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) 2008 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: Gabe Black - */ - -#ifndef __MEM_MPORT_HH__ -#define __MEM_MPORT_HH__ - -#include "mem/tport.hh" -#include "sim/sim_object.hh" - -/* - * This file defines a port class which is used for sending and receiving - * messages. These messages are atomic units which don't interact and - * should be smaller than a cache block. This class is based on - * the underpinnings of SimpleTimingPort, but it tweaks some of the external - * functions. - */ -class MessageSlavePort : public SimpleTimingPort -{ - - public: - MessageSlavePort(const std::string &name, SimObject *owner) : - SimpleTimingPort(name, owner) - {} - - virtual ~MessageSlavePort() - {} - - protected: - - Tick recvAtomic(PacketPtr pkt); - - virtual Tick recvMessage(PacketPtr pkt) = 0; -}; - -class MessageMasterPort : public QueuedMasterPort -{ - public: - - MessageMasterPort(const std::string &name, SimObject *owner) : - QueuedMasterPort(name, owner, reqQueue, snoopRespQueue), - reqQueue(*owner, *this), snoopRespQueue(*owner, *this) - {} - - virtual ~MessageMasterPort() - {} - - bool recvTimingResp(PacketPtr pkt) { recvResponse(pkt); return true; } - - protected: - - /** A packet queue for outgoing packets. */ - ReqPacketQueue reqQueue; - SnoopRespPacketQueue snoopRespQueue; - - // Accept and ignore responses. - virtual Tick recvResponse(PacketPtr pkt) - { - return 0; - } -}; - -#endif -- 2.30.2