summaryrefslogtreecommitdiffstats
path: root/src/core/loader/kip.cpp
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-06-07 01:20:15 +0200
committerZach Hilman <zachhilman@gmail.com>2019-06-07 01:20:15 +0200
commit9db119f8a2e5a4d877f00b9efb40e4a109c95ef7 (patch)
tree9d30248278656913599b01dd0fc70a3b0e7e7e24 /src/core/loader/kip.cpp
parentgame_list: Accept *.kip as a file extension of executables (diff)
downloadyuzu-9db119f8a2e5a4d877f00b9efb40e4a109c95ef7.tar
yuzu-9db119f8a2e5a4d877f00b9efb40e4a109c95ef7.tar.gz
yuzu-9db119f8a2e5a4d877f00b9efb40e4a109c95ef7.tar.bz2
yuzu-9db119f8a2e5a4d877f00b9efb40e4a109c95ef7.tar.lz
yuzu-9db119f8a2e5a4d877f00b9efb40e4a109c95ef7.tar.xz
yuzu-9db119f8a2e5a4d877f00b9efb40e4a109c95ef7.tar.zst
yuzu-9db119f8a2e5a4d877f00b9efb40e4a109c95ef7.zip
Diffstat (limited to 'src/core/loader/kip.cpp')
-rw-r--r--src/core/loader/kip.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/loader/kip.cpp b/src/core/loader/kip.cpp
index 2efd14f04..70051c13a 100644
--- a/src/core/loader/kip.cpp
+++ b/src/core/loader/kip.cpp
@@ -53,10 +53,14 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::Process& process) {
return {kip->GetStatus(), {}};
}
- const auto address_space =
- kip->Is64Bit() ? (kip->Is39BitAddressSpace() ? FileSys::ProgramAddressSpaceType::Is39Bit
- : FileSys::ProgramAddressSpaceType::Is36Bit)
- : FileSys::ProgramAddressSpaceType::Is32Bit;
+ const auto get_kip_address_space_type = [](const auto& kip) {
+ return kip.Is64Bit()
+ ? (kip.Is39BitAddressSpace() ? FileSys::ProgramAddressSpaceType::Is39Bit
+ : FileSys::ProgramAddressSpaceType::Is36Bit)
+ : FileSys::ProgramAddressSpaceType::Is32Bit;
+ };
+
+ const auto address_space = get_kip_address_space_type(*kip);
FileSys::ProgramMetadata metadata;
metadata.LoadManual(kip->Is64Bit(), address_space, kip->GetMainThreadPriority(),