From cf51151aa85d95b45d7acb32ab482bd3cbe8b5e2 Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <me@phlamethrower.co.uk>
Date: Mon, 8 Mar 2021 18:25:45 +0000
Subject: [PATCH] Adjust alignment of PageShifts

PageShifts is only accessed with "ADRL xx, PageShifts-1"; adjust the
alignment so that PageShifts-1 is word aligned, to try and avoid us
hitting any ADRL range limits (which has happened with the runtime
ShortDesc vs. LongDesc selection from future commits)
---
 s/ARM600 | 2 ++
 s/VMSAv6 | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/s/ARM600 b/s/ARM600
index ed4d0a2..c02a28c 100644
--- a/s/ARM600
+++ b/s/ARM600
@@ -224,9 +224,11 @@ PPLAccess            ; EL1EL0
         GenPPLAccess 2_101101
         DCD     -1
 
+        =       0                       ; So PageShifts-1 is word aligned
 PageShifts
         =       12, 13, 0, 14           ; 1 2 3 4
         =       0,  0,  0, 15           ; 5 6 7 8
+        ALIGN
 
         LTORG
 
diff --git a/s/VMSAv6 b/s/VMSAv6
index 93ef6b8..55fc343 100644
--- a/s/VMSAv6
+++ b/s/VMSAv6
@@ -238,9 +238,11 @@ PPLAccess            ; EL1EL0
         GenPPLAccess 2_100000
         DCD     -1
 
+        =       0                       ; So PageShifts-1 is word aligned
 PageShifts
         =       12, 13, 0, 14           ; 1 2 3 4
         =       0,  0,  0, 15           ; 5 6 7 8
+        ALIGN
 
         LTORG
 
-- 
GitLab