diff options
| author | 2017-12-29 13:27:58 -0500 | |
|---|---|---|
| committer | 2017-12-29 13:27:58 -0500 | |
| commit | ebd4b1422d55c9affc38e8133e897e39684e9ccb (patch) | |
| tree | 53513cb3d4e28493173a3f708764a4924654ba91 /src/core/hle/kernel/process.h | |
| parent | applet_oe: Stub out a bunch of interfaces necessary for boot. (diff) | |
| download | yuzu-ebd4b1422d55c9affc38e8133e897e39684e9ccb.tar.gz yuzu-ebd4b1422d55c9affc38e8133e897e39684e9ccb.tar.xz yuzu-ebd4b1422d55c9affc38e8133e897e39684e9ccb.zip | |
kernel: Various 64-bit fixes in memory/process/thread
Diffstat (limited to 'src/core/hle/kernel/process.h')
| -rw-r--r-- | src/core/hle/kernel/process.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 3b646c076..6774168e5 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h | |||
| @@ -19,7 +19,7 @@ namespace Kernel { | |||
| 19 | struct AddressMapping { | 19 | struct AddressMapping { |
| 20 | // Address and size must be page-aligned | 20 | // Address and size must be page-aligned |
| 21 | VAddr address; | 21 | VAddr address; |
| 22 | u32 size; | 22 | u64 size; |
| 23 | bool read_only; | 23 | bool read_only; |
| 24 | bool unk_flag; | 24 | bool unk_flag; |
| 25 | }; | 25 | }; |
| @@ -154,7 +154,7 @@ public: | |||
| 154 | // The left/right bounds of the address space covered by heap_memory. | 154 | // The left/right bounds of the address space covered by heap_memory. |
| 155 | VAddr heap_start = 0, heap_end = 0; | 155 | VAddr heap_start = 0, heap_end = 0; |
| 156 | 156 | ||
| 157 | u32 heap_used = 0, linear_heap_used = 0, misc_memory_used = 0; | 157 | u64 heap_used = 0, linear_heap_used = 0, misc_memory_used = 0; |
| 158 | 158 | ||
| 159 | MemoryRegionInfo* memory_region = nullptr; | 159 | MemoryRegionInfo* memory_region = nullptr; |
| 160 | 160 | ||
| @@ -171,7 +171,7 @@ public: | |||
| 171 | VAddr GetLinearHeapBase() const; | 171 | VAddr GetLinearHeapBase() const; |
| 172 | VAddr GetLinearHeapLimit() const; | 172 | VAddr GetLinearHeapLimit() const; |
| 173 | 173 | ||
| 174 | ResultVal<VAddr> HeapAllocate(VAddr target, u32 size, VMAPermission perms); | 174 | ResultVal<VAddr> HeapAllocate(VAddr target, u64 size, VMAPermission perms); |
| 175 | ResultCode HeapFree(VAddr target, u32 size); | 175 | ResultCode HeapFree(VAddr target, u32 size); |
| 176 | 176 | ||
| 177 | ResultVal<VAddr> LinearAllocate(VAddr target, u32 size, VMAPermission perms); | 177 | ResultVal<VAddr> LinearAllocate(VAddr target, u32 size, VMAPermission perms); |