colin
/
picorv32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small improvements in vivado_soc demo

This commit is contained in:
Clifford Wolf 2015-06-08 19:58:28 +02:00
parent 072e5ca2c5
commit 0257d2cb08
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/vivado/synth_vivado_soc.v
View File

@ -11,7 +11,8 @@ module test_soc (
output [31:0] monitor_addr, output [31:0] monitor_addr,
output [31:0] monitor_data output [31:0] monitor_data
); );
parameter MEM_SIZE = 64*1024/4; // 4096 32bit words = 16kB memory
parameter MEM_SIZE = 4096;
wire mem_valid; wire mem_valid;
wire mem_instr; wire mem_instr;
@ -50,16 +51,14 @@ module test_soc (
assign monitor_data = mem_wstrb ? mem_wdata : mem_rdata; assign monitor_data = mem_wstrb ? mem_wdata : mem_rdata;
reg [31:0] memory [0:MEM_SIZE-1]; reg [31:0] memory [0:MEM_SIZE-1];
initial $readmemh("../firmware/firmware.hex", memory); initial $readmemh("firmware.hex", memory);
assign mem_ready = 1; assign mem_ready = 1;
assign out_byte = mem_wdata[7:0]; assign out_byte = mem_wdata[7:0];
always @(posedge clk) begin always @(posedge clk) begin
out_byte_en <= 0; out_byte_en <= 0;
if (mem_la_read)
mem_rdata <= memory[mem_la_addr >> 2]; mem_rdata <= memory[mem_la_addr >> 2];
else
if (mem_la_write && (mem_la_addr >> 2) < MEM_SIZE) begin if (mem_la_write && (mem_la_addr >> 2) < MEM_SIZE) begin
if (mem_la_wstrb[0]) memory[mem_la_addr >> 2][ 7: 0] <= mem_la_wdata[ 7: 0]; if (mem_la_wstrb[0]) memory[mem_la_addr >> 2][ 7: 0] <= mem_la_wdata[ 7: 0];
if (mem_la_wstrb[1]) memory[mem_la_addr >> 2][15: 8] <= mem_la_wdata[15: 8]; if (mem_la_wstrb[1]) memory[mem_la_addr >> 2][15: 8] <= mem_la_wdata[15: 8];