From 2f31267ea2ec0362e2f690a0a6a28609a75efc23 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 3 Oct 2022 01:00:51 +0100 Subject: [PATCH] char to unsigned char storage --- include/etl/unaligned_type.h | 100 ++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/include/etl/unaligned_type.h b/include/etl/unaligned_type.h index 54b72205..8a65f54c 100644 --- a/include/etl/unaligned_type.h +++ b/include/etl/unaligned_type.h @@ -58,10 +58,11 @@ namespace etl static ETL_CONSTANT size_t Size = Size_; - typedef char* pointer; - typedef const char* const_pointer; - typedef char* iterator; - typedef const char* const_iterator; + typedef unsigned char storage_type; + typedef storage_type* pointer; + typedef const storage_type* const_pointer; + typedef storage_type* iterator; + typedef const storage_type* const_iterator; typedef etl::reverse_iterator reverse_iterator; typedef etl::reverse_iterator const_reverse_iterator; @@ -196,7 +197,7 @@ namespace etl //************************************************************************* /// Index operator. //************************************************************************* - char& operator[](int i) + storage_type& operator[](int i) { return storage[i]; } @@ -204,14 +205,14 @@ namespace etl //************************************************************************* /// Const index operator. //************************************************************************* - ETL_CONSTEXPR const char& operator[](int i) const + ETL_CONSTEXPR const storage_type& operator[](int i) const { return storage[i]; } protected: - char storage[Size]; + unsigned char storage[Size]; }; } @@ -227,6 +228,9 @@ namespace etl typedef T value_type; + typedef typename private_unaligned_type::unaligned_type_common::pointer pointer; + typedef typename private_unaligned_type::unaligned_type_common::const_pointer const_pointer; + static ETL_CONSTANT int Endian = Endian_; static ETL_CONSTANT size_t Size = private_unaligned_type::unaligned_type_common::Size; @@ -362,19 +366,19 @@ namespace etl struct unaligned_copy { //******************************* - static ETL_CONSTEXPR14 void copy(T value, char* store) + static ETL_CONSTEXPR14 void copy(T value, pointer store) { - store[0] = static_cast(value); + store[0] = static_cast(value); } //******************************* - static ETL_CONSTEXPR14 void copy(const char* store, T& value) + static ETL_CONSTEXPR14 void copy(const_pointer store, T& value) { value = static_cast(store[0]); } //******************************* - static ETL_CONSTEXPR14 void copy(const char* src, int /*endian_src*/, char* dst) + static ETL_CONSTEXPR14 void copy(const_pointer src, int /*endian_src*/, unsigned char* dst) { dst[0] = src[0]; } @@ -387,22 +391,22 @@ namespace etl struct unaligned_copy { //******************************* - static ETL_CONSTEXPR14 void copy(T value, char* store) + static ETL_CONSTEXPR14 void copy(T value, unsigned char* store) { if (Endian == etl::endianness::value()) { - store[0] = static_cast(value); - store[1] = static_cast(value >> (1U * CHAR_BIT)); + store[0] = static_cast(value); + store[1] = static_cast(value >> (1U * CHAR_BIT)); } else { - store[1] = static_cast(value); - store[0] = static_cast(value >> (1U * CHAR_BIT)); + store[1] = static_cast(value); + store[0] = static_cast(value >> (1U * CHAR_BIT)); } } //******************************* - static ETL_CONSTEXPR14 void copy(const char* store, T& value) + static ETL_CONSTEXPR14 void copy(const_pointer store, T& value) { if (Endian == etl::endianness::value()) { @@ -417,7 +421,7 @@ namespace etl } //******************************* - static ETL_CONSTEXPR14 void copy(const char* src, int endian_src, char* dst) + static ETL_CONSTEXPR14 void copy(const_pointer src, int endian_src, unsigned char* dst) { if (Endian == endian_src) { @@ -438,26 +442,26 @@ namespace etl template struct unaligned_copy { - static ETL_CONSTEXPR14 void copy(T value, char* store) + static ETL_CONSTEXPR14 void copy(T value, unsigned char* store) { if (Endian == etl::endianness::value()) { - store[0] = static_cast(value); - store[1] = static_cast(value >> (1U * CHAR_BIT)); - store[2] = static_cast(value >> (2U * CHAR_BIT)); - store[3] = static_cast(value >> (3U * CHAR_BIT)); + store[0] = static_cast(value); + store[1] = static_cast(value >> (1U * CHAR_BIT)); + store[2] = static_cast(value >> (2U * CHAR_BIT)); + store[3] = static_cast(value >> (3U * CHAR_BIT)); } else { - store[3] = static_cast(value); - store[2] = static_cast(value >> (1U * CHAR_BIT)); - store[1] = static_cast(value >> (2U * CHAR_BIT)); - store[0] = static_cast(value >> (3U * CHAR_BIT)); + store[3] = static_cast(value); + store[2] = static_cast(value >> (1U * CHAR_BIT)); + store[1] = static_cast(value >> (2U * CHAR_BIT)); + store[0] = static_cast(value >> (3U * CHAR_BIT)); } } //******************************* - static ETL_CONSTEXPR14 void copy(const char* store, T& value) + static ETL_CONSTEXPR14 void copy(const_pointer store, T& value) { if (Endian == etl::endianness::value()) { @@ -476,7 +480,7 @@ namespace etl } //******************************* - static ETL_CONSTEXPR14 void copy(const char* src, int endian_src, char* dst) + static ETL_CONSTEXPR14 void copy(const_pointer src, int endian_src, unsigned char* dst) { if (Endian == endian_src) { @@ -501,34 +505,34 @@ namespace etl template struct unaligned_copy { - static ETL_CONSTEXPR14 void copy(T value, char* store) + static ETL_CONSTEXPR14 void copy(T value, unsigned char* store) { if (Endian == etl::endianness::value()) { - store[0] = static_cast(value); - store[1] = static_cast(value >> (1U * CHAR_BIT)); - store[2] = static_cast(value >> (2U * CHAR_BIT)); - store[3] = static_cast(value >> (3U * CHAR_BIT)); - store[4] = static_cast(value >> (4U * CHAR_BIT)); - store[5] = static_cast(value >> (5U * CHAR_BIT)); - store[6] = static_cast(value >> (6U * CHAR_BIT)); - store[7] = static_cast(value >> (7U * CHAR_BIT)); + store[0] = static_cast(value); + store[1] = static_cast(value >> (1U * CHAR_BIT)); + store[2] = static_cast(value >> (2U * CHAR_BIT)); + store[3] = static_cast(value >> (3U * CHAR_BIT)); + store[4] = static_cast(value >> (4U * CHAR_BIT)); + store[5] = static_cast(value >> (5U * CHAR_BIT)); + store[6] = static_cast(value >> (6U * CHAR_BIT)); + store[7] = static_cast(value >> (7U * CHAR_BIT)); } else { - store[7] = static_cast(value); - store[6] = static_cast(value >> (1U * CHAR_BIT)); - store[5] = static_cast(value >> (2U * CHAR_BIT)); - store[4] = static_cast(value >> (3U * CHAR_BIT)); - store[3] = static_cast(value >> (4U * CHAR_BIT)); - store[2] = static_cast(value >> (5U * CHAR_BIT)); - store[1] = static_cast(value >> (6U * CHAR_BIT)); - store[0] = static_cast(value >> (7U * CHAR_BIT)); + store[7] = static_cast(value); + store[6] = static_cast(value >> (1U * CHAR_BIT)); + store[5] = static_cast(value >> (2U * CHAR_BIT)); + store[4] = static_cast(value >> (3U * CHAR_BIT)); + store[3] = static_cast(value >> (4U * CHAR_BIT)); + store[2] = static_cast(value >> (5U * CHAR_BIT)); + store[1] = static_cast(value >> (6U * CHAR_BIT)); + store[0] = static_cast(value >> (7U * CHAR_BIT)); } } //******************************* - static ETL_CONSTEXPR14 void copy(const char* store, T& value) + static ETL_CONSTEXPR14 void copy(const_pointer store, T& value) { if (Endian == etl::endianness::value()) { @@ -555,7 +559,7 @@ namespace etl } //******************************* - static ETL_CONSTEXPR14 void copy(const char* src, int endian_src, char* dst) + static ETL_CONSTEXPR14 void copy(const_pointer src, int endian_src, unsigned char* dst) { if (Endian == endian_src) {