diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-06-02 00:34:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 00:34:48 -0400 |
| commit | 377cd301b30aaee015d6981387284ab5cbd7cc3e (patch) | |
| tree | 88f1d045919187bd67dce2d7bbcaf301046bae6b /src/core | |
| parent | 50866199a4f76db501f692112ddfe142679ad3bb (diff) | |
| parent | 3aed797466f6ba166a8e941c47687a345bca7576 (diff) | |
Merge pull request #6395 from lioncash/result-move
common_funcs: Move R_ macros to result.h
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/result.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 43968386f..df3283fe3 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -358,3 +358,28 @@ ResultVal<std::remove_reference_t<Arg>> MakeResult(Arg&& arg) { return CONCAT2(check_result_L, __LINE__); \ } \ } while (false) + +#define R_SUCCEEDED(res) (res.IsSuccess()) + +/// Evaluates a boolean expression, and succeeds if that expression is true. +#define R_SUCCEED_IF(expr) R_UNLESS(!(expr), RESULT_SUCCESS) + +/// Evaluates a boolean expression, and returns a result unless that expression is true. +#define R_UNLESS(expr, res) \ + { \ + if (!(expr)) { \ + if (res.IsError()) { \ + LOG_ERROR(Kernel, "Failed with result: {}", res.raw); \ + } \ + return res; \ + } \ + } + +/// Evaluates an expression that returns a result, and returns the result if it would fail. +#define R_TRY(res_expr) \ + { \ + const auto _tmp_r_try_rc = (res_expr); \ + if (_tmp_r_try_rc.IsError()) { \ + return _tmp_r_try_rc; \ + } \ + } |