Skip to content

Map out CNamePool and several related types #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
googleben wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Map out CNamePool and several related types #177

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
11baf1e
Map out CNamePool and several related types
googleben Jan 24, 2025
a3ff219
Requested changes from https://github.com/wopss/RED4ext.SDK/pull/177
googleben Jan 24, 2025
ac37971
More requested changes from https://github.com/wopss/RED4ext.SDK/pull…
googleben Jan 27, 2025
f1995d1
Fix several warnings
googleben Jan 28, 2025
b980707
Refactor CNamePoolNode and make the API more const
googleben Jan 30, 2025
e72a16a
Add two missing functions
googleben Feb 4, 2025
3fc88d8
Clarify `CNamePoolNodeAllocWrapper::len`'s doc comment and fix stylis…
googleben Apr 3, 2025
9b7d724
Remove a layer of indirection in `CNamePoolHashmap::Iterator`
googleben Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/RED4ext/CName-inl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@

RED4EXT_INLINE const char* RED4ext::CName::ToString() const
{
return CNamePool::Get(*this);
return CNamePool::GetString(*this);
}
164 changes: 159 additions & 5 deletions include/RED4ext/CNamePool-inl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <RED4ext/CNamePool.hpp>
#endif

#include "CNamePool.hpp"
#include <RED4ext/Common.hpp>
#include <RED4ext/Detail/AddressHashes.hpp>
#include <RED4ext/Relocation.hpp>
Expand All @@ -12,7 +13,7 @@ RED4EXT_INLINE RED4ext::CName RED4ext::CNamePool::Add(const char* aText)
{
CName result;

static UniversalRelocFunc<CName* (*)(CName&, const char*)> func(Detail::AddressHashes::CNamePool_AddCstr);
static const UniversalRelocFunc<CName* (*)(CName&, const char*)> func(Detail::AddressHashes::CNamePool_AddCstr);
func(result, aText);
return result;
}
Expand All @@ -21,14 +22,16 @@ RED4EXT_INLINE RED4ext::CName RED4ext::CNamePool::Add(const CString& aText)
{
CName result;

static UniversalRelocFunc<CName* (*)(CName&, const CString&)> func(Detail::AddressHashes::CNamePool_AddCString);
static const UniversalRelocFunc<CName* (*)(CName&, const CString&)> func(
Detail::AddressHashes::CNamePool_AddCString);
func(result, aText);
return result;
}

RED4EXT_INLINE void RED4ext::CNamePool::Add(const CName& aName, const char* aText)
{
static UniversalRelocFunc<uint8_t (*)(const CName&, const char*)> func(Detail::AddressHashes::CNamePool_AddPair);
static const UniversalRelocFunc<uint8_t (*)(const CName&, const char*)> func(
Detail::AddressHashes::CNamePool_AddPair);
func(aName, aText);
}

Expand All @@ -37,9 +40,9 @@ RED4EXT_INLINE void RED4ext::CNamePool::Add(const CName& aName, const CString& a
Add(aName, aText.c_str());
}

