From 53774a7a47f7c00b25ac35a80f01732b8e78af4a Mon Sep 17 00:00:00 2001
From: Rafal Kolanski <rafal.kolanski@nicta.com.au>
Date: Tue, 19 Jun 2018 12:19:53 +1000
Subject: [PATCH] riscv haskell: sFence and readSBADAddr -> sfence and
 read_sbadaddr

---
 spec/haskell/src/SEL4/Kernel/VSpace/RISCV64.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/haskell/src/SEL4/Kernel/VSpace/RISCV64.hs b/spec/haskell/src/SEL4/Kernel/VSpace/RISCV64.hs
index 451ce76df..dbf94fcd3 100644
--- a/spec/haskell/src/SEL4/Kernel/VSpace/RISCV64.hs
+++ b/spec/haskell/src/SEL4/Kernel/VSpace/RISCV64.hs
@@ -163,7 +163,7 @@ lookupPTSlot = lookupPTSlotFromLevel maxPTLevel
 
 handleVMFault :: PPtr TCB -> VMFaultType -> KernelF Fault ()
 handleVMFault thread f = do
-    w <- withoutFailure $ doMachineOp readSBADAddr
+    w <- withoutFailure $ doMachineOp read_sbadaddr
     let addr = VPtr w
     case f of
         RISCVLoadPageFault -> throw $ loadf addr
@@ -240,7 +240,7 @@ unmapPageTable asid vaddr pt = ignoreFailure $ do
     topLevelPT <- findVSpaceForASID asid
     ptSlot <- lookupPTFromLevel maxPTLevel topLevelPT vaddr pt
     withoutFailure $ storePTE ptSlot InvalidPTE
-    withoutFailure $ doMachineOp sFence
+    withoutFailure $ doMachineOp sfence
 
 {- Unmapping a Frame -}
 
@@ -251,7 +251,7 @@ unmapPage size asid vptr ptr = ignoreFailure $ do
     unless (bitsLeft == pageBitsForSize size) $ throw InvalidRoot
     pte <- withoutFailure $ getObject slot
     withoutFailure $ storePTE slot InvalidPTE
-    withoutFailure $ doMachineOp sFence
+    withoutFailure $ doMachineOp sfence
 
 {- Address Space Switching -}
 
@@ -520,7 +520,7 @@ performPageTableInvocation :: PageTableInvocation -> Kernel ()
 performPageTableInvocation (PageTableMap cap ctSlot pte ptSlot) = do
     updateCap ctSlot cap
     storePTE ptSlot pte
-    doMachineOp sFence
+    doMachineOp sfence
 
 performPageTableInvocation (PageTableUnmap cap slot) = do
     case capPTMappedAddress cap of
@@ -538,11 +538,11 @@ performPageInvocation :: PageInvocation -> Kernel ()
 performPageInvocation (PageMap cap ctSlot (pte,slot)) = do
     updateCap ctSlot cap
     storePTE slot pte
-    doMachineOp sFence
+    doMachineOp sfence
 
 performPageInvocation (PageRemap (pte,slot)) = do
     storePTE slot pte
-    doMachineOp sFence
+    doMachineOp sfence
 
 performPageInvocation (PageUnmap cap ctSlot) = do
     case capFMappedAddress cap of