Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/types.hpp: Fix signed/unsigned comparison error

Browse Source
This commit is contained in:
Elad
2025-11-26 08:38:58 +02:00
parent b451dfe877
commit 914b52cf4a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/util/types.hpp
+6 -5
View File
@@ -999,17 +999,18 @@ template <typename To, typename From> requires (std::is_integral_v<decltype(std:
constexpr bool is_from_signed = std::is_signed_v<CommonFrom>; constexpr bool is_from_signed = std::is_signed_v<CommonFrom>;
constexpr bool is_to_signed = std::is_signed_v<CommonTo>; constexpr bool is_to_signed = std::is_signed_v<CommonTo>;
// For unsigned/signed mismatch, create an "unsigned" compatible mask
constexpr auto from_mask = (is_from_signed && !is_to_signed) ? UnFrom{umax} >> 1 : UnFrom{umax}; constexpr auto from_mask = (is_from_signed && !is_to_signed) ? UnFrom{umax} >> 1 : UnFrom{umax};
constexpr auto to_mask = (is_to_signed && !is_from_signed) ? UnTo{umax} >> 1 : UnTo{umax}; constexpr auto to_mask = (is_to_signed && !is_from_signed) ? UnTo{umax} >> 1 : UnTo{umax};
constexpr auto mask = ~(from_mask & to_mask); constexpr auto mask = static_cast<UnFrom>(~(from_mask & to_mask));
// Signed to unsigned always require test // If destination ("unsigned" compatible) mask is smaller than source ("unsigned" compatible) mask
// Otherwise, this is bit-wise narrowing or conversion between types of different signedness of the same size // It requires narrowing.
if constexpr ((is_from_signed && !is_to_signed) || to_mask < from_mask) if constexpr (!!mask)
{ {
// Try to optimize test if both are of the same signedness // Try to optimize test if both are of the same signedness
if (is_from_signed != is_to_signed ? !!(value & mask) : static_cast<CommonTo>(value) != value) [[unlikely]] if (is_from_signed != is_to_signed ? !!(value & mask) : static_cast<UnTo>(value) != static_cast<UnFrom>(value)) [[unlikely]]
{ {
fmt::raw_verify_error(src_loc, u8"Narrowing error", +value); fmt::raw_verify_error(src_loc, u8"Narrowing error", +value);
} }