SwitchEmu/dynarmic
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/dynarmic.git synced 2026-03-12 06:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

externals: Update oaknut to 1.1.3

Browse Source 
Merge commit 'cb8abc3ae5a1fcd3d7b6ab73472cdf9093302631'
This commit is contained in:
Merry
2022-11-15 15:37:16 +00:00
parent 068519b2cd cb8abc3ae5
commit dd36a52048
15 changed files with 2220 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
externals/oaknut/include/oaknut/impl/offset.hpp vendored
View File

@@ -64,7 +64,7 @@ private:
std::variant<std::uint32_t, Label*, void*> m_payload;
};
template<std::size_t bitsize>
template<std::size_t bitsize, std::size_t shift_amount>
struct PageOffset {
PageOffset(void* ptr)
: m_payload(ptr)
@@ -76,10 +76,11 @@ struct PageOffset {
static std::uint32_t encode(std::uintptr_t current_addr, std::uintptr_t target)
{
const std::int64_t page_diff = (static_cast<std::int64_t>(target) >> 12) - (static_cast<std::int64_t>(current_addr) >> 12);
if (detail::sign_extend<bitsize>(page_diff) != page_diff)
std::uint64_t diff = (static_cast<std::uint64_t>(target) >> shift_amount) - (static_cast<std::uint64_t>(current_addr) >> shift_amount);
if (detail::sign_extend<bitsize>(diff) != diff)
throw "out of range";
return static_cast<std::uint32_t>(page_diff & detail::mask_from_size(bitsize));
diff &= detail::mask_from_size(bitsize);
return static_cast<std::uint32_t>(((diff & 3) << (bitsize - 2)) | (diff >> 2));
}
private: