Used .* in wrapper

This commit is contained in:
David Harris 2022-01-07 05:23:42 +00:00
parent 2df92af488
commit 261882bf78
2 changed files with 2 additions and 50 deletions

View File

@ -39,7 +39,7 @@ module sram1rw #(parameter DEPTH=128, WIDTH=256) (
input logic WriteEnable input logic WriteEnable
); );
logic [DEPTH-1:0][WIDTH-1:0] StoredData; logic [DEPTH-1:0][WIDTH-1:0] StoredData; // *** inconsistency in packed vs. unpacked
logic [$clog2(DEPTH)-1:0] AddrD; logic [$clog2(DEPTH)-1:0] AddrD;
logic [WIDTH-1:0] WriteDataD; logic [WIDTH-1:0] WriteDataD;
logic WriteEnableD; logic WriteEnableD;

View File

@ -63,60 +63,12 @@ module wallypipelinedsocwrapper (
output SDCCmdOE output SDCCmdOE
); );
wire [31:0] GPIOPinsEn;
wire [31:0] GPIOPinsIn; wire [31:0] GPIOPinsIn;
wire [31:0] GPIOPinsOut; wire [31:0] GPIOPinsOut;
// to instruction memory *** remove later
wire [`XLEN-1:0] PCF;
// Uncore signals
wire [`AHBW-1:0] HRDATA; // from AHB mux in uncore
wire HRESP;
wire [5:0] HSELRegions;
wire InstrAccessFaultF, DataAccessFaultM;
wire TimerIntM, SwIntM; // from CLINT
wire [63:0] MTIME_CLINT, MTIMECMP_CLINT; // from CLINT to CSRs
wire ExtIntM; // from PLIC
wire [2:0] HADDRD;
wire [3:0] HSIZED;
wire HWRITED;
wire [15:0] rd2; // bogus, delete when real multicycle fetch works
wire [31:0] InstrF;
assign GPIOPinsOut_IO = GPIOPinsOut[4:0]; assign GPIOPinsOut_IO = GPIOPinsOut[4:0];
assign GPIOPinsIn = {28'b0, GPIOPinsIn_IO}; assign GPIOPinsIn = {28'b0, GPIOPinsIn_IO};
// wrapper for fpga // wrapper for fpga
wallypipelinedsoc wallypipelinedsoc wallypipelinedsoc wallypipelinedsoc(.*);
(.clk,
.reset_ext(reset),
.HRDATAEXT,
.HREADYEXT,
.HRESPEXT,
.HSELEXT,
.HCLK,
.HRESETn,
.HADDR,
.HWDATA,
.HWRITE,
.HSIZE,
.HBURST,
.HPROT,
.HTRANS,
.HMASTLOCK,
.HREADY,
.TIMECLK,
.GPIOPinsIn,
.GPIOPinsOut,
.GPIOPinsEn,
.UARTSin,
.UARTSout,
.SDCDatIn,
.SDCCLK,
.SDCCmdIn,
.SDCCmdOut,
.SDCCmdOE);
endmodule endmodule