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

Removed rest of HRDATAW from ahblite

Browse Source
This commit is contained in:
David Harris 2021-07-17 02:15:24 -04:00
parent 1d171d7ea6
commit 52fcc47cdf
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wally-pipelined/src/ebu/ahblite.sv
View File

@ -55,7 +55,7 @@ module ahblite (
input logic [1:0] MemSizeM, // *** remove input logic [1:0] MemSizeM, // *** remove
output logic DCfromAHBAck, output logic DCfromAHBAck,
// Return from bus // Return from bus
output logic [`XLEN-1:0] HRDATAW, // output logic [`XLEN-1:0] HRDATAW,
// AHB-Lite external signals // AHB-Lite external signals
input logic [`AHBW-1:0] HRDATA, input logic [`AHBW-1:0] HRDATA,
input logic HREADY, HRESP, input logic HREADY, HRESP,
@ -180,25 +180,13 @@ module ahblite (
CapturedDataAvailable <= #1 1'b0; CapturedDataAvailable <= #1 1'b0;
else else
CapturedDataAvailable <= #1 (StallW) ? (CaptureDataM | CapturedDataAvailable) : 1'b0; CapturedDataAvailable <= #1 (StallW) ? (CaptureDataM | CapturedDataAvailable) : 1'b0;
/* always_comb
casez({StallW && (BusState != ATOMICREAD),CapturedDataAvailable})
2'b00: HRDATANext = HRDATAMasked;
2'b01: HRDATANext = CapturedHRDATAMasked;
2'b1?: HRDATANext = HRDATAW;
endcase
flopr #(`XLEN) ReadDataOldWReg(clk, reset, HRDATANext, HRDATAW);
// Extract and sign-extend subwords if necessary
subwordread swr(.HRDATA(HRDATA),
.HADDRD(HADDRD),
.HSIZED(HSIZED),
.HRDATAMasked(HRDATAMasked));*/
// *** AMO portion will go away when it is moved into the LSU // *** AMO portion will go away when it is moved into the LSU
// Handle AMO instructions if applicable // Handle AMO instructions if applicable
generate generate
if (`A_SUPPORTED) begin if (`A_SUPPORTED) begin
logic [`XLEN-1:0] AMOResult; logic [`XLEN-1:0] AMOResult;
logic [`XLEN-1:0] HRDATAW;
amoalu amoalu(.srca(HRDATAW), .srcb(DCtoAHBWriteData), .funct(Funct7M), .width(MemSizeM), amoalu amoalu(.srca(HRDATAW), .srcb(DCtoAHBWriteData), .funct(Funct7M), .width(MemSizeM),
.result(AMOResult)); .result(AMOResult));
mux2 #(`XLEN) wdmux(DCtoAHBWriteData, AMOResult, AtomicMaskedM[1], WriteData); mux2 #(`XLEN) wdmux(DCtoAHBWriteData, AMOResult, AtomicMaskedM[1], WriteData);

2
wally-pipelined/src/wally/wallypipelinedhart.sv
View File

@ -255,7 +255,7 @@ module wallypipelinedhart
.MemSizeM(DCtoAHBSizeM[1:0]), // *** depends on XLEN should be removed .MemSizeM(DCtoAHBSizeM[1:0]), // *** depends on XLEN should be removed
.UnsignedLoadM(1'b0), .UnsignedLoadM(1'b0),
.Funct7M(7'b0), .Funct7M(7'b0),
.HRDATAW(), // .HRDATAW(),
.StallW(1'b0), .StallW(1'b0),
.AtomicMaskedM(2'b00), .AtomicMaskedM(2'b00),
.*); .*);