diff options
author | Lioncash <mathew1800@gmail.com> | 2018-12-12 17:04:10 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-12-12 20:03:53 +0100 |
commit | c02b8c895b49b511a4316ee5e7bf1ab9a081869b (patch) | |
tree | 12fd3273e244512cfa44ac203b963edcd5341997 | |
parent | vm_manager: Amend MemoryState enum members (diff) | |
download | yuzu-c02b8c895b49b511a4316ee5e7bf1ab9a081869b.tar yuzu-c02b8c895b49b511a4316ee5e7bf1ab9a081869b.tar.gz yuzu-c02b8c895b49b511a4316ee5e7bf1ab9a081869b.tar.bz2 yuzu-c02b8c895b49b511a4316ee5e7bf1ab9a081869b.tar.lz yuzu-c02b8c895b49b511a4316ee5e7bf1ab9a081869b.tar.xz yuzu-c02b8c895b49b511a4316ee5e7bf1ab9a081869b.tar.zst yuzu-c02b8c895b49b511a4316ee5e7bf1ab9a081869b.zip |
-rw-r--r-- | src/core/hle/kernel/svc.h | 16 | ||||
-rw-r--r-- | src/core/hle/kernel/svc_wrap.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/vm_manager.h | 15 |
3 files changed, 16 insertions, 17 deletions
diff --git a/src/core/hle/kernel/svc.h b/src/core/hle/kernel/svc.h index b06aac4ec..c37ae0f98 100644 --- a/src/core/hle/kernel/svc.h +++ b/src/core/hle/kernel/svc.h @@ -8,22 +8,6 @@ namespace Kernel { -struct MemoryInfo { - u64 base_address; - u64 size; - u32 type; - u32 attributes; - u32 permission; - u32 device_refcount; - u32 ipc_refcount; - INSERT_PADDING_WORDS(1); -}; -static_assert(sizeof(MemoryInfo) == 0x28, "MemoryInfo has incorrect size."); - -struct PageInfo { - u64 flags; -}; - void CallSVC(u32 immediate); } // namespace Kernel diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h index 24aef46c9..3893b0f4a 100644 --- a/src/core/hle/kernel/svc_wrap.h +++ b/src/core/hle/kernel/svc_wrap.h @@ -7,7 +7,7 @@ #include "common/common_types.h" #include "core/arm/arm_interface.h" #include "core/core.h" -#include "core/hle/kernel/svc.h" +#include "core/hle/kernel/vm_manager.h" #include "core/hle/result.h" #include "core/memory.h" diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h index 0a600c23c..35f0f276e 100644 --- a/src/core/hle/kernel/vm_manager.h +++ b/src/core/hle/kernel/vm_manager.h @@ -150,6 +150,21 @@ constexpr u32 ToSvcMemoryState(MemoryState state) { return static_cast<u32>(state & MemoryState::Mask); } +struct MemoryInfo { + u64 base_address; + u64 size; + u32 type; + u32 attributes; + u32 permission; + u32 device_refcount; + u32 ipc_refcount; +}; +static_assert(sizeof(MemoryInfo) == 0x28, "MemoryInfo has incorrect size."); + +struct PageInfo { + u32 flags; +}; + /** * Represents a VMA in an address space. A VMA is a contiguous region of virtual addressing space * with homogeneous attributes across its extents. In this particular implementation each VMA is |