vtimofei
/
LF-Building-a-RISC-V-CPU-Core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add data memory and implement store/load

This commit is contained in:
Victor Timofei 2022-01-16 21:48:31 +02:00
parent d2b945d974
commit ff0ec641d2
Signed by: vtimofei
GPG Key ID: B790DCEBE281403A
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
risc-v_shell.tlv
View File

@ -115,7 +115,6 @@
// Treat all load and store instructions the same // Treat all load and store instructions the same
$is_load = $dec_bits ==? 11'bx_xxx_000_0011; $is_load = $dec_bits ==? 11'bx_xxx_000_0011;
$is_s_instr = $dec_bits ==? 11'bx_xxx_010_0011;
// Compute whether to branch // Compute whether to branch
$taken_br = $is_beq ? $src1_value == $src2_value : $taken_br = $is_beq ? $src1_value == $src2_value :
@ -168,6 +167,8 @@
{31'b0, $src1_value[31]} ) : {31'b0, $src1_value[31]} ) :
$is_sra ? $sra_rslt[31:0] : $is_sra ? $sra_rslt[31:0] :
$is_srai ? $srai_rslt[31:0] : $is_srai ? $srai_rslt[31:0] :
$is_load ? $src1_value + $imm :
$is_s_instr ? $src1_value + $imm :
32'b0; 32'b0;
// Assert these to end simulation (before Makerchip cycle limit). // Assert these to end simulation (before Makerchip cycle limit).
@ -175,8 +176,9 @@
*failed = *cyc_cnt > M4_MAX_CYC; *failed = *cyc_cnt > M4_MAX_CYC;
// Register file // Register file
m4+rf(32, 32, $reset, $rd_valid, $rd[4:0], $result, $rs1_valid, $rs1[4:0], $src1_value, $rs2_valid, $rs2[4:0], $src2_value) $rf_data[31:0] = $is_load ? $ld_data : $result;
//m4+dmem(32, 32, $reset, $addr[4:0], $wr_en, $wr_data[31:0], $rd_en, $rd_data) m4+rf(32, 32, $reset, $rd_valid, $rd[4:0], $rf_data, $rs1_valid, $rs1[4:0], $src1_value, $rs2_valid, $rs2[4:0], $src2_value)
m4+dmem(32, 32, $reset, $result[4:0], $is_s_instr, $src2_value, $is_load, $ld_data)
m4+cpu_viz() m4+cpu_viz()
\SV \SV
endmodule endmodule