Browse Source
Fix compiler errors
remotes/1785372757367212240/tmp_refs/heads/variable-page-size
Exverge
1 month ago
No known key found for this signature in database
GPG Key ID: DAD399BCC5FB77E4
4 changed files with
8 additions and
8 deletions
-
CMakeLists.txt
-
src/common/CMakeLists.txt
-
src/common/host_memory.h
-
src/core/device_memory.h
|
|
@ -408,7 +408,7 @@ set(BUILD_TESTING OFF) |
|
|
set(ENABLE_TESTING OFF) |
|
|
set(ENABLE_TESTING OFF) |
|
|
|
|
|
|
|
|
# boost |
|
|
# boost |
|
|
set(BOOST_INCLUDE_LIBRARIES algorithm icl pool container heap asio headers process filesystem crc variant) |
|
|
|
|
|
|
|
|
set(BOOST_INCLUDE_LIBRARIES algorithm bimap icl pool container heap asio headers process filesystem crc variant) |
|
|
|
|
|
|
|
|
AddJsonPackage(boost) |
|
|
AddJsonPackage(boost) |
|
|
|
|
|
|
|
|
|
|
|
@ -228,7 +228,7 @@ if(CXX_CLANG) |
|
|
endif() |
|
|
endif() |
|
|
|
|
|
|
|
|
if (BOOST_NO_HEADERS) |
|
|
if (BOOST_NO_HEADERS) |
|
|
target_link_libraries(common PUBLIC Boost::algorithm Boost::heap Boost::icl Boost::pool Boost::bimap) |
|
|
|
|
|
|
|
|
target_link_libraries(common PUBLIC Boost::algorithm Boost::bimap Boost::heap Boost::icl Boost::pool) |
|
|
else() |
|
|
else() |
|
|
target_link_libraries(common PUBLIC Boost::headers) |
|
|
target_link_libraries(common PUBLIC Boost::headers) |
|
|
endif() |
|
|
endif() |
|
|
|
|
|
@ -98,14 +98,14 @@ public: |
|
|
|
|
|
|
|
|
struct MisalignedMapping : by_vaddr { |
|
|
struct MisalignedMapping : by_vaddr { |
|
|
|
|
|
|
|
|
MisalignedMapping(u64 vaddr, u64 paddr, u64 size) : vaddr(vaddr >> Core::Memory::YUZU_PAGEBITS), |
|
|
|
|
|
size(size >> Core::Memory::YUZU_PAGEBITS), |
|
|
|
|
|
real_paddr(paddr >> Core::Memory::YUZU_PAGEBITS) {} |
|
|
|
|
|
VAddr vaddr; |
|
|
|
|
|
|
|
|
MisalignedMapping(u64 vaddr_, u64 paddr_, u64 size_) : vaddr(vaddr_ >> Core::Memory::YUZU_PAGEBITS), |
|
|
|
|
|
size(size_ >> Core::Memory::YUZU_PAGEBITS), |
|
|
|
|
|
real_paddr(paddr_ >> Core::Memory::YUZU_PAGEBITS) {} |
|
|
|
|
|
u64 vaddr; |
|
|
u64 size; |
|
|
u64 size; |
|
|
|
|
|
|
|
|
// Real backing memory linked to this mapping |
|
|
// Real backing memory linked to this mapping |
|
|
PAddr real_paddr; |
|
|
|
|
|
|
|
|
u64 real_paddr; |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
const MisalignedMapping* GetUnalignedMappingFromVirtual(VAddr offset) const; |
|
|
const MisalignedMapping* GetUnalignedMappingFromVirtual(VAddr offset) const; |
|
|
|
|
|
@ -1,5 +1,5 @@ |
|
|
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project |
|
|
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project |
|
|
// SPDX-License-Identifier: GPL-2.0-or-later |
|
|
|
|
|
|
|
|
// SPDX-License-Identifier: GPL-3.0-or-later |
|
|
|
|
|
|
|
|
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project |
|
|
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project |
|
|
// SPDX-License-Identifier: GPL-2.0-or-later |
|
|
// SPDX-License-Identifier: GPL-2.0-or-later |
|
|
|