Hardware
/
picorv32
mirror of https://github.com/YosysHQ/picorv32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from olofk/testbench_wb_fixes 

Testbench wb fixes
This commit is contained in:
Clifford Wolf 2017-12-31 14:46:15 +01:00 committed by GitHub
parent df01132185 f1949e9bf1
commit a9e0ea54cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
testbench_wb.v
View File

@ -87,7 +87,6 @@ module picorv32_wrapper #(
wb_ram #( wb_ram #(
.depth (16384 * 4), .depth (16384 * 4),
.memfile ("firmware/firmware.hex"),
.VERBOSE (VERBOSE) .VERBOSE (VERBOSE)
) ram ( // Wishbone interface ) ram ( // Wishbone interface
.wb_clk_i(wb_clk), .wb_clk_i(wb_clk),
@ -139,6 +138,13 @@ module picorv32_wrapper #(
.wbm_sel_o(wb_m2s_sel) .wbm_sel_o(wb_m2s_sel)
); );
reg [1023:0] firmware_file;
initial begin
if (!$value$plusargs("firmware=%s", firmware_file))
firmware_file = "firmware/firmware.hex";
$readmemh(firmware_file, ram.mem);
end
integer cycle_counter; integer cycle_counter;
always @(posedge wb_clk) begin always @(posedge wb_clk) begin
cycle_counter <= !wb_rst ? cycle_counter + 1 : 0; cycle_counter <= !wb_rst ? cycle_counter + 1 : 0;
@ -160,6 +166,25 @@ module picorv32_wrapper #(
end end
endmodule endmodule
/* ISC License
*
* Verilog on-chip RAM with Wishbone interface
*
* Copyright (C) 2014, 2016 Olof Kindgren <olof.kindgren@gmail.com>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
module wb_ram #( module wb_ram #(
parameter depth = 256, parameter depth = 256,
parameter memfile = "", parameter memfile = "",