diff options
| author | bunnei <bunneidev@gmail.com> | 2022-02-22 02:03:42 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2022-02-27 19:34:02 +0100 |
| commit | 06a21ac229ad89daee333408367425e6069bf062 (patch) | |
| tree | 0fe2ae62caa2e38dbd22623f4aa29d8ae5a5e561 | |
| parent | Merge pull request #7955 from bunnei/update-dynarmic (diff) | |
| download | yuzu-06a21ac229ad89daee333408367425e6069bf062.tar yuzu-06a21ac229ad89daee333408367425e6069bf062.tar.gz yuzu-06a21ac229ad89daee333408367425e6069bf062.tar.bz2 yuzu-06a21ac229ad89daee333408367425e6069bf062.tar.lz yuzu-06a21ac229ad89daee333408367425e6069bf062.tar.xz yuzu-06a21ac229ad89daee333408367425e6069bf062.tar.zst yuzu-06a21ac229ad89daee333408367425e6069bf062.zip | |
| -rw-r--r-- | src/core/hle/kernel/k_memory_region_type.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/hle/kernel/k_memory_region_type.h b/src/core/hle/kernel/k_memory_region_type.h index a05e66677..0baeddf51 100644 --- a/src/core/hle/kernel/k_memory_region_type.h +++ b/src/core/hle/kernel/k_memory_region_type.h @@ -14,7 +14,8 @@ namespace Kernel { enum KMemoryRegionType : u32 { - KMemoryRegionAttr_CarveoutProtected = 0x04000000, + KMemoryRegionAttr_CarveoutProtected = 0x02000000, + KMemoryRegionAttr_Uncached = 0x04000000, KMemoryRegionAttr_DidKernelMap = 0x08000000, KMemoryRegionAttr_ShouldKernelMap = 0x10000000, KMemoryRegionAttr_UserReadOnly = 0x20000000, @@ -239,6 +240,11 @@ static_assert(KMemoryRegionType_VirtualDramHeapBase.GetValue() == 0x1A); static_assert(KMemoryRegionType_VirtualDramKernelPtHeap.GetValue() == 0x2A); static_assert(KMemoryRegionType_VirtualDramKernelTraceBuffer.GetValue() == 0x4A); +// UNUSED: .DeriveSparse(2, 2, 0); +constexpr auto KMemoryRegionType_VirtualDramUnknownDebug = + KMemoryRegionType_Dram.DeriveSparse(2, 2, 1); +static_assert(KMemoryRegionType_VirtualDramUnknownDebug.GetValue() == (0x52)); + constexpr auto KMemoryRegionType_VirtualDramKernelInitPt = KMemoryRegionType_VirtualDramHeapBase.Derive(3, 0); constexpr auto KMemoryRegionType_VirtualDramPoolManagement = @@ -330,6 +336,8 @@ constexpr KMemoryRegionType GetTypeForVirtualLinearMapping(u32 type_id) { return KMemoryRegionType_VirtualDramKernelTraceBuffer; } else if (KMemoryRegionType_DramKernelPtHeap.IsAncestorOf(type_id)) { return KMemoryRegionType_VirtualDramKernelPtHeap; + } else if ((type_id | KMemoryRegionAttr_ShouldKernelMap) == type_id) { + return KMemoryRegionType_VirtualDramUnknownDebug; } else { return KMemoryRegionType_Dram; } |