diff options
| author | Nikita Orlov <nikitf-97@mail.ru> | 2021-04-02 15:45:55 +0300 |
|---|---|---|
| committer | Nikita Orlov <nikitf-97@mail.ru> | 2021-04-02 15:45:55 +0300 |
| commit | d4d75b773e985dd1afcc89026f2afa483e8a28f3 (patch) | |
| tree | 0a4a700852fffbb06814766f228214fdff67c2d0 /src/Utils.hs | |
| parent | a2d59f5e1aa353f29cc557a60646c7a37cb738f4 (diff) | |
| download | suem-d4d75b773e985dd1afcc89026f2afa483e8a28f3.tar suem-d4d75b773e985dd1afcc89026f2afa483e8a28f3.tar.xz suem-d4d75b773e985dd1afcc89026f2afa483e8a28f3.zip | |
Size type fix
Diffstat (limited to 'src/Utils.hs')
| -rw-r--r-- | src/Utils.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Utils.hs b/src/Utils.hs index cffcc11..81c6e8a 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -25,13 +25,13 @@ extractBits x r = fromBits $ toBits x r ------------------------------------------------------------------------------- -- Size Convertion -convertLong :: Word32 -> Word32 -> Word32 +convertLong :: Word32 -> Int -> Word32 convertLong x 1 = x .&. 0x000000FF convertLong x 2 = x .&. 0x0000FFFF convertLong x 4 = x convertLong _ s = error $ "Wrong size (" ++ show s ++ ") of convertLong" -combineLong :: Word32 -> Word32 -> Word32 -> Word32 +combineLong :: Word32 -> Word32 -> Int -> Word32 combineLong update base 1 = base .&. 0xFFFFFF00 .|. (convertLong update 1) combineLong update base 2 = base .&. 0xFFFF0000 .|. (convertLong update 2) combineLong update _ 4 = update |