yuzu-mirror/oaknut
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/oaknut.git synced 2026-01-06 00:19:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

oaknut: Add const qualifier to AddrOffset ctor

Browse source 
Can't seem to tell if this is intentionally non-const, or not, but this
fixes some function-pointer issues I was facing on MacOS.
This commit is contained in:
Wunkolo 2023-09-27 14:26:03 -07:00 committed by merry
parent 4af500cb5b
commit 36243256f3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/oaknut/impl/offset.hpp
View file

@ -45,7 +45,7 @@ struct AddrOffset {
: m_payload(&label) : m_payload(&label)
{} {}
AddrOffset(void* ptr) AddrOffset(const void* ptr)
: m_payload(ptr) : m_payload(ptr)
{} {}
@ -63,7 +63,7 @@ struct AddrOffset {
private: private:
template<typename Policy> template<typename Policy>
friend class BasicCodeGenerator; friend class BasicCodeGenerator;
std::variant<std::uint32_t, Label*, void*> m_payload; std::variant<std::uint32_t, Label*, const void*> m_payload;
}; };
template<std::size_t bitsize, std::size_t shift_amount> template<std::size_t bitsize, std::size_t shift_amount>

2
include/oaknut/oaknut.hpp
View file

@ -249,7 +249,7 @@ private:
label->m_wbs.emplace_back(Label::Writeback{Policy::current_address(), ~splat, static_cast<Label::EmitFunctionType>(encode_fn)}); label->m_wbs.emplace_back(Label::Writeback{Policy::current_address(), ~splat, static_cast<Label::EmitFunctionType>(encode_fn)});
return 0u; return 0u;
}, },
[&](void* p) { [&](const void* p) {
return encode_fn(Policy::current_address(), reinterpret_cast<std::uintptr_t>(p)); return encode_fn(Policy::current_address(), reinterpret_cast<std::uintptr_t>(p));
}, },
}, },