Add pad() to bit reader and writer

Remove wrong noexcept from string serialize read
Add more endian swap functions

Author: KredeGC

include/bitstream/stream/bit_reader.h

@@ -200,6 +200,16 @@ namespace bitstream
 			return true;
 		}
 
+		/**
+		 * @brief Pads the buffer up with the given number of bytes
+		 * @param num_bytes The amount of bytes to pad
+		 * @return Returns false if the current size of the buffer is bigger than @p num_bytes or if the padded bits are not zeros.
+		*/
+		[[nodiscard]] bool pad(uint32_t num_bytes) noexcept
+		{
+			return pad_to_size(get_num_bytes_serialized() + num_bytes);
+		}
+
 		/**
 		 * @brief Pads the buffer with up to 8 zeros, so that the next read is byte-aligned
 		 * @notes Return false if the padded bits are not zeros
@@ -235,7 +245,7 @@ namespace bitstream
 			{
 				const uint32_t* ptr = m_Buffer + m_WordIndex;
 
-				uint64_t ptr_value = static_cast<uint64_t>(utility::endian_swap_32(*ptr)) << (32U - m_ScratchBits);
+				uint64_t ptr_value = static_cast<uint64_t>(utility::to_big_endian32(*ptr)) << (32U - m_ScratchBits);
 				m_Scratch |= ptr_value;
 				m_ScratchBits += 32U;
 				m_WordIndex++;
@@ -285,7 +295,7 @@ namespace bitstream
 
                     // Casting a byte-array to an int is wrong on little-endian systems
                     // We have to swap the bytes around
-                    word_buffer[i] = utility::endian_swap_32(value);
+                    word_buffer[i] = utility::to_big_endian32(value);
                 }
             }
 

include/bitstream/stream/bit_writer.h

@@ -153,7 +153,7 @@ namespace bitstream
 			{
 				uint32_t* ptr = m_Buffer + m_WordIndex;
 				uint32_t ptr_value = static_cast<uint32_t>(m_Scratch >> 32U);
-				*ptr = utility::endian_swap_32(ptr_value);
+				*ptr = utility::to_big_endian32(ptr_value);
 
 				m_Scratch = 0U;
 				m_ScratchBits = 0U;
@@ -241,6 +241,16 @@ namespace bitstream
 			return true;
 		}
 
+		/**
+		 * @brief Pads the buffer up with the given number of bytes
+		 * @param num_bytes The amount of bytes to pad
+		 * @return Returns false if the current size of the buffer is bigger than @p num_bytes or if the padded bits are not zeros.
+		*/
+		[[nodiscard]] bool pad(uint32_t num_bytes) noexcept
+		{
+			return pad_to_size(get_num_bytes_serialized() + num_bytes);
+		}
+
 		/**
 		 * @brief Pads the buffer with up to 8 zeros, so that the next write is byte-aligned
 		 * @return Success
@@ -281,7 +291,7 @@ namespace bitstream
 			{
 				uint32_t* ptr = m_Buffer + m_WordIndex;
 				uint32_t ptr_value = static_cast<uint32_t>(m_Scratch >> 32U);
-				*ptr = utility::endian_swap_32(ptr_value);
+				*ptr = utility::to_big_endian32(ptr_value);
 				m_Scratch <<= 32ULL;
 				m_ScratchBits -= 32U;
 				m_WordIndex++;
@@ -321,7 +331,7 @@ namespace bitstream
                 {
                     // Casting a byte-array to an int is wrong on little-endian systems
                     // We have to swap the bytes around
-                    uint32_t value = utility::endian_swap_32(word_buffer[i]);
+                    uint32_t value = utility::to_big_endian32(word_buffer[i]);
                     BS_ASSERT(serialize_bits(value, 32U));
                 }
             }

include/bitstream/traits/string_traits.h

@@ -253,7 +253,7 @@ namespace bitstream
 		*/
 		template<typename Stream>
 		typename utility::is_reading_t<Stream>
-		static serialize(Stream& reader, out<std::basic_string<T, Traits, Alloc>> value, uint32_t max_size) noexcept
+		static serialize(Stream& reader, out<std::basic_string<T, Traits, Alloc>> value, uint32_t max_size)
 		{
 			uint32_t num_bits = utility::bits_to_represent(max_size);
 
@@ -318,7 +318,7 @@ namespace bitstream
 		*/
 		template<typename Stream>
 		typename utility::is_reading_t<Stream>
-		static serialize(Stream& reader, out<std::basic_string<T, Traits, Alloc>> value) noexcept
+		static serialize(Stream& reader, out<std::basic_string<T, Traits, Alloc>> value)
 		{
 			constexpr uint32_t num_bits = utility::bits_to_represent(MaxSize);
 

include/bitstream/utility/endian.h

@@ -63,26 +63,50 @@ namespace bitstream::utility
 #endif // defined(BS_LITTLE_ENDIAN)
     }
 
-	inline uint32_t endian_swap_32(uint32_t value)
-	{
-        if constexpr (little_endian())
-        {
+    inline uint32_t endian_swap32(uint32_t value)
+    {
 #if defined(_WIN32)
-            return _byteswap_ulong(value);
+        return _byteswap_ulong(value);
 #elif defined(__linux__)
-            return __builtin_bswap32(value);
+        return __builtin_bswap32(value);
 #else
-			const uint32_t first =  (value << 24)	& 0xFF000000;
-			const uint32_t second = (value << 8)	& 0x00FF0000;
-			const uint32_t third =  (value >> 8)	& 0x0000FF00;
-			const uint32_t fourth = (value >> 24)	& 0x000000FF;
+        const uint32_t first = (value << 24) & 0xFF000000;
+        const uint32_t second = (value << 8) & 0x00FF0000;
+        const uint32_t third = (value >> 8) & 0x0000FF00;
+        const uint32_t fourth = (value >> 24) & 0x000000FF;
 
-			return first | second | third | fourth;
+        return first | second | third | fourth;
 #endif // _WIN32 || __linux__
-        }
+    }
+
+    constexpr inline uint32_t endian_swap24(uint32_t value)
+    {
+        const uint32_t first = (value << 16) & 0x00FF0000;
+        const uint32_t second = (value << 8) & 0x0000FF00;
+        const uint32_t third = (value >> 16) & 0x000000FF;
+
+        return first | second | third;
+    }
+
+    inline uint32_t endian_swap16(uint32_t value)
+    {
+#if defined(_WIN32)
+        return _byteswap_ushort(value);
+#elif defined(__linux__)
+        return __builtin_bswap16(value);
+#else
+        const uint32_t first = (value << 8) & 0x0000FF00;
+        const uint32_t second = (value >> 8) & 0x000000FF;
+
+        return first | second;
+#endif // _WIN32 || __linux__
+    }
+
+    inline uint32_t to_big_endian32(uint32_t value)
+    {
+        if constexpr (little_endian())
+            return endian_swap32(value);
         else
-        {
             return value;
-        }
-	}
+    }
 }

include/bitstream/utility/parameter.h

@@ -91,7 +91,7 @@ namespace bitstream
 	 * @brief Passes by const or const reference depending on size
 	*/
 	template<typename T>
-	using in = std::conditional_t<(sizeof(T) < 16), std::add_const_t<T>, std::add_lvalue_reference_t<std::add_const_t<T>>>;
+	using in = std::conditional_t<(sizeof(T) <= 16), std::add_const_t<T>, std::add_lvalue_reference_t<std::add_const_t<T>>>;
 
 	/**
 	 * @brief Passes by reference