mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-17 00:24:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Integrate new result macros. (#1780)

Browse source 
* result: try out some experimental shenanigans

* result: sketch out some more shenanigans

* result: see what it looks like to convert kernel to use result conds instead of guards

* make rest of kernel use experimental new macro-ing
This commit is contained in:
SciresM 2022-02-14 14:45:32 -08:00 • committed by GitHub
parent 375ba615be
commit 96f95b9f95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
109 changed files with 1355 additions and 1380 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libraries/libmesosphere/source/svc/kern_svc_synchronization.cpp
View file

@ -24,7 +24,7 @@ namespace ams::kern::svc {
Result CloseHandle(ams::svc::Handle handle) {
/* Remove the handle. */
R_UNLESS(GetCurrentProcess().GetHandleTable().Remove(handle), svc::ResultInvalidHandle());
return ResultSuccess();
R_SUCCEED();
}
Result ResetSignal(ams::svc::Handle handle) {
@ -36,9 +36,9 @@ namespace ams::kern::svc {
KScopedAutoObject readable_event = handle_table.GetObject<KReadableEvent>(handle);
if (readable_event.IsNotNull()) {
if (auto * const interrupt_event = readable_event->DynamicCast<KInterruptEvent *>(); interrupt_event != nullptr) {
return interrupt_event->Reset();
R_RETURN(interrupt_event->Reset());
} else {
return readable_event->Reset();
R_RETURN(readable_event->Reset());
}
}
}
@ -47,11 +47,11 @@ namespace ams::kern::svc {
{
KScopedAutoObject process = handle_table.GetObject<KProcess>(handle);
if (process.IsNotNull()) {
return process->Reset();
R_RETURN(process->Reset());
}
}
return svc::ResultInvalidHandle();
R_THROW(svc::ResultInvalidHandle());
}
Result WaitSynchronizationImpl(int32_t *out_index, KSynchronizationObject **objs, int32_t num_handles, int64_t timeout_ns) {
@ -67,7 +67,7 @@ namespace ams::kern::svc {
timeout = timeout_ns;
}
return KSynchronizationObject::Wait(out_index, objs, num_handles, timeout);
R_RETURN(KSynchronizationObject::Wait(out_index, objs, num_handles, timeout));
}
Result WaitSynchronization(int32_t *out_index, KUserPointer<const ams::svc::Handle *> user_handles, int32_t num_handles, int64_t timeout_ns) {
@ -103,7 +103,7 @@ namespace ams::kern::svc {
R_CONVERT(svc::ResultSessionClosed, ResultSuccess())
} R_END_TRY_CATCH;
return ResultSuccess();
R_SUCCEED();
}
Result CancelSynchronization(ams::svc::Handle handle) {
@ -113,7 +113,7 @@ namespace ams::kern::svc {
/* Cancel the thread's wait. */
thread->WaitCancel();
return ResultSuccess();
R_SUCCEED();
}
void SynchronizePreemptionState() {
@ -136,19 +136,19 @@ namespace ams::kern::svc {
/* ============================= 64 ABI ============================= */
Result CloseHandle64(ams::svc::Handle handle) {
return CloseHandle(handle);
R_RETURN(CloseHandle(handle));
}
Result ResetSignal64(ams::svc::Handle handle) {
return ResetSignal(handle);
R_RETURN(ResetSignal(handle));
}
Result WaitSynchronization64(int32_t *out_index, KUserPointer<const ams::svc::Handle *> handles, int32_t num_handles, int64_t timeout_ns) {
return WaitSynchronization(out_index, handles, num_handles, timeout_ns);
R_RETURN(WaitSynchronization(out_index, handles, num_handles, timeout_ns));
}
Result CancelSynchronization64(ams::svc::Handle handle) {
return CancelSynchronization(handle);
R_RETURN(CancelSynchronization(handle));
}
void SynchronizePreemptionState64() {
@ -158,19 +158,19 @@ namespace ams::kern::svc {
/* ============================= 64From32 ABI ============================= */
Result CloseHandle64From32(ams::svc::Handle handle) {
return CloseHandle(handle);
R_RETURN(CloseHandle(handle));
}
Result ResetSignal64From32(ams::svc::Handle handle) {
return ResetSignal(handle);
R_RETURN(ResetSignal(handle));
}
Result WaitSynchronization64From32(int32_t *out_index, KUserPointer<const ams::svc::Handle *> handles, int32_t num_handles, int64_t timeout_ns) {
return WaitSynchronization(out_index, handles, num_handles, timeout_ns);
R_RETURN(WaitSynchronization(out_index, handles, num_handles, timeout_ns));
}
Result CancelSynchronization64From32(ams::svc::Handle handle) {
return CancelSynchronization(handle);
R_RETURN(CancelSynchronization(handle));
}
void SynchronizePreemptionState64From32() {