Replacing $ operator with more readable |> operator

hs/Peripherals/Ram.hs

@@ -24,6 +24,7 @@ import BusTypes(
     TransactionSize(..),
     BusVal(..),
   )
+import Util((|>))
 
 -- vector depth has to be known statically at compile time
 #ifndef _RAM_DEPTH
@@ -38,7 +39,7 @@ bytesInRam :: Addr
 bytesInRam = _RAM_DEPTH * 4
 
 read :: TransactionSize -> RamAddr -> Ram -> BusVal
-read SizeByte addr ram = BusByte $ unpack byte
+read SizeByte addr ram = BusByte |> unpack byte
   where
     word = ram !! addr
     byteOffset :: BitVector 2
@@ -49,11 +50,11 @@ read SizeByte addr ram = BusByte $ unpack byte
       0b10 -> slice d15 d8 word
       0b11 -> slice d7 d0 word
 
-read SizeHalfWord addr ram = BusHalfWord $ unpack halfWord
+read SizeHalfWord addr ram = BusHalfWord |> unpack halfWord
   where
     word = ram !! addr
     halfWordOffset :: Unsigned 1
-    halfWordOffset = unpack $ slice d0 d0 addr
+    halfWordOffset = unpack |> slice d0 d0 addr
     halfWord = case halfWordOffset of
       0b0 -> slice d31 d16 word
       0b1 -> slice d15 d0 word
@@ -64,13 +65,13 @@ read SizeFullWord addr ram = BusFullWord fullWord
 
 read SizeDoubleWord addr ram = BusDoubleWord doubleWord
   where
-    doubleWord = bitCoerce $ bitCoerce word0 ++# bitCoerce word1
+    doubleWord = bitCoerce |> bitCoerce word0 ++# bitCoerce word1
     word0 = readFullWordHelper ram addr
     word1 = readFullWordHelper ram (addr + 1)
 
 read SizeQuadWord addr ram = BusQuadWord quadWord
   where
-    quadWord = bitCoerce $ bitCoerce dword0 ++# bitCoerce dword1
+    quadWord = bitCoerce |> bitCoerce dword0 ++# bitCoerce dword1
     dword0 = readDoubleWordHelper ram addr
     dword1 = readDoubleWordHelper ram (addr + 2)
 
@@ -78,7 +79,7 @@ readFullWordHelper :: Ram -> RamAddr -> FullWord
 readFullWordHelper ram addr = ram !! addr
 
 readDoubleWordHelper :: Ram -> RamAddr -> DoubleWord
-readDoubleWordHelper ram addr = bitCoerce $ bitCoerce word0 ++# bitCoerce word1
+readDoubleWordHelper ram addr = bitCoerce |> bitCoerce word0 ++# bitCoerce word1
   where
     word0 = readFullWordHelper ram addr
     word1 = readFullWordHelper ram (addr + 1)
@@ -99,7 +100,7 @@ write (BusHalfWord halfWord) addr ram = replace addr updatedWord ram
   where
     word = ram !! addr
     halfWordOffset :: Unsigned 1
-    halfWordOffset = unpack $ slice d0 d0 addr
+    halfWordOffset = unpack |> slice d0 d0 addr
     updatedWord = case halfWordOffset of
       0b0 -> setSlice d31 d16 (pack halfWord) word
       0b1 -> setSlice d15 d0  (pack halfWord) word
@@ -136,7 +137,7 @@ initRamFromFile filePath =
       do
       bs <- readFileIntoByteString filePath
       let ints = getInts bs
-      pure $ populateVectorFromInt32 ints initRam
+      pure |> populateVectorFromInt32 ints initRam
 
 readFileIntoByteString :: FilePath -> IO BL.ByteString
 readFileIntoByteString filePath = BL.readFile filePath
@@ -163,6 +164,6 @@ populateVectorFromInt32 ::
 populateVectorFromInt32 ls v = Vec.fromList adjustedLs
   where
     vecLen = length v
