add more hexadecimal serialization functions

This commit is contained in:
Andrew Martin 2019-07-05 11:23:30 -04:00
parent 9533dcdcd9
commit 7563616836
2 changed files with 55 additions and 0 deletions

View file

@ -27,6 +27,8 @@ module Data.ByteArray.Builder.Small
, int64Dec , int64Dec
, word64PaddedUpperHex , word64PaddedUpperHex
, word32PaddedUpperHex , word32PaddedUpperHex
, word16PaddedUpperHex
, word8PaddedUpperHex
-- ** Machine-Readable -- ** Machine-Readable
, word64BE , word64BE
, word32BE , word32BE
@ -210,6 +212,20 @@ word32PaddedUpperHex :: Word32 -> Builder
word32PaddedUpperHex w = word32PaddedUpperHex w =
fromUnsafe (Unsafe.word32PaddedUpperHex w) fromUnsafe (Unsafe.word32PaddedUpperHex w)
-- | Encode a 16-bit unsigned integer as hexadecimal, zero-padding
-- the encoding to 4 digits. This uses uppercase for the alphabetical
-- digits. For example, this encodes the number 1022 as @03FE@.
word16PaddedUpperHex :: Word16 -> Builder
word16PaddedUpperHex w =
fromUnsafe (Unsafe.word16PaddedUpperHex w)
-- | Encode a 8-bit unsigned integer as hexadecimal, zero-padding
-- the encoding to 2 digits. This uses uppercase for the alphabetical
-- digits. For example, this encodes the number 11 as @0B@.
word8PaddedUpperHex :: Word8 -> Builder
word8PaddedUpperHex w =
fromUnsafe (Unsafe.word8PaddedUpperHex w)
unST :: ST s a -> State# s -> (# State# s, a #) unST :: ST s a -> State# s -> (# State# s, a #)
unST (ST f) = f unST (ST f) = f

View file

@ -28,6 +28,8 @@ module Data.ByteArray.Builder.Small.Unsafe
, int64Dec , int64Dec
, word64PaddedUpperHex , word64PaddedUpperHex
, word32PaddedUpperHex , word32PaddedUpperHex
, word16PaddedUpperHex
, word8PaddedUpperHex
-- ** Machine-Readable -- ** Machine-Readable
, word64BE , word64BE
, word32BE , word32BE
@ -172,6 +174,20 @@ word64PaddedUpperHex (W64# w) = word64PaddedUpperHex# w
word32PaddedUpperHex :: Word32 -> Builder 8 word32PaddedUpperHex :: Word32 -> Builder 8
word32PaddedUpperHex (W32# w) = word32PaddedUpperHex# w word32PaddedUpperHex (W32# w) = word32PaddedUpperHex# w
-- | Requires exactly 4 bytes. Encodes a 16-bit unsigned integer as
-- hexadecimal, zero-padding the encoding to 4 digits. This uses
-- uppercase for the alphabetical digits.
word16PaddedUpperHex :: Word16 -> Builder 4
word16PaddedUpperHex (W16# w) = word16PaddedUpperHex# w
-- | Requires exactly 2 bytes. Encodes a 8-bit unsigned integer as
-- hexadecimal, zero-padding the encoding to 2 digits. This uses
-- uppercase for the alphabetical digits.
word8PaddedUpperHex :: Word8 -> Builder 2
word8PaddedUpperHex (W8# w) = word8PaddedUpperHex# w
-- TODO: Is it actually worth unrolling this loop. I suspect that it
-- might not be. Benchmark this.
word64PaddedUpperHex# :: Word# -> Builder 16 word64PaddedUpperHex# :: Word# -> Builder 16
{-# noinline word64PaddedUpperHex# #-} {-# noinline word64PaddedUpperHex# #-}
word64PaddedUpperHex# w# = construct $ \arr off -> do word64PaddedUpperHex# w# = construct $ \arr off -> do
@ -210,6 +226,29 @@ word32PaddedUpperHex# w# = construct $ \arr off -> do
where where
w = W# w# w = W# w#
-- Not sure if it is beneficial to inline this. We just let
-- GHC make the decision. Open an issue on github if this is
-- a problem.
word16PaddedUpperHex# :: Word# -> Builder 4
word16PaddedUpperHex# w# = construct $ \arr off -> do
writeByteArray arr off (toHexUpper (unsafeShiftR w 12))
writeByteArray arr (off + 1) (toHexUpper (unsafeShiftR w 8))
writeByteArray arr (off + 2) (toHexUpper (unsafeShiftR w 4))
writeByteArray arr (off + 3) (toHexUpper (unsafeShiftR w 0))
pure (off + 4)
where
w = W# w#
-- Definitely want this to inline. It's maybe a dozen instructions total.
word8PaddedUpperHex# :: Word# -> Builder 2
{-# inline word8PaddedUpperHex #-}
word8PaddedUpperHex# w# = construct $ \arr off -> do
writeByteArray arr off (toHexUpper (unsafeShiftR w 4))
writeByteArray arr (off + 1) (toHexUpper (unsafeShiftR w 0))
pure (off + 2)
where
w = W# w#
-- | Requires exactly 8 bytes. Dump the octets of a 64-bit -- | Requires exactly 8 bytes. Dump the octets of a 64-bit
-- word in a big-endian fashion. -- word in a big-endian fashion.
word64BE :: Word64 -> Builder 8 word64BE :: Word64 -> Builder 8