From f19884d5caf6671a45c1fede69d4d019e76ad4f3 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 29 Apr 2019 16:20:45 -0700 Subject: [PATCH] sparc: Move the interrupt types out of isa_traits.hh into interrupts.hh. Those types aren't generic or used outside of SPARC. Change-Id: I9bb154920a9625f12388c3d295dc933ab51fadde Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18469 Reviewed-by: Gabe Black Maintainer: Gabe Black Tested-by: kokoro --- src/arch/sparc/interrupts.hh | 12 ++++++++++++ src/arch/sparc/isa_traits.hh | 12 ------------ src/arch/sparc/tlb.cc | 1 + src/arch/sparc/ua2005.cc | 1 + src/dev/sparc/iob.cc | 1 + 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/arch/sparc/interrupts.hh b/src/arch/sparc/interrupts.hh index e6c926676..abc899efb 100644 --- a/src/arch/sparc/interrupts.hh +++ b/src/arch/sparc/interrupts.hh @@ -43,6 +43,18 @@ namespace SparcISA { +enum InterruptTypes +{ + IT_TRAP_LEVEL_ZERO, + IT_HINTP, + IT_INT_VEC, + IT_CPU_MONDO, + IT_DEV_MONDO, + IT_RES_ERROR, + IT_SOFT_INT, + NumInterruptTypes +}; + class Interrupts : public SimObject { private: diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh index 58d8437ad..5bcfc04a4 100644 --- a/src/arch/sparc/isa_traits.hh +++ b/src/arch/sparc/isa_traits.hh @@ -61,18 +61,6 @@ const Addr VAddrAMask = ULL(0xFFFFFFFF); const Addr PAddrImplMask = ULL(0x000000FFFFFFFFFF); const Addr BytesInPageMask = ULL(0x1FFF); -enum InterruptTypes -{ - IT_TRAP_LEVEL_ZERO, - IT_HINTP, - IT_INT_VEC, - IT_CPU_MONDO, - IT_DEV_MONDO, - IT_RES_ERROR, - IT_SOFT_INT, - NumInterruptTypes -}; - // Memory accesses cannot be unaligned const bool HasUnalignedMemAcc = false; diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc index b2078dd5b..8564c4399 100644 --- a/src/arch/sparc/tlb.cc +++ b/src/arch/sparc/tlb.cc @@ -34,6 +34,7 @@ #include "arch/sparc/asi.hh" #include "arch/sparc/faults.hh" +#include "arch/sparc/interrupts.hh" #include "arch/sparc/registers.hh" #include "base/bitfield.hh" #include "base/compiler.hh" diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc index 4cafff47c..389549b40 100644 --- a/src/arch/sparc/ua2005.cc +++ b/src/arch/sparc/ua2005.cc @@ -26,6 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "arch/sparc/interrupts.hh" #include "arch/sparc/isa.hh" #include "arch/sparc/kernel_stats.hh" #include "arch/sparc/registers.hh" diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc index f14653615..1df6decb5 100644 --- a/src/dev/sparc/iob.cc +++ b/src/dev/sparc/iob.cc @@ -40,6 +40,7 @@ #include #include "arch/sparc/faults.hh" +#include "arch/sparc/interrupts.hh" #include "arch/sparc/isa_traits.hh" #include "base/bitfield.hh" #include "base/trace.hh" -- 2.30.2