mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-12 20:18:20 +00:00
Code Activity

cxxrtl.h: Fix incorrect CarryOut in alu when Bits % 32 != 0 && Invert == False

Browse source
This commit is contained in:
Andy Knowles 2020-08-12 11:32:57 +02:00
parent 04f6158bf2
commit 1227c3681b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
backends/cxxrtl/cxxrtl.h
View file

@ -450,12 +450,18 @@ struct value : public expr_base<value<Bits>> {
std::pair<value<Bits>, bool /*CarryOut*/> alu(const value<Bits> &other) const { std::pair<value<Bits>, bool /*CarryOut*/> alu(const value<Bits> &other) const {
value<Bits> result; value<Bits> result;
bool carry = CarryIn; bool carry = CarryIn;
for (size_t n = 0; n < result.chunks; n++) { // Handle full chunks first
for (size_t n = 0; n < result.chunks - 1; n++) {
result.data[n] = data[n] + (Invert ? ~other.data[n] : other.data[n]) + carry; result.data[n] = data[n] + (Invert ? ~other.data[n] : other.data[n]) + carry;
carry = (result.data[n] < data[n]) || carry = (result.data[n] < data[n]) ||
(result.data[n] == data[n] && carry); (result.data[n] == data[n] && carry);
} }
result.data[result.chunks - 1] &= result.msb_mask; // Handle last chunk (mask before updating carry)
constexpr size_t last = result.chunks - 1;
result.data[last] = data[last] + (Invert ? ~other.data[last] : other.data[last]) + carry;
result.data[last] &= result.msb_mask;
carry = (result.data[last] < data[last]) ||
(result.data[last] == data[last] && carry);
return {result, carry}; return {result, carry};
} }