1
0

fixed eret instruction, hello world runs

This commit is contained in:
Rimas Avizienis 2011-11-04 15:57:08 -07:00
parent 4459935554
commit 2db9ee12bc

View File

@ -338,8 +338,8 @@ class rocketCtrl extends Component
io.dpath.mem_load := mem_cmd_load; io.dpath.mem_load := mem_cmd_load;
io.dpath.sel_pc := io.dpath.sel_pc :=
Mux(replay_mem || mem_reg_privileged, PC_MEM4,
Mux(io.dpath.exception || mem_reg_eret, PC_PCR, Mux(io.dpath.exception || mem_reg_eret, PC_PCR,
Mux(replay_mem || mem_reg_privileged, PC_MEM4,
Mux(replay_ex, PC_EX, Mux(replay_ex, PC_EX,
Mux(!ex_reg_btb_hit && br_taken, PC_BR, Mux(!ex_reg_btb_hit && br_taken, PC_BR,
Mux(ex_reg_btb_hit && !br_taken, PC_EX4, Mux(ex_reg_btb_hit && !br_taken, PC_EX4,