From 4f8468b60f69a83cdc99330fab21e93507cdb307 Mon Sep 17 00:00:00 2001 From: Henry Cook Date: Wed, 21 Oct 2015 18:18:32 -0700 Subject: [PATCH] depend on external cde library --- rocket/src/main/scala/arbiter.scala | 1 + rocket/src/main/scala/btb.scala | 1 + rocket/src/main/scala/csr.scala | 1 + rocket/src/main/scala/dpath_alu.scala | 1 + rocket/src/main/scala/fpu.scala | 1 + rocket/src/main/scala/frontend.scala | 1 + rocket/src/main/scala/icache.scala | 1 + rocket/src/main/scala/nbdcache.scala | 1 + rocket/src/main/scala/ptw.scala | 1 + rocket/src/main/scala/rocc.scala | 1 + rocket/src/main/scala/rocket.scala | 1 + rocket/src/main/scala/tile.scala | 1 + rocket/src/main/scala/tlb.scala | 1 + rocket/src/main/scala/util.scala | 1 + 14 files changed, 14 insertions(+) diff --git a/rocket/src/main/scala/arbiter.scala b/rocket/src/main/scala/arbiter.scala index 14f20735..27bfcc86 100644 --- a/rocket/src/main/scala/arbiter.scala +++ b/rocket/src/main/scala/arbiter.scala @@ -4,6 +4,7 @@ package rocket import Chisel._ import uncore._ +import cde.{Parameters, Field} class HellaCacheArbiter(n: Int)(implicit p: Parameters) extends Module { diff --git a/rocket/src/main/scala/btb.scala b/rocket/src/main/scala/btb.scala index 84295f27..3aa1b6a6 100644 --- a/rocket/src/main/scala/btb.scala +++ b/rocket/src/main/scala/btb.scala @@ -4,6 +4,7 @@ package rocket import Chisel._ import junctions._ +import cde.{Parameters, Field} import Util._ case object BtbKey extends Field[BtbParameters] diff --git a/rocket/src/main/scala/csr.scala b/rocket/src/main/scala/csr.scala index a6862b45..5898941c 100644 --- a/rocket/src/main/scala/csr.scala +++ b/rocket/src/main/scala/csr.scala @@ -5,6 +5,7 @@ package rocket import Chisel._ import Util._ import Instructions._ +import cde.{Parameters, Field} import uncore._ import scala.math._ diff --git a/rocket/src/main/scala/dpath_alu.scala b/rocket/src/main/scala/dpath_alu.scala index 5142c611..58942266 100644 --- a/rocket/src/main/scala/dpath_alu.scala +++ b/rocket/src/main/scala/dpath_alu.scala @@ -3,6 +3,7 @@ package rocket import Chisel._ +import cde.{Parameters, Field} import Instructions._ object ALU diff --git a/rocket/src/main/scala/fpu.scala b/rocket/src/main/scala/fpu.scala index c456413c..e5582ebc 100644 --- a/rocket/src/main/scala/fpu.scala +++ b/rocket/src/main/scala/fpu.scala @@ -7,6 +7,7 @@ import Instructions._ import Util._ import FPConstants._ import uncore.constants.MemoryOpConstants._ +import cde.{Parameters, Field} case object SFMALatency case object DFMALatency diff --git a/rocket/src/main/scala/frontend.scala b/rocket/src/main/scala/frontend.scala index 15fb6266..0886625e 100644 --- a/rocket/src/main/scala/frontend.scala +++ b/rocket/src/main/scala/frontend.scala @@ -3,6 +3,7 @@ package rocket import Chisel._ import uncore._ import Util._ +import cde.{Parameters, Field} class FrontendReq(implicit p: Parameters) extends CoreBundle()(p) { val pc = UInt(width = vaddrBitsExtended) diff --git a/rocket/src/main/scala/icache.scala b/rocket/src/main/scala/icache.scala index cea6b122..a56354ae 100644 --- a/rocket/src/main/scala/icache.scala +++ b/rocket/src/main/scala/icache.scala @@ -3,6 +3,7 @@ package rocket import Chisel._ import uncore._ import Util._ +import cde.{Parameters, Field} trait HasL1CacheParameters extends HasCacheParameters with HasCoreParameters { val outerDataBeats = p(TLKey(p(TLId))).dataBeats diff --git a/rocket/src/main/scala/nbdcache.scala b/rocket/src/main/scala/nbdcache.scala index 7b6d4a11..2223ade0 100644 --- a/rocket/src/main/scala/nbdcache.scala +++ b/rocket/src/main/scala/nbdcache.scala @@ -5,6 +5,7 @@ package rocket import Chisel._ import uncore._ import junctions._ +import cde.{Parameters, Field} import Util._ case object WordBits extends Field[Int] diff --git a/rocket/src/main/scala/ptw.scala b/rocket/src/main/scala/ptw.scala index 6f1d8534..1a551bda 100644 --- a/rocket/src/main/scala/ptw.scala +++ b/rocket/src/main/scala/ptw.scala @@ -5,6 +5,7 @@ package rocket import Chisel._ import uncore._ import Util._ +import cde.{Parameters, Field} class PTWReq(implicit p: Parameters) extends CoreBundle()(p) { val addr = UInt(width = vpnBits) diff --git a/rocket/src/main/scala/rocc.scala b/rocket/src/main/scala/rocc.scala index ebec55be..ff059811 100644 --- a/rocket/src/main/scala/rocc.scala +++ b/rocket/src/main/scala/rocc.scala @@ -5,6 +5,7 @@ package rocket import Chisel._ import uncore._ import Util._ +import cde.{Parameters, Field} case object RoccMaxTaggedMemXacts extends Field[Int] case object RoccNMemChannels extends Field[Int] diff --git a/rocket/src/main/scala/rocket.scala b/rocket/src/main/scala/rocket.scala index 041e4de4..6c245cf5 100644 --- a/rocket/src/main/scala/rocket.scala +++ b/rocket/src/main/scala/rocket.scala @@ -6,6 +6,7 @@ import Chisel._ import junctions._ import uncore._ import Util._ +import cde.{Parameters, Field} case object UseFPU extends Field[Boolean] case object FDivSqrt extends Field[Boolean] diff --git a/rocket/src/main/scala/tile.scala b/rocket/src/main/scala/tile.scala index ce29b18e..c5e3e851 100644 --- a/rocket/src/main/scala/tile.scala +++ b/rocket/src/main/scala/tile.scala @@ -5,6 +5,7 @@ package rocket import Chisel._ import uncore._ import Util._ +import cde.{Parameters, Field} case object CoreName extends Field[String] case object BuildRoCC extends Field[Option[Parameters => RoCC]] diff --git a/rocket/src/main/scala/tlb.scala b/rocket/src/main/scala/tlb.scala index ee624896..8c6f9528 100644 --- a/rocket/src/main/scala/tlb.scala +++ b/rocket/src/main/scala/tlb.scala @@ -6,6 +6,7 @@ import Chisel._ import Util._ import junctions._ import scala.math._ +import cde.{Parameters, Field} case object NTLBEntries extends Field[Int] diff --git a/rocket/src/main/scala/util.scala b/rocket/src/main/scala/util.scala index 2ac3a0b8..4050be5b 100644 --- a/rocket/src/main/scala/util.scala +++ b/rocket/src/main/scala/util.scala @@ -5,6 +5,7 @@ package rocket import Chisel._ import uncore._ import scala.math._ +import cde.{Parameters, Field} object Util { implicit def intToUInt(x: Int): UInt = UInt(x)