Xavi/cvw
1
0
Fork 0
forked from Github_Repos/cvw
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forgot to save cacheway merge

Browse Source
This commit is contained in:
David Harris 2021-10-26 08:38:13 -07:00
parent c0145c0a35
commit 426a43f77b
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wally-pipelined/src/cache/cacheway.sv vendored
View File

@ -112,19 +112,12 @@ module cacheway #(parameter NUMLINES=512, parameter BLOCKLEN = 256, TAGLEN = 26,
always_ff @(posedge clk, posedge reset) begin
<<<<<<< HEAD
if (reset) ValidBits <= {NUMLINES{1'b0}};
else if (InvalidateAll) ValidBits <= {NUMLINES{1'b0}};
else if (SetValid & (WriteEnable | VDWriteEnable)) ValidBits[WAdr] <= 1'b1;
else if (ClearValid & (WriteEnable | VDWriteEnable)) ValidBits[WAdr] <= 1'b0;
=======
if (reset)
ValidBits <= {NUMLINES{1'b0}};
else if (InvalidateAll)
ValidBits <= {NUMLINES{1'b0}};
else if (SetValidD & (WriteEnableD | VDWriteEnableD)) ValidBits[WAdrD] <= 1'b1;
else if (ClearValidD & (WriteEnableD | VDWriteEnableD)) ValidBits[WAdrD] <= 1'b0;
>>>>>>> 520b9f17d7e813e4be9ef79613d6d9ab07b90817
end
always_ff @(posedge clk) begin