kern/loader/svc: adopt updated names
This commit is contained in:
1 parent
9b4e4a2190
commit
ab1e8a3e32
22 files changed
+239
-240
No files matched your search
@@ -79,20 +79,20 @@ namespace ams::cfg {
|
||||
InvalidProgramOverrideKey,
|
||||
},
|
||||
.program_as_flags = {
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit39,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit39,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit39,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit39,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit39,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit39,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit39,
|
||||
impl::OverrideStatusFlag_AddressSpace64Bit39,
|
||||
},
|
||||
.override_any_app_key = {
|
||||
.key_combination = HidNpadButton_R,
|
||||
.override_by_default = false,
|
||||
},
|
||||
.override_any_app_as_flag = impl::OverrideStatusFlag_AddressSpace64Bit,
|
||||
.override_any_app_as_flag = impl::OverrideStatusFlag_AddressSpace64Bit39,
|
||||
.override_any_app = true,
|
||||
};
|
||||
|
||||
@@ -152,11 +152,11 @@ namespace ams::cfg {
|
||||
|
||||
impl::OverrideStatusFlag ParseOverrideAddressSpace(const char *value) {
|
||||
if (strcasecmp(value, "39_bit") == 0 || strcasecmp(value, "39") == 0) {
|
||||
return impl::OverrideStatusFlag_AddressSpace64Bit;
|
||||
return impl::OverrideStatusFlag_AddressSpace64Bit39;
|
||||
} else if (strcasecmp(value, "42_bit") == 0 || strcasecmp(value, "42") == 0) {
|
||||
return impl::OverrideStatusFlag_AddressSpace64Bit64KPage;
|
||||
return impl::OverrideStatusFlag_AddressSpace64Bit42;
|
||||
} else if (strcasecmp(value, "36_bit") == 0 || strcasecmp(value, "36") == 0) {
|
||||
return impl::OverrideStatusFlag_AddressSpace64BitDeprecated;
|
||||
return impl::OverrideStatusFlag_AddressSpace64Bit36;
|
||||
} else if (strcasecmp(value, "32_bit") == 0 || strcasecmp(value, "32") == 0) {
|
||||
return impl::OverrideStatusFlag_AddressSpace32Bit;
|
||||
} else if (strcasecmp(value, "32_bit_without_alias") == 0 ||
|
||||
@@ -168,10 +168,10 @@ namespace ams::cfg {
|
||||
strcasecmp(value, "32_without_map") == 0 ||
|
||||
strcasecmp(value, "32_no_map") == 0)
|
||||
{
|
||||
return impl::OverrideStatusFlag_AddressSpace32BitWithoutAlias;
|
||||
return impl::OverrideStatusFlag_AddressSpace32BitNoReserved;
|
||||
} else {
|
||||
/* Default to 39-bit. */
|
||||
return impl::OverrideStatusFlag_AddressSpace64Bit;
|
||||
return impl::OverrideStatusFlag_AddressSpace64Bit39;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,14 +27,14 @@ namespace ams::osdbg::impl {
|
||||
using ThreadInfoImpl = ThreadInfoHorizonImpl;
|
||||
|
||||
constexpr inline bool IsLp64(const ThreadInfo *info) {
|
||||
const auto as = info->_debug_info_create_process.flags & svc::CreateProcessFlag_AddressSpaceMask;
|
||||
return as == svc::CreateProcessFlag_AddressSpace64Bit
|
||||
|| as == svc::CreateProcessFlag_AddressSpace64BitDeprecated
|
||||
|| as == svc::CreateProcessFlag_AddressSpace64Bit64KPage;
|
||||
const auto as = info->_debug_info_create_process.flags & svc::CreateProcessParameterFlag_AddressSpaceMask;
|
||||
return as == svc::CreateProcessParameterFlag_AddressSpace64Bit39
|
||||
|| as == svc::CreateProcessParameterFlag_AddressSpace64Bit36
|
||||
|| as == svc::CreateProcessParameterFlag_AddressSpace64Bit42;
|
||||
}
|
||||
|
||||
constexpr inline bool Is64BitArch(const ThreadInfo *info) {
|
||||
return (info->_debug_info_create_process.flags & svc::CreateProcessFlag_Is64Bit);
|
||||
return (info->_debug_info_create_process.flags & svc::CreateProcessParameterFlag_64Bit);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user