derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fastmodel,dev: Rework the Int*Pin classes with Signal*Port.

Browse Source 
These are largely compatibility wrappers around the Signal*Port
classes. The python versions of these types enforce more specific
compatibility, but on the c++ side the Signal*Port<bool> classes can
be used directly instead.

Change-Id: I1325074d0ed1c8fc6dfece5ac1ee33872cc4f5e3
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66673
Maintainer: Gabe Black <gabeblack@google.com>
Reviewed-by: Yu-hsin Wang <yuhsingw@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2022-12-12 23:59:21 -08:00
committed by Gabe Black
parent 7a21ecf15c
commit 89d5bfca7c
4 changed files with 48 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/arch/arm/fastmodel/common/signal_sender.hh
View File

@@ -50,11 +50,11 @@ class SignalSender : public IntSinkPinBase
SignalSender(const std::string &_name, PortID _id) :
IntSinkPinBase(_name, _id, 0),
signal_out((_name + ".sig").c_str())
{}
private:
void raiseOnDevice() override { signal_out.set_state(id, true); }
void lowerOnDevice() override { signal_out.set_state(id, false); }
{
onChange([this](const bool &new_val) {
signal_out.set_state(id, new_val);
});
}
};
} // namespace fastmodel

1
src/dev/SConscript
View File

@@ -36,7 +36,6 @@ Source('dma_device.cc')
Source('dma_virt_device.cc')
SimObject('IntPin.py', sim_objects=[])
Source('intpin.cc')
SimObject('ResetPort.py', sim_objects=[])
Source('reset_port.cc')

67
src/dev/intpin.cc
View File

@@ -1,67 +0,0 @@
/*
* Copyright 2019 Google, Inc.
*
* 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 "dev/intpin.hh"
#include "base/logging.hh"
namespace gem5
{
void
IntSinkPinBase::bind(Port &peer)
{
source = dynamic_cast<IntSourcePinBase *>(&peer);
fatal_if(!source, "Attempt to bind interrupt sink pin %s to "
"incompatible port %s.", name(), peer.name());
Port::bind(peer);
}
void
IntSinkPinBase::unbind()
{
source = nullptr;
Port::unbind();
}
void
IntSourcePinBase::bind(Port &peer)
{
sink = dynamic_cast<IntSinkPinBase *>(&peer);
fatal_if(!sink, "Attempt to bind interrupt source pin %s to "
"incompatible port %s.", name(), peer.name());
Port::bind(peer);
}
void
IntSourcePinBase::unbind()
{
sink = nullptr;
Port::unbind();
}
} // namespace gem5

109
src/dev/intpin.hh
View File

@@ -28,94 +28,71 @@
#ifndef __DEV_INTPIN_HH__
#define __DEV_INTPIN_HH__
#include "sim/port.hh"
#include <type_traits>
#include "sim/signal.hh"
namespace gem5
{
class IntSourcePinBase;
class IntSinkPinBase : public Port
class IntSinkPinBase : public SignalSinkPort<bool>
{
protected:
friend IntSourcePinBase;
private:
const int _number = 0;
IntSourcePinBase *source = nullptr;
public:
int _number = 0;
bool _state = false;
template <class Device>
IntSinkPinBase(const std::string &_name, PortID _id, Device *dev,
int num) :
SignalSinkPort(_name, _id), _number(num)
{
onChange([dev, num](const bool &new_val) {
if (new_val)
dev->raiseInterruptPin(num);
else
dev->lowerInterruptPin(num);
});
}
template <class Device>
IntSinkPinBase(const std::string &_name, PortID _id, Device *dev) :
IntSinkPinBase(_name, _id, dev, _id)
{}
IntSinkPinBase(const std::string &_name, PortID _id, int num) :
Port(_name, _id), _number(num)
SignalSinkPort(_name, _id), _number(num)
{}
virtual void raiseOnDevice() = 0;
virtual void lowerOnDevice() = 0;
IntSinkPinBase(const std::string &_name, PortID _id) :
IntSinkPinBase(_name, _id, _id)
{}
void
raise()
{
_state = true;
raiseOnDevice();
}
void
lower()
{
_state = false;
lowerOnDevice();
}
public:
int number() { return _number; }
bool state() { return _state; }
void bind(Port &peer) override;
void unbind() override;
};
template <class Device>
class IntSinkPin : public IntSinkPinBase
template <class Compat>
using IntSinkPin = IntSinkPinBase;
class IntSourcePinBase : public SignalSourcePort<bool>
{
private:
Device *device = nullptr;
void raiseOnDevice() override { device->raiseInterruptPin(number()); }
void lowerOnDevice() override { device->lowerInterruptPin(number()); }
public:
IntSinkPin(const std::string &_name, PortID _id, Device *dev, int num) :
IntSinkPinBase(_name, _id, num), device(dev) {}
IntSinkPin(const std::string &_name, PortID _id, Device *dev) :
IntSinkPin(_name, _id, dev, _id) {}
};
class IntSourcePinBase : public Port
{
private:
IntSinkPinBase *sink = nullptr;
public:
IntSourcePinBase(const std::string &_name, PortID _id):
Port(_name, _id)
template <class Device>
IntSourcePinBase(const std::string &_name, PortID _id, Device *owner) :
SignalSourcePort(_name, _id)
{}
void raise() { sink->raise(); }
void lower() { sink->lower(); }
void bind(Port &peer) override;
void unbind() override;
};
template <class Device>
class IntSourcePin : public IntSourcePinBase
{
public:
IntSourcePin(const std::string &_name, PortID _id, Device *owner) :
IntSourcePinBase(_name, _id)
IntSourcePinBase(const std::string &_name, PortID _id) :
SignalSourcePort(_name, _id)
{}
void raise() { set(true); }
void lower() { set(false); }
};
template <class Compat>
using IntSourcePin = IntSourcePinBase;
} // namespace gem5
#endif //__DEV_INTPIN_HH__