From f652ae23b6cbaa3d70ae38f8942d6ae61af2c1d6 Mon Sep 17 00:00:00 2001
From: Thomas Bauereiss
Date: Tue, 10 Jul 2018 13:57:17 +0100
Subject: Another AArch64 patch

Makes CheckAndUpdateDescriptor respect endianness
---
 aarch64/mono/demo/aarch64_no_vector/spec.sail | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'aarch64')

diff --git a/aarch64/mono/demo/aarch64_no_vector/spec.sail b/aarch64/mono/demo/aarch64_no_vector/spec.sail
index ecb3a050..1cd6fdbd 100644
--- a/aarch64/mono/demo/aarch64_no_vector/spec.sail
+++ b/aarch64/mono/demo/aarch64_no_vector/spec.sail
@@ -6715,6 +6715,7 @@ function AArch64_SecondStageTranslate (S1, vaddress, acctype, iswrite, wasaligne
 }
 
 function AArch64_CheckAndUpdateDescriptor (result, fault, secondstage, vaddress, acctype, iswrite, s2fs1walk, hwupdatewalk__arg) = {
+  let reversedescriptors = (aget_SCTLR()[25] == bitone);
   hwupdatewalk = hwupdatewalk__arg;
   hw_update_AF : bool = undefined;
   if result.AF then if fault.typ == Fault_None then hw_update_AF = true else if ConstrainUnpredictable(Unpredictable_AFUPDATE) == Constraint_TRUE then hw_update_AF = true else hw_update_AF = false else hw_update_AF = false;
@@ -6735,8 +6736,10 @@ function AArch64_CheckAndUpdateDescriptor (result, fault, secondstage, vaddress,
     };
     accdesc = CreateAccessDescriptor(AccType_ATOMICRW);
     desc = aget__Mem(descaddr2, 8, accdesc);
+    if reversedescriptors then desc = BigEndianReverse(desc) else ();
     if hw_update_AF then desc = __SetSlice_bits(64, 1, desc, 10, 0b1) else ();
     if hw_update_AP then desc = __SetSlice_bits(64, 1, desc, 7, if secondstage then 0b1 else 0b0) else ();
+    if reversedescriptors then desc = BigEndianReverse(desc) else ();
     aset__Mem(descaddr2, 8, accdesc, desc)
   } else ();
   return(fault)
-- 
cgit v1.2.3