RED4EXT_INLINE const char* RED4ext::CNamePool::Get(const CName& aName)
RED4EXT_INLINE const char* RED4ext::CNamePool::GetString(const CName& aName)
{
static UniversalRelocFunc<const char* (*)(const CName&)> func(Detail::AddressHashes::CNamePool_Get);
static const UniversalRelocFunc<const char* (*)(const CName&)> func(Detail::AddressHashes::CNamePool_GetString);
auto result = func(aName);
if (result)
{
Expand All @@ -48,3 +51,154 @@ RED4EXT_INLINE const char* RED4ext::CNamePool::Get(const CName& aName)

return "";
}

RED4EXT_INLINE RED4ext::CNamePool* RED4ext::CNamePool::Get()
{
static const UniversalRelocFunc<CNamePool* (*)()> func(Detail::AddressHashes::CNamePool_Get);
return func();
}

RED4EXT_INLINE const RED4ext::CNamePoolNode* RED4ext::CNamePoolNode::NextInList() const
{
return &CNamePoolAllocator::CNamePoolNodeAllocWrapper::GetWrapper(this)->NextInList()->inner;
}

RED4EXT_INLINE const RED4ext::CNamePoolNode* RED4ext::CNamePoolNode::NextInHashBin() const
{
return next;
}

RED4EXT_INLINE const RED4ext::CNamePoolAllocator::CNamePoolNodeAllocWrapper* RED4ext::CNamePoolAllocator::
CNamePoolNodeAllocWrapper::NextInList() const
{
return std::bit_cast<CNamePoolNodeAllocWrapper*>(std::bit_cast<uintptr_t>(&inner) + len);
}

RED4EXT_INLINE const RED4ext::CNamePoolAllocator::CNamePoolNodeAllocWrapper* RED4ext::CNamePoolAllocator::
CNamePoolNodeAllocWrapper::NextInHashBin() const
{
return GetWrapper(inner.next);
}

RED4EXT_INLINE const RED4ext::CNamePoolAllocator::CNamePoolNodeAllocWrapper& RED4ext::CNamePoolAllocator::
CNamePoolNodeAllocWrapper::GetWrapper(const CNamePoolNode& aNode)
{
return *GetWrapper(&aNode);
}

RED4EXT_INLINE const RED4ext::CNamePoolAllocator::CNamePoolNodeAllocWrapper* RED4ext::CNamePoolAllocator::
CNamePoolNodeAllocWrapper::GetWrapper(const CNamePoolNode* aNode)
{
return std::bit_cast<const CNamePoolNodeAllocWrapper*>(std::bit_cast<uintptr_t>(aNode) -
offsetof(CNamePoolNodeAllocWrapper, inner));
}

RED4EXT_INLINE RED4ext::CNamePoolAllocator::Iterator& RED4ext::CNamePoolAllocator::Iterator::operator++()
{
m_node = m_node->NextInList();
return *this;
}

RED4EXT_INLINE RED4ext::CNamePoolAllocator::Iterator& RED4ext::CNamePoolAllocator::Iterator::operator+(const int aN)
{
if (aN <= 0)
return *this;
for (int i = 0; i < aN; i++)
m_node = m_node->NextInList();
return *this;
}

RED4EXT_INLINE bool RED4ext::CNamePoolAllocator::Iterator::operator==(const Iterator& aRhs) const
{
return m_node == aRhs.m_node;
}

RED4EXT_INLINE bool RED4ext::CNamePoolAllocator::Iterator::operator!=(const Iterator& aRhs) const
{
return m_node != aRhs.m_node;
}

RED4EXT_INLINE RED4ext::CNamePoolAllocator::Iterator::reference RED4ext::CNamePoolAllocator::Iterator::operator*() const
{
return m_node->inner;
}

RED4EXT_INLINE RED4ext::CNamePoolAllocator::Iterator::pointer RED4ext::CNamePoolAllocator::Iterator::operator->() const
{
return &m_node->inner;
}

RED4EXT_INLINE RED4ext::CNamePoolAllocator::Iterator RED4ext::CNamePoolAllocator::Begin() const
{
return Iterator(this);
}

RED4EXT_INLINE RED4ext::CNamePoolAllocator::Iterator RED4ext::CNamePoolAllocator::End() const
{
return Iterator(this, listEnd);
}

RED4EXT_INLINE const RED4ext::CNamePoolNode* const& RED4ext::CNamePoolHashmap::operator[](const uint64_t aKey) const
{
return nodesByHash[aKey & 0x7ffff];
}

RED4EXT_INLINE RED4ext::CNamePoolHashmap::Iterator RED4ext::CNamePoolHashmap::Begin(const CName& aKey) const
{
return Iterator((*this)[aKey]);
}

RED4EXT_INLINE RED4ext::CNamePoolHashmap::Iterator RED4ext::CNamePoolHashmap::Begin(const uint64_t aKey) const
{
return Iterator((*this)[aKey]);
}

RED4EXT_INLINE RED4ext::CNamePoolHashmap::Iterator RED4ext::CNamePoolHashmap::End(const CName&) const
{
return Iterator(nullptr);
}

RED4EXT_INLINE RED4ext::CNamePoolHashmap::Iterator RED4ext::CNamePoolHashmap::End(const uint64_t) const
{
return Iterator(nullptr);
}

RED4EXT_INLINE const RED4ext::CNamePoolNode* const& RED4ext::CNamePoolHashmap::operator[](const CName& aKey) const
{
return nodesByHash[aKey.hash & 0x7ffff];
}

RED4EXT_INLINE RED4ext::CNamePoolHashmap::Iterator& RED4ext::CNamePoolHashmap::Iterator::operator++()
{
m_node = m_node->NextInHashBin();
return *this;
}

RED4EXT_INLINE RED4ext::CNamePoolHashmap::Iterator& RED4ext::CNamePoolHashmap::Iterator::operator+(const int aN)
{
if (aN <= 0)
return *this;
for (int i = 0; i < aN; i++)
m_node = m_node->NextInHashBin();
return *this;
}

RED4EXT_INLINE bool RED4ext::CNamePoolHashmap::Iterator::operator==(const Iterator& aRhs) const
{
return m_node == aRhs.m_node;
}

RED4EXT_INLINE bool RED4ext::CNamePoolHashmap::Iterator::operator!=(const Iterator& aRhs) const
{
return m_node != aRhs.m_node;
}

RED4EXT_INLINE RED4ext::CNamePoolHashmap::Iterator::reference RED4ext::CNamePoolHashmap::Iterator::operator*() const
{
return m_node;
}

RED4EXT_INLINE RED4ext::CNamePoolHashmap::Iterator::reference RED4ext::CNamePoolHashmap::Iterator::operator->() const
{
return m_node;
}
Loading