Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced swbytemask with swbytemaskword (1 liner). Credit to David Harris.

Browse Source
This commit is contained in:
Ross Thompson 2022-08-01 21:12:25 -05:00
parent 171cf7413b
commit b8356c7449
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pipelined/src/ebu/ahblite.sv
View File

@ -157,7 +157,7 @@ module ahblite (
assign HMASTLOCK = 0; // no locking supported assign HMASTLOCK = 0; // no locking supported
assign HWRITE = (NextBusState == MEMWRITE); assign HWRITE = (NextBusState == MEMWRITE);
// Byte mask for HWSTRB // Byte mask for HWSTRB
swbytemask swbytemask(.Size(HSIZED[1:0]), .Adr(HADDRD[2:0]), .ByteMask(HWSTRB)); swbytemask #(`XLEN) swbytemask(.Size(HSIZED[2:0]), .Adr(HADDRD[$clog2(`XLEN/8)-1:0]), .ByteMask(HWSTRB));
// delay write data by one cycle for // delay write data by one cycle for
flopen #(`XLEN) wdreg(HCLK, (LSUBusAck | LSUBusInit), LSUBusHWDATA, HWDATA); // delay HWDATA by 1 cycle per spec; *** assumes AHBW = XLEN flopen #(`XLEN) wdreg(HCLK, (LSUBusAck | LSUBusInit), LSUBusHWDATA, HWDATA); // delay HWDATA by 1 cycle per spec; *** assumes AHBW = XLEN

2
pipelined/src/lsu/lsu.sv
View File

@ -279,7 +279,7 @@ module lsu (
.LSUFunct3M, .AMOWriteDataM, .LittleEndianWriteDataM); .LSUFunct3M, .AMOWriteDataM, .LittleEndianWriteDataM);
// Compute byte masks // Compute byte masks
swbytemaskword #(`LLEN) swbytemask(.Size(LSUFunct3M), .Adr(LSUPAdrM[$clog2(`LLEN/8)-1:0]), .ByteMask(ByteMaskM)); swbytemask #(`LLEN) swbytemask(.Size(LSUFunct3M), .Adr(LSUPAdrM[$clog2(`LLEN/8)-1:0]), .ByteMask(ByteMaskM));
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
// MW Pipeline Register // MW Pipeline Register

24
pipelined/src/lsu/swbytemask.sv
View File

@ -30,13 +30,15 @@
`include "wally-config.vh" `include "wally-config.vh"
module swbytemask ( module swbytemask #(parameter WORDLEN = 64)(
input logic [1:0] Size, input logic [2:0] Size,
input logic [2:0] Adr, input logic [$clog2(WORDLEN/8)-1:0] Adr,
output logic [`XLEN/8-1:0] ByteMask); output logic [WORDLEN/8-1:0] ByteMask);
assign ByteMask = ((2**(2**Size))-1) << Adr;
if(`XLEN == 64) begin /* Equivalent to the following for WORDLEN = 64
if(WORDLEN == 64) begin
always_comb begin always_comb begin
case(Size[1:0]) case(Size[1:0])
2'b00: begin ByteMask = 8'b00000000; ByteMask[Adr[2:0]] = 1; end // sb 2'b00: begin ByteMask = 8'b00000000; ByteMask[Adr[2:0]] = 1; end // sb
@ -49,18 +51,10 @@ module swbytemask (
2'b10: if (Adr[2]) ByteMask = 8'b11110000; 2'b10: if (Adr[2]) ByteMask = 8'b11110000;
else ByteMask = 8'b00001111; else ByteMask = 8'b00001111;
2'b11: ByteMask = 8'b1111_1111; 2'b11: ByteMask = 8'b1111_1111;
endcase default ByteMask = 8'b0000_0000;
end
end else begin
always_comb begin
case(Size[1:0])
2'b00: begin ByteMask = 4'b0000; ByteMask[Adr[1:0]] = 1; end // sb
2'b01: if (Adr[1]) ByteMask = 4'b1100;
else ByteMask = 4'b0011;
2'b10: ByteMask = 4'b1111;
default: ByteMask = 4'b1111;
endcase endcase
end end
end end
*/
endmodule endmodule