OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-12-25 06:50:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6358 from Morph1984/k_map_region

Browse Source 
kernel: process_capability: Add MapRegion capability
This commit is contained in:
Mai M 2021-05-25 03:26:22 -04:00 committed by GitHub
commit b6b73d9a5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/hle/kernel/process_capability.cpp
View File

@ -22,6 +22,7 @@ enum : u32 {
CapabilityOffset_Syscall = 4, CapabilityOffset_Syscall = 4,
CapabilityOffset_MapPhysical = 6, CapabilityOffset_MapPhysical = 6,
CapabilityOffset_MapIO = 7, CapabilityOffset_MapIO = 7,
CapabilityOffset_MapRegion = 10,
CapabilityOffset_Interrupt = 11, CapabilityOffset_Interrupt = 11,
CapabilityOffset_ProgramType = 13, CapabilityOffset_ProgramType = 13,
CapabilityOffset_KernelVersion = 14, CapabilityOffset_KernelVersion = 14,
@ -46,6 +47,7 @@ enum class CapabilityType : u32 {
Syscall = (1U << CapabilityOffset_Syscall) - 1, Syscall = (1U << CapabilityOffset_Syscall) - 1,
MapPhysical = (1U << CapabilityOffset_MapPhysical) - 1, MapPhysical = (1U << CapabilityOffset_MapPhysical) - 1,
MapIO = (1U << CapabilityOffset_MapIO) - 1, MapIO = (1U << CapabilityOffset_MapIO) - 1,
MapRegion = (1U << CapabilityOffset_MapRegion) - 1,
Interrupt = (1U << CapabilityOffset_Interrupt) - 1, Interrupt = (1U << CapabilityOffset_Interrupt) - 1,
ProgramType = (1U << CapabilityOffset_ProgramType) - 1, ProgramType = (1U << CapabilityOffset_ProgramType) - 1,
KernelVersion = (1U << CapabilityOffset_KernelVersion) - 1, KernelVersion = (1U << CapabilityOffset_KernelVersion) - 1,
@ -187,6 +189,8 @@ ResultCode ProcessCapabilities::ParseSingleFlagCapability(u32& set_flags, u32& s
return HandleSyscallFlags(set_svc_bits, flag); return HandleSyscallFlags(set_svc_bits, flag);
case CapabilityType::MapIO: case CapabilityType::MapIO:
return HandleMapIOFlags(flag, page_table); return HandleMapIOFlags(flag, page_table);
case CapabilityType::MapRegion:
return HandleMapRegionFlags(flag, page_table);
case CapabilityType::Interrupt: case CapabilityType::Interrupt:
return HandleInterruptFlags(flag); return HandleInterruptFlags(flag);
case CapabilityType::ProgramType: case CapabilityType::ProgramType:
@ -298,6 +302,11 @@ ResultCode ProcessCapabilities::HandleMapIOFlags(u32 flags, KPageTable& page_tab
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
ResultCode ProcessCapabilities::HandleMapRegionFlags(u32 flags, KPageTable& page_table) {
// TODO(Lioncache): Implement once the memory manager can handle this.
return RESULT_SUCCESS;
}
ResultCode ProcessCapabilities::HandleInterruptFlags(u32 flags) { ResultCode ProcessCapabilities::HandleInterruptFlags(u32 flags) {
constexpr u32 interrupt_ignore_value = 0x3FF; constexpr u32 interrupt_ignore_value = 0x3FF;
const u32 interrupt0 = (flags >> 12) & 0x3FF; const u32 interrupt0 = (flags >> 12) & 0x3FF;

3
src/core/hle/kernel/process_capability.h
View File

@ -231,6 +231,9 @@ private:
/// Handles flags related to mapping IO pages. /// Handles flags related to mapping IO pages.
ResultCode HandleMapIOFlags(u32 flags, KPageTable& page_table); ResultCode HandleMapIOFlags(u32 flags, KPageTable& page_table);
/// Handles flags related to mapping physical memory regions.
ResultCode HandleMapRegionFlags(u32 flags, KPageTable& page_table);
/// Handles flags related to the interrupt capability flags. /// Handles flags related to the interrupt capability flags.
ResultCode HandleInterruptFlags(u32 flags); ResultCode HandleInterruptFlags(u32 flags);