early-access version 2466
This commit is contained in:
parent
09a56f2db3
commit
6bc534153c
7 changed files with 69 additions and 38 deletions
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 2465.
|
This is the source code for early-access 2466.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -209,6 +209,8 @@ enum class ButtonNames {
|
||||||
Triangle,
|
Triangle,
|
||||||
Share,
|
Share,
|
||||||
Options,
|
Options,
|
||||||
|
Home,
|
||||||
|
Touch,
|
||||||
|
|
||||||
// Mouse buttons
|
// Mouse buttons
|
||||||
ButtonMouseWheel,
|
ButtonMouseWheel,
|
||||||
|
|
|
@ -61,7 +61,8 @@ constexpr std::size_t GetSizeInRange(const KMemoryInfo& info, VAddr start, VAddr
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
KPageTable::KPageTable(Core::System& system_) : system{system_} {}
|
KPageTable::KPageTable(Core::System& system_)
|
||||||
|
: general_lock{system_.Kernel()}, map_physical_memory_lock{system_.Kernel()}, system{system_} {}
|
||||||
|
|
||||||
ResultCode KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type,
|
ResultCode KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type,
|
||||||
bool enable_aslr, VAddr code_addr,
|
bool enable_aslr, VAddr code_addr,
|
||||||
|
@ -282,7 +283,7 @@ ResultCode KPageTable::MapProcessCode(VAddr addr, std::size_t num_pages, KMemory
|
||||||
R_UNLESS(this->CanContain(addr, size, state), ResultInvalidCurrentMemory);
|
R_UNLESS(this->CanContain(addr, size, state), ResultInvalidCurrentMemory);
|
||||||
|
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
// Verify that the destination memory is unmapped.
|
// Verify that the destination memory is unmapped.
|
||||||
R_TRY(this->CheckMemoryState(addr, size, KMemoryState::All, KMemoryState::Free,
|
R_TRY(this->CheckMemoryState(addr, size, KMemoryState::All, KMemoryState::Free,
|
||||||
|
@ -300,7 +301,7 @@ ResultCode KPageTable::MapProcessCode(VAddr addr, std::size_t num_pages, KMemory
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::MapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
ResultCode KPageTable::MapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
const std::size_t num_pages{size / PageSize};
|
const std::size_t num_pages{size / PageSize};
|
||||||
|
|
||||||
|
@ -337,7 +338,7 @@ ResultCode KPageTable::MapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::UnmapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
ResultCode KPageTable::UnmapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
if (!size) {
|
if (!size) {
|
||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
|
@ -371,7 +372,7 @@ ResultCode KPageTable::UnmapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size
|
||||||
|
|
||||||
ResultCode KPageTable::UnmapProcessMemory(VAddr dst_addr, std::size_t size,
|
ResultCode KPageTable::UnmapProcessMemory(VAddr dst_addr, std::size_t size,
|
||||||
KPageTable& src_page_table, VAddr src_addr) {
|
KPageTable& src_page_table, VAddr src_addr) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
const std::size_t num_pages{size / PageSize};
|
const std::size_t num_pages{size / PageSize};
|
||||||
|
|
||||||
|
@ -399,10 +400,10 @@ ResultCode KPageTable::UnmapProcessMemory(VAddr dst_addr, std::size_t size,
|
||||||
|
|
||||||
ResultCode KPageTable::MapPhysicalMemory(VAddr addr, std::size_t size) {
|
ResultCode KPageTable::MapPhysicalMemory(VAddr addr, std::size_t size) {
|
||||||
// Lock the physical memory lock.
|
// Lock the physical memory lock.
|
||||||
std::lock_guard phys_lk(map_physical_memory_lock);
|
KScopedLightLock map_phys_mem_lk(map_physical_memory_lock);
|
||||||
|
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
std::size_t mapped_size{};
|
std::size_t mapped_size{};
|
||||||
const VAddr end_addr{addr + size};
|
const VAddr end_addr{addr + size};
|
||||||
|
@ -478,7 +479,11 @@ ResultCode KPageTable::MapPhysicalMemory(VAddr addr, std::size_t size) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::UnmapPhysicalMemory(VAddr addr, std::size_t size) {
|
ResultCode KPageTable::UnmapPhysicalMemory(VAddr addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
// Lock the physical memory lock.
|
||||||
|
KScopedLightLock map_phys_mem_lk(map_physical_memory_lock);
|
||||||
|
|
||||||
|
// Lock the table.
|
||||||
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
const VAddr end_addr{addr + size};
|
const VAddr end_addr{addr + size};
|
||||||
ResultCode result{ResultSuccess};
|
ResultCode result{ResultSuccess};
|
||||||
|
@ -540,7 +545,7 @@ ResultCode KPageTable::UnmapPhysicalMemory(VAddr addr, std::size_t size) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::MapMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
ResultCode KPageTable::MapMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
KMemoryState src_state{};
|
KMemoryState src_state{};
|
||||||
CASCADE_CODE(CheckMemoryState(
|
CASCADE_CODE(CheckMemoryState(
|
||||||
|
@ -579,7 +584,7 @@ ResultCode KPageTable::MapMemory(VAddr dst_addr, VAddr src_addr, std::size_t siz
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::UnmapMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
ResultCode KPageTable::UnmapMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
KMemoryState src_state{};
|
KMemoryState src_state{};
|
||||||
CASCADE_CODE(CheckMemoryState(
|
CASCADE_CODE(CheckMemoryState(
|
||||||
|
@ -622,6 +627,8 @@ ResultCode KPageTable::UnmapMemory(VAddr dst_addr, VAddr src_addr, std::size_t s
|
||||||
|
|
||||||
ResultCode KPageTable::MapPages(VAddr addr, const KPageLinkedList& page_linked_list,
|
ResultCode KPageTable::MapPages(VAddr addr, const KPageLinkedList& page_linked_list,
|
||||||
KMemoryPermission perm) {
|
KMemoryPermission perm) {
|
||||||
|
ASSERT(this->IsLockedByCurrentThread());
|
||||||
|
|
||||||
VAddr cur_addr{addr};
|
VAddr cur_addr{addr};
|
||||||
|
|
||||||
for (const auto& node : page_linked_list.Nodes()) {
|
for (const auto& node : page_linked_list.Nodes()) {
|
||||||
|
@ -650,7 +657,7 @@ ResultCode KPageTable::MapPages(VAddr address, KPageLinkedList& page_linked_list
|
||||||
R_UNLESS(this->CanContain(address, size, state), ResultInvalidCurrentMemory);
|
R_UNLESS(this->CanContain(address, size, state), ResultInvalidCurrentMemory);
|
||||||
|
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
// Check the memory state.
|
// Check the memory state.
|
||||||
R_TRY(this->CheckMemoryState(address, size, KMemoryState::All, KMemoryState::Free,
|
R_TRY(this->CheckMemoryState(address, size, KMemoryState::All, KMemoryState::Free,
|
||||||
|
@ -667,6 +674,8 @@ ResultCode KPageTable::MapPages(VAddr address, KPageLinkedList& page_linked_list
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::UnmapPages(VAddr addr, const KPageLinkedList& page_linked_list) {
|
ResultCode KPageTable::UnmapPages(VAddr addr, const KPageLinkedList& page_linked_list) {
|
||||||
|
ASSERT(this->IsLockedByCurrentThread());
|
||||||
|
|
||||||
VAddr cur_addr{addr};
|
VAddr cur_addr{addr};
|
||||||
|
|
||||||
for (const auto& node : page_linked_list.Nodes()) {
|
for (const auto& node : page_linked_list.Nodes()) {
|
||||||
|
@ -691,7 +700,7 @@ ResultCode KPageTable::UnmapPages(VAddr addr, KPageLinkedList& page_linked_list,
|
||||||
R_UNLESS(this->Contains(addr, size), ResultInvalidCurrentMemory);
|
R_UNLESS(this->Contains(addr, size), ResultInvalidCurrentMemory);
|
||||||
|
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
// Check the memory state.
|
// Check the memory state.
|
||||||
R_TRY(this->CheckMemoryState(addr, size, KMemoryState::All, state, KMemoryPermission::None,
|
R_TRY(this->CheckMemoryState(addr, size, KMemoryState::All, state, KMemoryPermission::None,
|
||||||
|
@ -712,7 +721,7 @@ ResultCode KPageTable::SetProcessMemoryPermission(VAddr addr, std::size_t size,
|
||||||
const size_t num_pages = size / PageSize;
|
const size_t num_pages = size / PageSize;
|
||||||
|
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
// Verify we can change the memory permission.
|
// Verify we can change the memory permission.
|
||||||
KMemoryState old_state;
|
KMemoryState old_state;
|
||||||
|
@ -766,7 +775,7 @@ ResultCode KPageTable::SetProcessMemoryPermission(VAddr addr, std::size_t size,
|
||||||
}
|
}
|
||||||
|
|
||||||
KMemoryInfo KPageTable::QueryInfoImpl(VAddr addr) {
|
KMemoryInfo KPageTable::QueryInfoImpl(VAddr addr) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
return block_manager->FindBlock(addr).GetMemoryInfo();
|
return block_manager->FindBlock(addr).GetMemoryInfo();
|
||||||
}
|
}
|
||||||
|
@ -781,7 +790,7 @@ KMemoryInfo KPageTable::QueryInfo(VAddr addr) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::ReserveTransferMemory(VAddr addr, std::size_t size, KMemoryPermission perm) {
|
ResultCode KPageTable::ReserveTransferMemory(VAddr addr, std::size_t size, KMemoryPermission perm) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
KMemoryState state{};
|
KMemoryState state{};
|
||||||
KMemoryAttribute attribute{};
|
KMemoryAttribute attribute{};
|
||||||
|
@ -799,7 +808,7 @@ ResultCode KPageTable::ReserveTransferMemory(VAddr addr, std::size_t size, KMemo
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::ResetTransferMemory(VAddr addr, std::size_t size) {
|
ResultCode KPageTable::ResetTransferMemory(VAddr addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
KMemoryState state{};
|
KMemoryState state{};
|
||||||
|
|
||||||
|
@ -818,7 +827,7 @@ ResultCode KPageTable::SetMemoryPermission(VAddr addr, std::size_t size,
|
||||||
const size_t num_pages = size / PageSize;
|
const size_t num_pages = size / PageSize;
|
||||||
|
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
// Verify we can change the memory permission.
|
// Verify we can change the memory permission.
|
||||||
KMemoryState old_state;
|
KMemoryState old_state;
|
||||||
|
@ -847,7 +856,7 @@ ResultCode KPageTable::SetMemoryAttribute(VAddr addr, std::size_t size, u32 mask
|
||||||
KMemoryAttribute::SetMask);
|
KMemoryAttribute::SetMask);
|
||||||
|
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
// Verify we can change the memory attribute.
|
// Verify we can change the memory attribute.
|
||||||
KMemoryState old_state;
|
KMemoryState old_state;
|
||||||
|
@ -878,7 +887,7 @@ ResultCode KPageTable::SetMemoryAttribute(VAddr addr, std::size_t size, u32 mask
|
||||||
|
|
||||||
ResultCode KPageTable::SetMaxHeapSize(std::size_t size) {
|
ResultCode KPageTable::SetMaxHeapSize(std::size_t size) {
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
// Only process page tables are allowed to set heap size.
|
// Only process page tables are allowed to set heap size.
|
||||||
ASSERT(!this->IsKernel());
|
ASSERT(!this->IsKernel());
|
||||||
|
@ -889,15 +898,15 @@ ResultCode KPageTable::SetMaxHeapSize(std::size_t size) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::SetHeapSize(VAddr* out, std::size_t size) {
|
ResultCode KPageTable::SetHeapSize(VAddr* out, std::size_t size) {
|
||||||
// Lock the physical memory lock.
|
// Lock the physical memory mutex.
|
||||||
std::lock_guard phys_lk(map_physical_memory_lock);
|
KScopedLightLock map_phys_mem_lk(map_physical_memory_lock);
|
||||||
|
|
||||||
// Try to perform a reduction in heap, instead of an extension.
|
// Try to perform a reduction in heap, instead of an extension.
|
||||||
VAddr cur_address{};
|
VAddr cur_address{};
|
||||||
std::size_t allocation_size{};
|
std::size_t allocation_size{};
|
||||||
{
|
{
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lk(page_table_lock);
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
// Validate that setting heap size is possible at all.
|
// Validate that setting heap size is possible at all.
|
||||||
R_UNLESS(!is_kernel, ResultOutOfMemory);
|
R_UNLESS(!is_kernel, ResultOutOfMemory);
|
||||||
|
@ -962,7 +971,7 @@ ResultCode KPageTable::SetHeapSize(VAddr* out, std::size_t size) {
|
||||||
// Map the pages.
|
// Map the pages.
|
||||||
{
|
{
|
||||||
// Lock the table.
|
// Lock the table.
|
||||||
std::lock_guard lk(page_table_lock);
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
// Ensure that the heap hasn't changed since we began executing.
|
// Ensure that the heap hasn't changed since we began executing.
|
||||||
ASSERT(cur_address == current_heap_end);
|
ASSERT(cur_address == current_heap_end);
|
||||||
|
@ -1004,7 +1013,7 @@ ResultVal<VAddr> KPageTable::AllocateAndMapMemory(std::size_t needed_num_pages,
|
||||||
bool is_map_only, VAddr region_start,
|
bool is_map_only, VAddr region_start,
|
||||||
std::size_t region_num_pages, KMemoryState state,
|
std::size_t region_num_pages, KMemoryState state,
|
||||||
KMemoryPermission perm, PAddr map_addr) {
|
KMemoryPermission perm, PAddr map_addr) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
if (!CanContain(region_start, region_num_pages * PageSize, state)) {
|
if (!CanContain(region_start, region_num_pages * PageSize, state)) {
|
||||||
return ResultInvalidCurrentMemory;
|
return ResultInvalidCurrentMemory;
|
||||||
|
@ -1035,7 +1044,7 @@ ResultVal<VAddr> KPageTable::AllocateAndMapMemory(std::size_t needed_num_pages,
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::LockForDeviceAddressSpace(VAddr addr, std::size_t size) {
|
ResultCode KPageTable::LockForDeviceAddressSpace(VAddr addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
KMemoryPermission perm{};
|
KMemoryPermission perm{};
|
||||||
if (const ResultCode result{CheckMemoryState(
|
if (const ResultCode result{CheckMemoryState(
|
||||||
|
@ -1058,7 +1067,7 @@ ResultCode KPageTable::LockForDeviceAddressSpace(VAddr addr, std::size_t size) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::UnlockForDeviceAddressSpace(VAddr addr, std::size_t size) {
|
ResultCode KPageTable::UnlockForDeviceAddressSpace(VAddr addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
KMemoryPermission perm{};
|
KMemoryPermission perm{};
|
||||||
if (const ResultCode result{CheckMemoryState(
|
if (const ResultCode result{CheckMemoryState(
|
||||||
|
@ -1081,7 +1090,7 @@ ResultCode KPageTable::UnlockForDeviceAddressSpace(VAddr addr, std::size_t size)
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::LockForCodeMemory(VAddr addr, std::size_t size) {
|
ResultCode KPageTable::LockForCodeMemory(VAddr addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
KMemoryPermission new_perm = KMemoryPermission::NotMapped | KMemoryPermission::KernelReadWrite;
|
KMemoryPermission new_perm = KMemoryPermission::NotMapped | KMemoryPermission::KernelReadWrite;
|
||||||
|
|
||||||
|
@ -1108,7 +1117,7 @@ ResultCode KPageTable::LockForCodeMemory(VAddr addr, std::size_t size) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KPageTable::UnlockForCodeMemory(VAddr addr, std::size_t size) {
|
ResultCode KPageTable::UnlockForCodeMemory(VAddr addr, std::size_t size) {
|
||||||
std::lock_guard lock{page_table_lock};
|
KScopedLightLock lk(general_lock);
|
||||||
|
|
||||||
KMemoryPermission new_perm = KMemoryPermission::UserReadWrite;
|
KMemoryPermission new_perm = KMemoryPermission::UserReadWrite;
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <mutex>
|
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/page_table.h"
|
#include "common/page_table.h"
|
||||||
#include "core/file_sys/program_metadata.h"
|
#include "core/file_sys/program_metadata.h"
|
||||||
|
#include "core/hle/kernel/k_light_lock.h"
|
||||||
#include "core/hle/kernel/k_memory_block.h"
|
#include "core/hle/kernel/k_memory_block.h"
|
||||||
#include "core/hle/kernel/k_memory_manager.h"
|
#include "core/hle/kernel/k_memory_manager.h"
|
||||||
#include "core/hle/result.h"
|
#include "core/hle/result.h"
|
||||||
|
@ -142,11 +142,12 @@ private:
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsLockedByCurrentThread() const {
|
bool IsLockedByCurrentThread() const {
|
||||||
return true;
|
return general_lock.IsLockedByCurrentThread();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::recursive_mutex page_table_lock;
|
mutable KLightLock general_lock;
|
||||||
std::mutex map_physical_memory_lock;
|
mutable KLightLock map_physical_memory_lock;
|
||||||
|
|
||||||
std::unique_ptr<KMemoryBlockManager> block_manager;
|
std::unique_ptr<KMemoryBlockManager> block_manager;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -205,7 +206,7 @@ public:
|
||||||
return alias_code_region_end - alias_code_region_start;
|
return alias_code_region_end - alias_code_region_start;
|
||||||
}
|
}
|
||||||
size_t GetNormalMemorySize() {
|
size_t GetNormalMemorySize() {
|
||||||
std::lock_guard lk(page_table_lock);
|
KScopedLightLock lk(general_lock);
|
||||||
return GetHeapSize() + mapped_physical_memory_size;
|
return GetHeapSize() + mapped_physical_memory_size;
|
||||||
}
|
}
|
||||||
constexpr std::size_t GetAddressSpaceWidth() const {
|
constexpr std::size_t GetAddressSpaceWidth() const {
|
||||||
|
@ -247,7 +248,9 @@ public:
|
||||||
constexpr bool IsInsideASLRRegion(VAddr address, std::size_t size) const {
|
constexpr bool IsInsideASLRRegion(VAddr address, std::size_t size) const {
|
||||||
return !IsOutsideASLRRegion(address, size);
|
return !IsOutsideASLRRegion(address, size);
|
||||||
}
|
}
|
||||||
constexpr PAddr GetPhysicalAddr(VAddr addr) {
|
|
||||||
|
PAddr GetPhysicalAddr(VAddr addr) {
|
||||||
|
ASSERT(IsLockedByCurrentThread());
|
||||||
const auto backing_addr = page_table_impl.backing_addr[addr >> PageBits];
|
const auto backing_addr = page_table_impl.backing_addr[addr >> PageBits];
|
||||||
ASSERT(backing_addr);
|
ASSERT(backing_addr);
|
||||||
return backing_addr + addr;
|
return backing_addr + addr;
|
||||||
|
|
|
@ -271,7 +271,7 @@ void UDPClient::OnPadData(Response::PadData data, std::size_t client) {
|
||||||
const auto touch_axis_y_id =
|
const auto touch_axis_y_id =
|
||||||
static_cast<int>(id == 0 ? PadAxes::Touch1Y : PadAxes::Touch2Y);
|
static_cast<int>(id == 0 ? PadAxes::Touch1Y : PadAxes::Touch2Y);
|
||||||
const auto touch_button_id =
|
const auto touch_button_id =
|
||||||
static_cast<int>(id == 0 ? PadButton::Touch1 : PadButton::touch2);
|
static_cast<int>(id == 0 ? PadButton::Touch1 : PadButton::Touch2);
|
||||||
|
|
||||||
// TODO: Use custom calibration per device
|
// TODO: Use custom calibration per device
|
||||||
const Common::ParamPackage touch_param(Settings::values.touch_device.GetValue());
|
const Common::ParamPackage touch_param(Settings::values.touch_device.GetValue());
|
||||||
|
@ -319,6 +319,9 @@ void UDPClient::OnPadData(Response::PadData data, std::size_t client) {
|
||||||
SetButton(identifier, button, button_status);
|
SetButton(identifier, button, button_status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetButton(identifier, static_cast<int>(PadButton::Home), data.home != 0);
|
||||||
|
SetButton(identifier, static_cast<int>(PadButton::TouchHardPress), data.touch_hard_press != 0);
|
||||||
|
|
||||||
SetBattery(identifier, GetBatteryLevel(data.info.battery));
|
SetBattery(identifier, GetBatteryLevel(data.info.battery));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -393,7 +396,7 @@ std::vector<Common::ParamPackage> UDPClient::GetInputDevices() const {
|
||||||
|
|
||||||
ButtonMapping UDPClient::GetButtonMappingForDevice(const Common::ParamPackage& params) {
|
ButtonMapping UDPClient::GetButtonMappingForDevice(const Common::ParamPackage& params) {
|
||||||
// This list excludes any button that can't be really mapped
|
// This list excludes any button that can't be really mapped
|
||||||
static constexpr std::array<std::pair<Settings::NativeButton::Values, PadButton>, 18>
|
static constexpr std::array<std::pair<Settings::NativeButton::Values, PadButton>, 20>
|
||||||
switch_to_dsu_button = {
|
switch_to_dsu_button = {
|
||||||
std::pair{Settings::NativeButton::A, PadButton::Circle},
|
std::pair{Settings::NativeButton::A, PadButton::Circle},
|
||||||
{Settings::NativeButton::B, PadButton::Cross},
|
{Settings::NativeButton::B, PadButton::Cross},
|
||||||
|
@ -413,6 +416,8 @@ ButtonMapping UDPClient::GetButtonMappingForDevice(const Common::ParamPackage& p
|
||||||
{Settings::NativeButton::SR, PadButton::R2},
|
{Settings::NativeButton::SR, PadButton::R2},
|
||||||
{Settings::NativeButton::LStick, PadButton::L3},
|
{Settings::NativeButton::LStick, PadButton::L3},
|
||||||
{Settings::NativeButton::RStick, PadButton::R3},
|
{Settings::NativeButton::RStick, PadButton::R3},
|
||||||
|
{Settings::NativeButton::Home, PadButton::Home},
|
||||||
|
{Settings::NativeButton::Screenshot, PadButton::TouchHardPress},
|
||||||
};
|
};
|
||||||
if (!params.Has("guid") || !params.Has("port") || !params.Has("pad")) {
|
if (!params.Has("guid") || !params.Has("port") || !params.Has("pad")) {
|
||||||
return {};
|
return {};
|
||||||
|
@ -517,6 +522,12 @@ Common::Input::ButtonNames UDPClient::GetUIButtonName(const Common::ParamPackage
|
||||||
return Common::Input::ButtonNames::Share;
|
return Common::Input::ButtonNames::Share;
|
||||||
case PadButton::Options:
|
case PadButton::Options:
|
||||||
return Common::Input::ButtonNames::Options;
|
return Common::Input::ButtonNames::Options;
|
||||||
|
case PadButton::Home:
|
||||||
|
return Common::Input::ButtonNames::Home;
|
||||||
|
case PadButton::Touch1:
|
||||||
|
case PadButton::Touch2:
|
||||||
|
case PadButton::TouchHardPress:
|
||||||
|
return Common::Input::ButtonNames::Touch;
|
||||||
default:
|
default:
|
||||||
return Common::Input::ButtonNames::Undefined;
|
return Common::Input::ButtonNames::Undefined;
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,7 +84,9 @@ private:
|
||||||
Cross = 0x4000,
|
Cross = 0x4000,
|
||||||
Square = 0x8000,
|
Square = 0x8000,
|
||||||
Touch1 = 0x10000,
|
Touch1 = 0x10000,
|
||||||
touch2 = 0x20000,
|
Touch2 = 0x20000,
|
||||||
|
Home = 0x40000,
|
||||||
|
TouchHardPress = 0x80000,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class PadAxes : u8 {
|
enum class PadAxes : u8 {
|
||||||
|
|
|
@ -102,6 +102,10 @@ QString GetButtonName(Common::Input::ButtonNames button_name) {
|
||||||
return QObject::tr("Share");
|
return QObject::tr("Share");
|
||||||
case Common::Input::ButtonNames::Options:
|
case Common::Input::ButtonNames::Options:
|
||||||
return QObject::tr("Options");
|
return QObject::tr("Options");
|
||||||
|
case Common::Input::ButtonNames::Home:
|
||||||
|
return QObject::tr("Home");
|
||||||
|
case Common::Input::ButtonNames::Touch:
|
||||||
|
return QObject::tr("Touch");
|
||||||
case Common::Input::ButtonNames::ButtonMouseWheel:
|
case Common::Input::ButtonNames::ButtonMouseWheel:
|
||||||
return QObject::tr("Wheel", "Indicates the mouse wheel");
|
return QObject::tr("Wheel", "Indicates the mouse wheel");
|
||||||
case Common::Input::ButtonNames::ButtonBackward:
|
case Common::Input::ButtonNames::ButtonBackward:
|
||||||
|
|
Loading…
Reference in a new issue