From 4c9ba9cd2925c83889c6388b4f5a15820bd9986b Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Thu, 23 Mar 2017 18:54:56 +0000 Subject: arm: Use the interrupt adaptor in the PMU Rewrite interrupt handling in the PMU model to use the new interrupt adaptor. Change-Id: I2cbb99580c46d3e21a1335b897843b7b6e41f10c Signed-off-by: Andreas Sandberg Reviewed-by: Nikos Nikoleris Reviewed-on: https://gem5-review.googlesource.com/12400 Reviewed-by: Giacomo Travaglini --- src/arch/arm/pmu.hh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/arch/arm/pmu.hh') diff --git a/src/arch/arm/pmu.hh b/src/arch/arm/pmu.hh index 7090b4a78..61516cffd 100644 --- a/src/arch/arm/pmu.hh +++ b/src/arch/arm/pmu.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014, 2017 ARM Limited + * Copyright (c) 2011-2014, 2017-2018 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -58,6 +58,7 @@ class ArmPMUParams; class Platform; class ThreadContext; +class ArmInterruptPin; namespace ArmISA { @@ -112,6 +113,8 @@ class PMU : public SimObject, public ArmISA::BaseISADevice { void regProbeListeners() override; public: // ISA Device interface + void setThreadContext(ThreadContext *tc) override; + /** * Set a register within the PMU. * @@ -599,9 +602,7 @@ class PMU : public SimObject, public ArmISA::BaseISADevice { static const MiscReg reg_pmcr_wr_mask; /** Performance monitor interrupt number */ - const unsigned int pmuInterrupt; - /** Platform this device belongs to */ - Platform *const platform; + ArmInterruptPin *const interrupt; /** * List of event types supported by this PMU. -- cgit v1.2.3