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

arm: Refactor some Event subclasses to lambdas

Browse Source 
Change-Id: Ic59add8afee1d49633634272d9687a4b1558537e
Signed-off-by: Sean Wilson <spwilson2@wisc.edu>
Reviewed-on: https://gem5-review.googlesource.com/3929
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
This commit is contained in:
Sean Wilson
2017-06-28 11:55:34 -05:00
parent 8bcf6a799d
commit 381aa84989
4 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dev/arm/gic_pl390.cc
View File

@@ -87,7 +87,9 @@ Pl390::Pl390(const Params *p)
cpuBpr[x] = GICC_BPR_MINIMUM;
// Initialize cpu highest int
cpuHighestInt[x] = SPURIOUS_INT;
postIntEvent[x] = new PostIntEvent(*this, x);
postIntEvent[x] =
new EventFunctionWrapper([this, x]{ postDelayedInt(x); },
"Post Interrupt to CPU");
}
DPRINTF(Interrupt, "cpuEnabled[0]=%d cpuEnabled[1]=%d\n", cpuEnabled[0],
cpuEnabled[1]);

16
src/dev/arm/gic_pl390.hh
View File

@@ -353,21 +353,7 @@ class Pl390 : public BaseGic, public BaseGicRegisters
*/
void postDelayedInt(uint32_t cpu);
/** Event definition to post interrupt to CPU after a delay
*/
class PostIntEvent : public Event
{
private:
Pl390 &parent;
uint32_t cpu;
public:
PostIntEvent(Pl390 &_parent, uint32_t _cpu)
: parent(_parent), cpu(_cpu)
{ }
void process() { parent.postDelayedInt(cpu); }
const char *description() const { return "Post Interrupt to CPU"; }
};
PostIntEvent *postIntEvent[CPU_MAX];
EventFunctionWrapper *postIntEvent[CPU_MAX];
int pendingDelayedInterrupts;
public:

11
src/dev/arm/vgic.cc
View File

@@ -53,7 +53,9 @@ VGic::VGic(const Params *p)
maintInt(p->ppint)
{
for (int x = 0; x < VGIC_CPU_MAX; x++) {
postVIntEvent[x] = new PostVIntEvent(x, p->platform);
postVIntEvent[x] = new EventFunctionWrapper(
[this, x]{ processPostVIntEvent(x); },
"Post VInterrupt to CPU");
maintIntPosted[x] = false;
vIntPosted[x] = false;
}
@@ -368,6 +370,13 @@ VGic::unPostVInt(uint32_t cpu)
platform->intrctrl->clear(cpu, ArmISA::INT_VIRT_IRQ, 0);
}
void
VGic::processPostVIntEvent(uint32_t cpu)
{
platform->intrctrl->post(cpu, ArmISA::INT_VIRT_IRQ, 0);
}
void
VGic::postMaintInt(uint32_t cpu)
{

18
src/dev/arm/vgic.hh
View File

@@ -104,22 +104,10 @@ class VGic : public PioDevice
static const uint32_t LR_PENDING = 1;
static const uint32_t LR_ACTIVE = 2;
/** Event definition to post interrupt to CPU after a delay
*/
class PostVIntEvent : public Event
{
private:
uint32_t cpu;
Platform *platform;
public:
PostVIntEvent( uint32_t c, Platform* p)
: cpu(c), platform(p)
{ }
void process() { platform->intrctrl->post(cpu, ArmISA::INT_VIRT_IRQ, 0);}
const char *description() const { return "Post VInterrupt to CPU"; }
};
/** Post interrupt to CPU */
void processPostVIntEvent(uint32_t cpu);
PostVIntEvent *postVIntEvent[VGIC_CPU_MAX];
EventFunctionWrapper *postVIntEvent[VGIC_CPU_MAX];
bool maintIntPosted[VGIC_CPU_MAX];
bool vIntPosted[VGIC_CPU_MAX];