feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

RamString: use a bitfield to reduce size

Browse Source
This commit is contained in:
Benoit Blanchon
2024-11-25 11:16:22 +01:00
parent 019e8326b7
commit a256ec7fff
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ArduinoJson/Strings/Adapters/RamString.hpp
View File

@ -20,9 +20,16 @@ struct IsChar
class RamString { class RamString {
public: public:
static const size_t typeSortKey = 2; static const size_t typeSortKey = 2;
#if ARDUINOJSON_SIZEOF_POINTER <= 2
static constexpr size_t sizeMask = size_t(-1) >> 1;
#else
static constexpr size_t sizeMask = size_t(-1);
#endif
RamString(const char* str, size_t sz, bool linked = false) RamString(const char* str, size_t sz, bool linked = false)
: str_(str), size_(sz), linked_(linked) {} : str_(str), size_(sz & sizeMask), linked_(linked) {
ARDUINOJSON_ASSERT(size_ == sz);
}
bool isNull() const { bool isNull() const {
return !str_; return !str_;
@ -48,8 +55,15 @@ class RamString {
protected: protected:
const char* str_; const char* str_;
#if ARDUINOJSON_SIZEOF_POINTER <= 2
// Use a bitfield only on 8-bit microcontrollers
size_t size_ : sizeof(size_t) * 8 - 1;
bool linked_ : 1;
#else
size_t size_; size_t size_;
bool linked_; // TODO: merge with size_ bool linked_;
#endif
}; };
template <typename TChar> template <typename TChar>