-    adjustedLs = fromIntegral <$> adjustLength vecLen ls
+    adjustedLs = fmap fromIntegral (adjustLength vecLen ls)
     adjustLength :: Int -> [Int32] -> [Int32]
     adjustLength n xs = P.take n (xs P.++ P.repeat 0)

hs/Peripherals/Setup.hs

@@ -7,6 +7,7 @@ import Peripherals.UartCFFI(initTerminal)
 import Peripherals.Ram (initRamFromFile, Ram)
 import Control.Exception (try)
 import System.IO.Error (ioeGetErrorString)
+import Util((|>))
 
 type FirmwareFilePath = FilePath
 
@@ -20,10 +21,10 @@ setupPeripherals firmwareFilePath = do
     initTerminal
     result <- try (initRamFromFile firmwareFilePath)
 
-    return $ case result of
+    return |> case result of
       Right (Just ram) -> InitializedPeripherals ram
-      Right Nothing -> InitializationError $ firmwareFilePath ++ failure ++ suggestion
-      Left e -> InitializationError $ firmwareFilePath ++ failure ++ suggestion ++ " Error: " ++ ioeGetErrorString e
+      Right Nothing -> InitializationError |> firmwareFilePath ++ failure ++ suggestion
+      Left e -> InitializationError |> firmwareFilePath ++ failure ++ suggestion ++ " Error: " ++ ioeGetErrorString e
   where
     failure    = ": Failed to initialize RAM from file!"
     suggestion = " Is the file 4-byte aligned?"

hs/Peripherals/Uart.hs

@@ -14,6 +14,7 @@ import BusTypes (
     TransactionSize(..),
     BusVal(..),
   )
+import Util((|>))
 
 -- based on a 16550 UART which has an address space of 8 bytes
 type UartAddr = Unsigned 3
@@ -47,7 +48,7 @@ buildRBR = do
 -- Reads the Line Status Register (LSR) to check character availability
 buildLSR :: IO Byte
 buildLSR = do
-  (char_available :: Byte) <- fromIntegral <$> isCharAvailable
+  (char_available :: Byte) <- fmap fromIntegral isCharAvailable
   -- highly unlikely that we overflow stdout buffer, so we set
   -- transmit to always ready
   let (transmit_ready :: Byte) = 0b0010_0000
@@ -56,8 +57,8 @@ buildLSR = do
 -- Updated 'read' function to handle RBR and LSR reads
 read :: TransactionSize -> UartAddr -> IO BusVal
 read size addr
-  | addr == rbrAddr = busValFromByte size <$> buildRBR
-  | addr == lsrAddr = busValFromByte size <$> buildLSR
+  | addr == rbrAddr = fmap (busValFromByte size) buildRBR
+  | addr == lsrAddr = fmap (busValFromByte size) buildLSR
   | otherwise       = return $ busValFromByte size 0x00
 
 extractLowestByte :: BusVal -> Byte

hs/Peripherals/UartCFFI.hs

@@ -11,6 +11,7 @@ module Peripherals.UartCFFI (
 ) where
 
 import Prelude
+import Util((|>))
 import Foreign.C.Types
 import Data.Char (chr, ord)
 
@@ -34,7 +35,7 @@ getCharFromTerminal :: IO Char
 getCharFromTerminal = fmap (chr . fromEnum) c_getCharFromTerminal
 
 writeCharToTerminal :: Char -> IO ()
-writeCharToTerminal char = c_writeCharToTerminal (toEnum $ ord char)
+writeCharToTerminal char = c_writeCharToTerminal (toEnum |> ord char)
 
 isCharAvailable :: IO Int
 isCharAvailable = fmap fromEnum c_isCharAvailable
@@ -47,4 +48,4 @@ wasCtrlCReceived = fmap fromEnum c_wasCtrlCReceived
 
 -- Improved version of the ctrlCReceived to use the new wasCtrlCReceived signature
 ctrlCReceived :: IO Bool
-ctrlCReceived = fmap (/= 0) wasCtrlCReceived
+ctrlCReceived = fmap (/= 0) wasCtrlCReceived