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

config: remove deprecated Parameters.root

Browse Source
This commit is contained in:
Henry Cook 2017-10-25 11:54:47 -07:00
parent 46751bedeb
commit bd50a1a4bc
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/config/Config.scala
View File

@ -40,9 +40,8 @@ abstract class Parameters extends View {
} }
object Parameters { object Parameters {
def empty: Parameters = new EmptyParameters def empty: Parameters = new EmptyParameters
def apply(f: (View, View, View) => PartialFunction[Any,Any]): Parameters = new PartialParameters(f) def apply(f: (View, View, View) => PartialFunction[Any,Any]): Parameters = new PartialParameters(f)
def root(p: Parameters) = p
} }
class Config(p: Parameters) extends Parameters { class Config(p: Parameters) extends Parameters {

5
src/main/scala/util/GeneratorUtils.scala
View File

@ -43,7 +43,7 @@ trait HasGeneratorUtilities {
def getParameters(names: ParsedInputNames): Parameters = getParameters(getConfig(names)) def getParameters(names: ParsedInputNames): Parameters = getParameters(getConfig(names))
def getParameters(config: Config): Parameters = Parameters.root(config.toInstance) def getParameters(config: Config): Parameters = config.toInstance
def elaborate(names: ParsedInputNames, params: Parameters): Circuit = { def elaborate(names: ParsedInputNames, params: Parameters): Circuit = {
val gen = () => val gen = () =>
@ -97,8 +97,7 @@ trait GeneratorApp extends App with HasGeneratorUtilities {
// Canonical ways of building various JVM elaboration-time structures // Canonical ways of building various JVM elaboration-time structures
lazy val td = names.targetDir lazy val td = names.targetDir
lazy val config = getConfig(names) lazy val config = getConfig(names)
lazy val world = config.toInstance lazy val params = config.toInstance
lazy val params = Parameters.root(world)
lazy val circuit = elaborate(names, params) lazy val circuit = elaborate(names, params)
val longName: String // Exhaustive name used to interface with external build tool targets val longName: String // Exhaustive name used to interface with external build tool targets