brendanhaines/cpu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly flushes pipeline after jump

Browse Source
This commit is contained in:
Brendan Haines
2020-11-06 23:18:37 -07:00
parent c25b9bcb0f
commit 1290418aa3
4 changed files with 126 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
sim/core_tb.wcfg
View File

@@ -187,6 +187,10 @@
<wvobject fp_name="group4" type="group">
<obj_property name="label">IF</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject fp_name="/core_tb/dut/s_if_stall" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_if_stall</obj_property>
<obj_property name="ObjectShortName">s_if_stall</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/r_if_pc" type="array" db_ref_id="1">
<obj_property name="ElementShortName">r_if_pc[31:0]</obj_property>
<obj_property name="ObjectShortName">r_if_pc[31:0]</obj_property>
@@ -202,17 +206,17 @@
<obj_property name="ObjectShortName">s_if_inst[31:0]</obj_property>
<obj_property name="Radix">HEXRADIX</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_if_halt" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_if_halt</obj_property>
<obj_property name="ObjectShortName">s_if_halt</obj_property>
</wvobject>
</wvobject>
<wvobject fp_name="group5" type="group">
<obj_property name="label">ID</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject fp_name="/core_tb/dut/r_id_stall" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">r_id_stall</obj_property>
<obj_property name="ObjectShortName">r_id_stall</obj_property>
<wvobject fp_name="/core_tb/dut/r_id_valid" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">r_id_valid</obj_property>
<obj_property name="ObjectShortName">r_id_valid</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_id_stall" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_id_stall</obj_property>
<obj_property name="ObjectShortName">s_id_stall</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/r_id_pc" type="array" db_ref_id="1">
<obj_property name="ElementShortName">r_id_pc[31:0]</obj_property>
@@ -265,10 +269,6 @@
<obj_property name="ElementShortName">s_id_aluop[3:0]</obj_property>
<obj_property name="ObjectShortName">s_id_aluop[3:0]</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_id_alu_seed" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_id_alu_seed</obj_property>
<obj_property name="ObjectShortName">s_id_alu_seed</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_id_jump" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_id_jump</obj_property>
<obj_property name="ObjectShortName">s_id_jump</obj_property>
@@ -277,17 +277,17 @@
<obj_property name="ElementShortName">s_id_invalid</obj_property>
<obj_property name="ObjectShortName">s_id_invalid</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_id_halt" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_id_halt</obj_property>
<obj_property name="ObjectShortName">s_id_halt</obj_property>
</wvobject>
</wvobject>
<wvobject fp_name="group6" type="group">
<obj_property name="label">EX</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject fp_name="/core_tb/dut/r_ex_stall" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">r_ex_stall</obj_property>
<obj_property name="ObjectShortName">r_ex_stall</obj_property>
<wvobject fp_name="/core_tb/dut/r_ex_valid" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">r_ex_valid</obj_property>
<obj_property name="ObjectShortName">r_ex_valid</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_ex_stall" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_ex_stall</obj_property>
<obj_property name="ObjectShortName">s_ex_stall</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/r_ex_pc" type="array" db_ref_id="1">
<obj_property name="ElementShortName">r_ex_pc[31:0]</obj_property>
@@ -318,10 +318,6 @@
<obj_property name="ElementShortName">r_ex_aluop[3:0]</obj_property>
<obj_property name="ObjectShortName">r_ex_aluop[3:0]</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/r_ex_alu_seed" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">r_ex_alu_seed</obj_property>
<obj_property name="ObjectShortName">r_ex_alu_seed</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_ex_data1" type="array" db_ref_id="1">
<obj_property name="ElementShortName">s_ex_data1[31:0]</obj_property>
<obj_property name="ObjectShortName">s_ex_data1[31:0]</obj_property>
@@ -345,17 +341,17 @@
<obj_property name="ElementShortName">r_ex_jump</obj_property>
<obj_property name="ObjectShortName">r_ex_jump</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_ex_halt" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_ex_halt</obj_property>
<obj_property name="ObjectShortName">s_ex_halt</obj_property>
</wvobject>
</wvobject>
<wvobject fp_name="group7" type="group">
<obj_property name="label">MEM</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject fp_name="/core_tb/dut/r_mem_stall" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">r_mem_stall</obj_property>
<obj_property name="ObjectShortName">r_mem_stall</obj_property>
<wvobject fp_name="/core_tb/dut/r_mem_valid" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">r_mem_valid</obj_property>
<obj_property name="ObjectShortName">r_mem_valid</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_mem_stall" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_mem_stall</obj_property>
<obj_property name="ObjectShortName">s_mem_stall</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/r_mem_pc" type="array" db_ref_id="1">
<obj_property name="ElementShortName">r_mem_pc[31:0]</obj_property>
@@ -381,17 +377,17 @@
<obj_property name="ElementShortName">r_mem_alu_zero</obj_property>
<obj_property name="ObjectShortName">r_mem_alu_zero</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_mem_halt" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_mem_halt</obj_property>
<obj_property name="ObjectShortName">s_mem_halt</obj_property>
</wvobject>
</wvobject>
<wvobject fp_name="group8" type="group">
<obj_property name="label">WB</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject fp_name="/core_tb/dut/r_wb_stall" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">r_wb_stall</obj_property>
<obj_property name="ObjectShortName">r_wb_stall</obj_property>
<wvobject fp_name="/core_tb/dut/r_wb_valid" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">r_wb_valid</obj_property>
<obj_property name="ObjectShortName">r_wb_valid</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_wb_stall" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_wb_stall</obj_property>
<obj_property name="ObjectShortName">s_wb_stall</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/r_wb_pc" type="array" db_ref_id="1">
<obj_property name="ElementShortName">r_wb_pc[31:0]</obj_property>
@@ -418,9 +414,5 @@
<obj_property name="ObjectShortName">s_wb_data[31:0]</obj_property>
<obj_property name="Radix">HEXRADIX</obj_property>
</wvobject>
<wvobject fp_name="/core_tb/dut/s_wb_halt" type="logic" db_ref_id="1">
<obj_property name="ElementShortName">s_wb_halt</obj_property>
<obj_property name="ObjectShortName">s_wb_halt</obj_property>
</wvobject>
</wvobject>
</wave_config>