system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-02 22:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

AK: Fix FixedPoint multiplication rounding and overflow behaviour

Browse source 
We now preform the multiplication in a widened type which makes it
overflow-safe and use the correct bit for rounding direction detection.
This commit is contained in:
Hendiadyoin1 2023-07-23 19:42:19 +02:00 committed by Andrew Kaster
parent 32de3ddd33
commit e609ac74a3
2 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
AK/FixedPoint.h
View file

@ -202,19 +202,24 @@ public:
}
constexpr This operator*(This const& other) const
{
// FIXME: Potential Overflow, although result could be represented accurately
Underlying value = m_value * other.raw();
This ret {};
ret.raw() = value >> precision;
// fract(value) >= .5?
// FIXME: Figure out a way to use more narrow types and avoid __int128
using MulRes = Conditional<sizeof(Underlying) < sizeof(i64), i64, __int128>;
MulRes value = raw();
value *= other.raw();
This ret = create_raw(value >> precision);
// Rounding:
// If last bit cut off is 1:
if (value & (1u << (precision - 1))) {
// fract(value) > .5?
// If the bit after is 1 as well
if (value & (radix_mask >> 2u)) {
// yes: round up;
ret.raw() += (value > 0 ? 1 : -1);
// We round away from 0
ret.raw() += 1;
} else {
// no: round to even (aka unset last sigificant bit);
ret.raw() += m_value & 1;
// Otherwise we round to the next even value
// Which means we add the least significant bit of the raw return value
ret.raw() += ret.raw() & 1;
}
}
return ret;
@ -268,19 +273,7 @@ public:
}
This& operator*=(This const& other)
{
Underlying value = m_value * other.raw();
m_value = value >> precision;
// fract(value) >= .5?
if (value & (1u << (precision - 1))) {
// fract(value) > .5?
if (value & (radix_mask >> 2u)) {
// yes: round up;
m_value += (value > 0 ? 1 : -1);
} else {
// no: round to even (aka unset last sigificant bit);
m_value += m_value & 1;
}
}
*this = *this * other;
return *this;
}
This& operator/=(This const& other)

5
Tests/AK/TestFixedPoint.cpp
View file

@ -26,6 +26,11 @@ TEST_CASE(arithmetic)
EXPECT_EQ(
Type((int)1) * Type(0.5),
Type(0.5));
EXPECT_EQ(Type(0.125) * Type(3.75),
Type(0.125 * 3.75));
EXPECT_EQ(Type(0.125) * Type(-3.75),
Type(0.125 * -3.75));
EXPECT_EQ(
Type((int)1) / Type(0.5),
Type(2));