From: Gabe Black <gabeblack@google.com>
Date: Mon, 7 Sep 2020 06:20:17 +0000 (-0700)
Subject: arm: Replicate the PageBytes constant in the ArmSystem class.
X-Git-Tag: v20.1.0.0~64
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e41f063bef9895e5f0e2bc1a862c27ea249a3df;p=gem5.git

arm: Replicate the PageBytes constant in the ArmSystem class.

When isa_traits.hh hopefully goes away in the not too distant future,
this constant will need somewhere to live so ARM components can find it.
There are valid arguments that this should not be a constant in the
first place, but that's outside the scope of this change.

Change-Id: Ic5bd046dc1cc196b3cf6b6c36878fdbf5eb4c0bf
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34170
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/arch/arm/system.hh b/src/arch/arm/system.hh
index cffc23586..e76245ea4 100644
--- a/src/arch/arm/system.hh
+++ b/src/arch/arm/system.hh
@@ -137,6 +137,9 @@ class ArmSystem : public System
     ArmSemihosting *const semihosting;
 
   public:
+    static constexpr Addr PageBytes = ArmISA::PageBytes;
+    static constexpr Addr PageShift = ArmISA::PageShift;
+
     typedef ArmSystemParams Params;
     const Params *
     params() const