arm: Replicate the PageBytes constant in the ArmSystem class.
authorGabe Black <gabeblack@google.com>
Mon, 7 Sep 2020 06:20:17 +0000 (23:20 -0700)
committerGabe Black <gabeblack@google.com>
Tue, 8 Sep 2020 22:05:46 +0000 (22:05 +0000)
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>
src/arch/arm/system.hh

index cffc23586af622c3851c99f209f4e8edae20d49d..e76245ea4a4017ad9496a1e74f7714f503142c22 100644 (file)
@@ -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