github.com/antonblanchard.microwatt
1
0
Fork 0
mirror of https://github.com/antonblanchard/microwatt.git synced 2026-04-10 06:27:29 +00:00
Code Releases Activity

Merge pull request #163 from paulusmack/excpath

Browse Source 
Fix the bug causing the assert that Mikey hit
This commit is contained in:
Anton Blanchard
2020-04-23 19:49:24 +10:00
committed by GitHub
parent 2b11c81b18 dc6b1df653
commit b6bd1ba33d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
execute1.vhdl
View File

@@ -248,6 +248,7 @@ begin
v := r;
v.e := Execute1ToWritebackInit;
lv := Execute1ToLoadstore1Init;
-- XER forwarding. To avoid having to track XER hazards, we
-- use the previously latched value.
@@ -773,6 +774,7 @@ begin
when OP_LOAD | OP_STORE =>
-- loadstore/dcache has its own port to writeback
v.e.valid := '0';
lv.valid := '1';
when others =>
terminate_out <= '1';
@@ -865,10 +867,6 @@ begin
v.e.write_enable := result_en;
-- Outputs to loadstore1 (async)
lv := Execute1ToLoadstore1Init;
if e_in.valid = '1' and (e_in.insn_type = OP_LOAD or e_in.insn_type = OP_STORE) then
lv.valid := '1';
end if;
if e_in.insn_type = OP_LOAD then
lv.load := '1';
end if;