diff options
| author | 2022-02-21 17:03:42 -0800 | |
|---|---|---|
| committer | 2022-02-27 10:34:02 -0800 | |
| commit | 06a21ac229ad89daee333408367425e6069bf062 (patch) | |
| tree | 0fe2ae62caa2e38dbd22623f4aa29d8ae5a5e561 /src | |
| parent | Merge pull request #7955 from bunnei/update-dynarmic (diff) | |
| download | yuzu-06a21ac229ad89daee333408367425e6069bf062.tar.gz yuzu-06a21ac229ad89daee333408367425e6069bf062.tar.xz yuzu-06a21ac229ad89daee333408367425e6069bf062.zip | |
hle: kernel: k_memory_region_types: Update for new regions.
Diffstat (limited to 'src')
| -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 @@ | |||
| 14 | namespace Kernel { | 14 | namespace Kernel { |
| 15 | 15 | ||
| 16 | enum KMemoryRegionType : u32 { | 16 | enum KMemoryRegionType : u32 { |
| 17 | KMemoryRegionAttr_CarveoutProtected = 0x04000000, | 17 | KMemoryRegionAttr_CarveoutProtected = 0x02000000, |
| 18 | KMemoryRegionAttr_Uncached = 0x04000000, | ||
| 18 | KMemoryRegionAttr_DidKernelMap = 0x08000000, | 19 | KMemoryRegionAttr_DidKernelMap = 0x08000000, |
| 19 | KMemoryRegionAttr_ShouldKernelMap = 0x10000000, | 20 | KMemoryRegionAttr_ShouldKernelMap = 0x10000000, |
| 20 | KMemoryRegionAttr_UserReadOnly = 0x20000000, | 21 | KMemoryRegionAttr_UserReadOnly = 0x20000000, |
| @@ -239,6 +240,11 @@ static_assert(KMemoryRegionType_VirtualDramHeapBase.GetValue() == 0x1A); | |||
| 239 | static_assert(KMemoryRegionType_VirtualDramKernelPtHeap.GetValue() == 0x2A); | 240 | static_assert(KMemoryRegionType_VirtualDramKernelPtHeap.GetValue() == 0x2A); |
| 240 | static_assert(KMemoryRegionType_VirtualDramKernelTraceBuffer.GetValue() == 0x4A); | 241 | static_assert(KMemoryRegionType_VirtualDramKernelTraceBuffer.GetValue() == 0x4A); |
| 241 | 242 | ||
| 243 | // UNUSED: .DeriveSparse(2, 2, 0); | ||
| 244 | constexpr auto KMemoryRegionType_VirtualDramUnknownDebug = | ||
| 245 | KMemoryRegionType_Dram.DeriveSparse(2, 2, 1); | ||
| 246 | static_assert(KMemoryRegionType_VirtualDramUnknownDebug.GetValue() == (0x52)); | ||
| 247 | |||
| 242 | constexpr auto KMemoryRegionType_VirtualDramKernelInitPt = | 248 | constexpr auto KMemoryRegionType_VirtualDramKernelInitPt = |
| 243 | KMemoryRegionType_VirtualDramHeapBase.Derive(3, 0); | 249 | KMemoryRegionType_VirtualDramHeapBase.Derive(3, 0); |
| 244 | constexpr auto KMemoryRegionType_VirtualDramPoolManagement = | 250 | constexpr auto KMemoryRegionType_VirtualDramPoolManagement = |
| @@ -330,6 +336,8 @@ constexpr KMemoryRegionType GetTypeForVirtualLinearMapping(u32 type_id) { | |||
| 330 | return KMemoryRegionType_VirtualDramKernelTraceBuffer; | 336 | return KMemoryRegionType_VirtualDramKernelTraceBuffer; |
| 331 | } else if (KMemoryRegionType_DramKernelPtHeap.IsAncestorOf(type_id)) { | 337 | } else if (KMemoryRegionType_DramKernelPtHeap.IsAncestorOf(type_id)) { |
| 332 | return KMemoryRegionType_VirtualDramKernelPtHeap; | 338 | return KMemoryRegionType_VirtualDramKernelPtHeap; |
| 339 | } else if ((type_id | KMemoryRegionAttr_ShouldKernelMap) == type_id) { | ||
| 340 | return KMemoryRegionType_VirtualDramUnknownDebug; | ||
| 333 | } else { | 341 | } else { |
| 334 | return KMemoryRegionType_Dram; | 342 | return KMemoryRegionType_Dram; |
| 335 | } | 343 | } |