Skip to content

Commit

Permalink
Merge pull request #3928 from povik/mem-wr-merge-transpemu-fix
Browse files Browse the repository at this point in the history
mem: Fix index confusion in write port merging
  • Loading branch information
povik authored Sep 12, 2023
2 parents 88ce47e + cbc4ec8 commit b04f235
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/mem.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1252,12 +1252,12 @@ void Mem::prepare_wr_merge(int idx1, int idx2, FfInitVals *initvals) {
// If transparent with only one, emulate it, and remove the collision-X
// flag that emulate_transparency will set (to align with the other port).
if (rport.transparency_mask[idx1]) {
emulate_transparency(i, idx1, initvals);
emulate_transparency(idx1, i, initvals);
rport.collision_x_mask[idx1] = false;
continue;
}
if (rport.transparency_mask[idx2]) {
emulate_transparency(i, idx2, initvals);
emulate_transparency(idx2, i, initvals);
rport.collision_x_mask[idx2] = false;
continue;
}
Expand Down

0 comments on commit b04f235

Please sign in to comment.