From 7a265191d2b00166dece0997a3e2de4b98e86762 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 3 May 2022 02:21:39 +0200 Subject: [PATCH] early-access version 2718 --- README.md | 2 +- src/core/hle/result.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ef15f018..cf11cfd1a 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2717. +This is the source code for early-access 2718. ## Legal Notice diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 3807b9aa8..8d38d0030 100755 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -153,6 +153,48 @@ constexpr ResultCode ResultSuccess(0); */ constexpr ResultCode ResultUnknown(UINT32_MAX); +/** + * A ResultRange defines an inclusive range of error descriptions within an error module. + * This can be used to check whether the description of a given ResultCode falls within the range. + * The conversion function returns a ResultCode with its description set to description_start. + * + * An example of how it could be used: + * \code + * constexpr ResultRange ResultCommonError{ErrorModule::Common, 0, 9999}; + * + * ResultCode Example(int value) { + * const ResultCode result = OtherExample(value); + * + * // This will only evaluate to true if result.module is ErrorModule::Common and + * // result.description is in between 0 and 9999 inclusive. + * if (ResultCommonError.Includes(result)) { + * // This returns ResultCode{ErrorModule::Common, 0}; + * return ResultCommonError; + * } + * + * return ResultSuccess; + * } + * \endcode + */ +class ResultRange { +public: + consteval ResultRange(ErrorModule module, u32 description_start, u32 description_end_) + : code{module, description_start}, description_end{description_end_} {} + + [[nodiscard]] consteval operator ResultCode() const { + return code; + } + + [[nodiscard]] constexpr bool Includes(ResultCode other) const { + return code.module == other.module && code.description <= other.description && + other.description <= description_end; + } + +private: + ResultCode code; + u32 description_end; +}; + /** * This is an optional value type. It holds a `ResultCode` and, if that code is ResultSuccess, it * also holds a result of type `T`. If the code is an error code (not ResultSuccess), then trying