OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermosphere: introduce "ENSURE"

Browse Source
This commit is contained in:
TuxSH
2020-01-25 17:20:43 +00:00
parent d0821a3f50
commit e3961f225c
6 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
thermosphere/src/main.c
View File

@@ -38,13 +38,10 @@ static void loadKernelViaSemihosting(void)
DEBUG("Loading kernel via semihosted file I/O... ");
handle = semihosting_file_open("test_kernel.bin", FOPEN_MODE_RB);
if (handle < 0) {
PANIC("failed to open file (%ld)!\n", handle);
}
ENSURE2(handle >= 0, "failed to open file (%ld)!\n", handle);
if ((ret = semihosting_file_read(handle, &len, buf)) < 0) {
PANIC("failed to read file (%ld)!\n", ret);
}
ret = semihosting_file_read(handle, &len, buf);
ENSURE2(ret >= 0, "failed to read file (%ld)!\n", ret);
DEBUG("OK!\n");
semihosting_file_close(handle);
@@ -115,11 +112,8 @@ void thermosphereMain(ExceptionStackFrame *frame, u64 pct)
if (currentCoreCtx->isBootCore) {
if (currentCoreCtx->kernelEntrypoint == 0) {
if (semihosting_connection_supported()) {
loadKernelViaSemihosting();
} else {
PANIC("Kernel not loaded!\n");
}
ENSURE2(semihosting_connection_supported(), "Kernel not loaded!\n");
loadKernelViaSemihosting();
}
}
else {