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

cellaigs: fix adder function argument evaluation order

Browse source
This commit is contained in:
Emil J. Tywoniak 2025-12-02 15:07:37 +01:00
parent 7f3ea41103
commit 882001cb01
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/cellaigs.cc
View file

@ -231,17 +231,22 @@ struct AigMaker
return or_gate(a_active, b_active); return or_gate(a_active, b_active);
} }
vector<int> adder(const vector<int> &A, const vector<int> &B, int carry, vector<int> *X = nullptr, vector<int> *CO = nullptr) vector<int> adder(const vector<int> &A, const vector<int> &B, int carry_in, vector<int> *X = nullptr, vector<int> *CO = nullptr)
{ {
vector<int> Y(GetSize(A)); vector<int> Y(GetSize(A));
log_assert(GetSize(A) == GetSize(B)); log_assert(GetSize(A) == GetSize(B));
for (int i = 0; i < GetSize(A); i++) { for (int i = 0; i < GetSize(A); i++) {
Y[i] = xor_gate(xor_gate(A[i], B[i]), carry); int a_xor_b = xor_gate(A[i], B[i]);
carry = or_gate(and_gate(A[i], B[i]), and_gate(or_gate(A[i], B[i]), carry)); int a_or_b = or_gate(A[i], B[i]);
int a_and_b = and_gate(A[i], B[i]);
Y[i] = xor_gate(a_xor_b, carry_in);
int tmp = and_gate(a_or_b, carry_in);
int carry_out = or_gate(a_and_b, tmp);
if (X != nullptr) if (X != nullptr)
X->at(i) = xor_gate(A[i], B[i]); X->at(i) = a_xor_b;
if (CO != nullptr) if (CO != nullptr)
CO->at(i) = carry; CO->at(i) = carry_out;
carry_in = carry_out;
} }
return Y; return Y;
} }