mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-07 03:58:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential overflows in utils::aligned_div, utils::rounded_div

Browse Source
This commit is contained in:
Eladash 2021-02-19 11:14:36 +02:00 committed by Ivan
parent 20eb4352fb
commit b86ec2ffcf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/util/asm.hpp
View File

@ -374,21 +374,21 @@ namespace utils
// General purpose aligned division, the result is rounded up not truncated // General purpose aligned division, the result is rounded up not truncated
template <typename T, typename = std::enable_if_t<std::is_integral<T>::value && std::is_unsigned<T>::value>> template <typename T, typename = std::enable_if_t<std::is_integral<T>::value && std::is_unsigned<T>::value>>
constexpr T aligned_div(T value, ullong align) constexpr T aligned_div(T value, std::type_identity_t<T> align)
{ {
return static_cast<T>((value + align - 1) / align); return static_cast<T>(value / align + T{!!(value % align)});
} }
// General purpose aligned division, the result is rounded to nearest // General purpose aligned division, the result is rounded to nearest
template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>> template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
constexpr T rounded_div(T value, std::conditional_t<std::is_signed<T>::value, llong, ullong> align) constexpr T rounded_div(T value, std::type_identity_t<T> align)
{ {
if constexpr (std::is_unsigned<T>::value) if constexpr (std::is_unsigned<T>::value)
{ {
return static_cast<T>((value + (align / 2)) / align); return static_cast<T>(value / align + T{(value % align) > (align / 2)});
} }
return static_cast<T>((value + (value < 0 ? 0 - align : align) / 2) / align); return static_cast<T>(value / align + (value > 0 ? T{(value % align) > (align / 2)} : 0 - T{(value % align) < (align / 2)}));
} }
} // namespace utils } // namespace utils