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

Fix compilation with scala 2.11.6

Browse Source 
We forgot to specify return types on overloaded methods, and a previous
version of the scala compiler failed to flag this as an error.
This commit is contained in:
Andrew Waterman 2015-07-28 16:24:45 -07:00
parent f8ec6d6393
commit a69c749249
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
uncore/src/main/scala/cache.scala
View File

@ -441,13 +441,13 @@ abstract class L2XactTracker extends XactTracker with L2HellaCacheParameters {
def connectInternalDataBeatCounter[T <: HasL2BeatAddr]( def connectInternalDataBeatCounter[T <: HasL2BeatAddr](
in: DecoupledIO[T], in: DecoupledIO[T],
beat: UInt = UInt(0), beat: UInt = UInt(0),
full_block: Bool = Bool(true)) = { full_block: Bool = Bool(true)): (UInt, Bool) = {
connectDataBeatCounter(in.fire(), in.bits, beat, full_block) connectDataBeatCounter(in.fire(), in.bits, beat, full_block)
} }
def connectInternalDataBeatCounter[T <: HasL2Data]( def connectInternalDataBeatCounter[T <: HasL2Data](
in: ValidIO[T], in: ValidIO[T],
full_block: Bool = Bool(true)) = { full_block: Bool): Bool = {
connectDataBeatCounter(in.valid, in.bits, UInt(0), full_block)._2 connectDataBeatCounter(in.valid, in.bits, UInt(0), full_block)._2
} }