nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-19 22:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

stratosphere: TODO: panic -> std::abort()

Browse source
This commit is contained in:
Michael Scire 2019-05-10 03:28:18 -07:00
parent 41f5b39f6b
commit 03a425a579
7 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stratosphere/ams_mitm/source/utils.cpp
View file

@ -83,7 +83,7 @@ void Utils::InitializeThreadFunc(void *args) {
static const char * const required_active_services[] = {"pcv", "gpio", "pinmux", "psc:c"}; static const char * const required_active_services[] = {"pcv", "gpio", "pinmux", "psc:c"};
for (unsigned int i = 0; i < sizeof(required_active_services) / sizeof(required_active_services[0]); i++) { for (unsigned int i = 0; i < sizeof(required_active_services) / sizeof(required_active_services[0]); i++) {
if (R_FAILED(smGetServiceOriginal(&tmp_hnd, smEncodeName(required_active_services[i])))) { if (R_FAILED(smGetServiceOriginal(&tmp_hnd, smEncodeName(required_active_services[i])))) {
/* TODO: Panic */ std::abort();
} else { } else {
svcCloseHandle(tmp_hnd); svcCloseHandle(tmp_hnd);
} }

2
stratosphere/libstratosphere

@ -1 +1 @@
Subproject commit e8707a6581ecf33a8e35601c8f2e11018bbdc7ec Subproject commit 8ec43f0d69463784c00ddb19c5f3b043e713548e

2
stratosphere/loader/source/ldr_map.hpp
View file

@ -73,7 +73,7 @@ class AutoCloseMap {
void Close() { void Close() {
if (this->mapped_address) { if (this->mapped_address) {
if (R_FAILED(svcUnmapProcessMemory(this->mapped_address, this->process_handle, this->base_address, this->size))) { if (R_FAILED(svcUnmapProcessMemory(this->mapped_address, this->process_handle, this->base_address, this->size))) {
/* TODO: panic(). */ std::abort();
} }
this->mapped_address = NULL; this->mapped_address = NULL;
} }

3
stratosphere/loader/source/ldr_nso.cpp
View file

@ -207,8 +207,7 @@ Result NsoUtils::CalculateNsoLoadExtents(u32 addspace_type, u32 args_size, NsoLo
addspace_size = 0x7FF8000000ULL; addspace_size = 0x7FF8000000ULL;
break; break;
default: default:
/* TODO: Panic. */ std::abort();
return ResultKernelOutOfMemory;
} }
} else { } else {
if (addspace_type & 2) { if (addspace_type & 2) {

3
stratosphere/loader/source/ldr_nso.hpp
View file

@ -94,8 +94,7 @@ class NsoUtils {
case 12: case 12:
return "sdk"; return "sdk";
default: default:
/* TODO: Panic. */ std::abort();
return "?";
} }
} }

2
stratosphere/pm/source/pm_boot2.cpp
View file

@ -180,7 +180,7 @@ static void MountSdCard() {
static const char * const required_active_services[] = {"pcv", "gpio", "pinmux", "psc:c"}; static const char * const required_active_services[] = {"pcv", "gpio", "pinmux", "psc:c"};
for (unsigned int i = 0; i < sizeof(required_active_services) / sizeof(required_active_services[0]); i++) { for (unsigned int i = 0; i < sizeof(required_active_services) / sizeof(required_active_services[0]); i++) {
if (R_FAILED(smGetServiceOriginal(&tmp_hnd, smEncodeName(required_active_services[i])))) { if (R_FAILED(smGetServiceOriginal(&tmp_hnd, smEncodeName(required_active_services[i])))) {
/* TODO: Panic */ std::abort();
} else { } else {
svcCloseHandle(tmp_hnd); svcCloseHandle(tmp_hnd);
} }

6
stratosphere/sm/source/sm_main.cpp
View file

@ -91,8 +91,7 @@ int main(int argc, char **argv)
/* Create sm:m manually. */ /* Create sm:m manually. */
Handle smm_h; Handle smm_h;
if (R_FAILED(Registration::RegisterServiceForSelf(smEncodeName("sm:m"), 1, false, &smm_h))) { if (R_FAILED(Registration::RegisterServiceForSelf(smEncodeName("sm:m"), 1, false, &smm_h))) {
/* TODO: Panic. */ std::abort();
while (1) { }
} }
server_manager->AddWaitable(new ExistingPortServer<ManagerService>(smm_h, 1)); server_manager->AddWaitable(new ExistingPortServer<ManagerService>(smm_h, 1));
@ -101,8 +100,7 @@ int main(int argc, char **argv)
/* Create sm:dmnt manually. */ /* Create sm:dmnt manually. */
Handle smdmnt_h; Handle smdmnt_h;
if (R_FAILED(Registration::RegisterServiceForSelf(smEncodeName("sm:dmnt"), 1, false, &smdmnt_h))) { if (R_FAILED(Registration::RegisterServiceForSelf(smEncodeName("sm:dmnt"), 1, false, &smdmnt_h))) {
/* TODO: Panic. */ std::abort();
while (1) { }
} }
server_manager->AddWaitable(new ExistingPortServer<DmntService>(smm_h, 1));; server_manager->AddWaitable(new ExistingPortServer<DmntService>(smm_h, 1));;