riscv
/
rocket-chip
1
0
Fork 0
Code Releases Activity

Merge 'origin/master' into auto-plusargs

This commit is contained in:
Schuyler Eldridge 2018-01-16 15:45:53 -05:00
parent 04af785a5f 80ca018e3a
commit 355d3b15e8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csrc/verilator.h
View File

@ -12,7 +12,7 @@ class VerilatedVcdFILE : public VerilatedVcdFile {
public: public:
VerilatedVcdFILE(FILE* file) : file(file) {} VerilatedVcdFILE(FILE* file) : file(file) {}
~VerilatedVcdFILE() {} ~VerilatedVcdFILE() {}
bool open(const string& name) override { bool open(const std::string& name) override {
// file should already be open // file should already be open
return file != NULL; return file != NULL;
} }

2
src/main/scala/rocket/BusErrorUnit.scala
View File

@ -12,6 +12,7 @@ import freechips.rocketchip.diplomacy._
import freechips.rocketchip.regmapper._ import freechips.rocketchip.regmapper._
import freechips.rocketchip.tilelink._ import freechips.rocketchip.tilelink._
import freechips.rocketchip.interrupts._ import freechips.rocketchip.interrupts._
import freechips.rocketchip.util.property._
trait BusErrors extends Bundle { trait BusErrors extends Bundle {
def toErrorList: List[Option[Valid[UInt]]] def toErrorList: List[Option[Valid[UInt]]]
@ -59,6 +60,7 @@ class BusErrorUnit[T <: BusErrors](t: => T, params: BusErrorUnitParams)(implicit
cause := i cause := i
value := s.get.bits value := s.get.bits
} }
cover(en, s"BusErrorCause_$i", s"Core;;BusErrorCause $i covered")
} }
} }