From 2db9ee12bc401afa4117d9f4bebcfde6d5f41e19 Mon Sep 17 00:00:00 2001 From: Rimas Avizienis Date: Fri, 4 Nov 2011 15:57:08 -0700 Subject: [PATCH] fixed eret instruction, hello world runs --- rocket/src/main/scala/ctrl.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocket/src/main/scala/ctrl.scala b/rocket/src/main/scala/ctrl.scala index 73aaa4b9..a13abaf0 100644 --- a/rocket/src/main/scala/ctrl.scala +++ b/rocket/src/main/scala/ctrl.scala @@ -338,8 +338,8 @@ class rocketCtrl extends Component io.dpath.mem_load := mem_cmd_load; io.dpath.sel_pc := - Mux(replay_mem || mem_reg_privileged, PC_MEM4, Mux(io.dpath.exception || mem_reg_eret, PC_PCR, + Mux(replay_mem || mem_reg_privileged, PC_MEM4, Mux(replay_ex, PC_EX, Mux(!ex_reg_btb_hit && br_taken, PC_BR, Mux(ex_reg_btb_hit && !br_taken, PC_EX4,