From a2d59f5e1aa353f29cc557a60646c7a37cb738f4 Mon Sep 17 00:00:00 2001 From: Nikita Orlov Date: Fri, 2 Apr 2021 15:34:54 +0300 Subject: Operand code update --- src/Utils.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Utils.hs') diff --git a/src/Utils.hs b/src/Utils.hs index 82b31ca..cffcc11 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -25,15 +25,15 @@ extractBits x r = fromBits $ toBits x r ------------------------------------------------------------------------------- -- Size Convertion -convertLong :: Word32 -> Int -> Word32 +convertLong :: Word32 -> Word32 -> Word32 convertLong x 1 = x .&. 0x000000FF convertLong x 2 = x .&. 0x0000FFFF -convertLong x 3 = x +convertLong x 4 = x convertLong _ s = error $ "Wrong size (" ++ show s ++ ") of convertLong" -combineLong :: Word32 -> Word32 -> Int -> Word32 +combineLong :: Word32 -> Word32 -> Word32 -> Word32 combineLong update base 1 = base .&. 0xFFFFFF00 .|. (convertLong update 1) combineLong update base 2 = base .&. 0xFFFF0000 .|. (convertLong update 2) -combineLong update _ 3 = update +combineLong update _ 4 = update combineLong _ _ s = error $ "Wrong size (" ++ show s ++ ") of combineLong" -- cgit v1.2.3