Merge remote-tracking branch 'origin/master' into hwacha-port

2014-02-06 00:21:28 -08:00
parent ff7cae29f7 62e9313aef
commit f021213b1d
3 changed files with 39 additions and 1 deletions
--- a/rocket/src/main/scala/dpath.scala
+++ b/rocket/src/main/scala/dpath.scala
@ -193,6 +193,7 @@ class Datapath(implicit conf: RocketConfiguration) extends Module
  pcr.io.rocc <> io.rocc
  pcr.io.pc := wb_reg_pc
  io.ctrl.csr_replay := pcr.io.replay
+  pcr.io.uarch_counters.foreach(_ := Bool(false))

  io.ptw.ptbr := pcr.io.ptbr
  io.ptw.invalidate := pcr.io.fatc