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

Merge pull request #42 from ucb-bar/chisel3

Browse Source 
Chisel 3 support
This commit is contained in:
Andrew Waterman 2016-02-05 16:01:35 -08:00
commit 70945953a8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/Testing.scala
View File

@ -136,8 +136,8 @@ object TestGenerator extends App with FileSystemUtilities {
Class.forName(s"$projectName.$configClassName").newInstance.asInstanceOf[Config] Class.forName(s"$projectName.$configClassName").newInstance.asInstanceOf[Config]
} catch { } catch {
case e: java.lang.ClassNotFoundException => case e: java.lang.ClassNotFoundException =>
throwException(s"Could not find the cde.Config subclass you asked for " + throwException("Unable to find configClassName \"" + configClassName +
"(i.e. \"$configClassName\"), did you misspell it?", e) "\", did you misspell it?", e)
} }
val world = config.toInstance val world = config.toInstance
val paramsFromConfig: Parameters = Parameters.root(world) val paramsFromConfig: Parameters = Parameters.root(world)
@ -165,7 +165,7 @@ object TestGenerator extends App with FileSystemUtilities {
val v = createOutputFile(configClassName + ".knb") val v = createOutputFile(configClassName + ".knb")
v.write(world.getKnobs) v.write(world.getKnobs)
v.close v.close
val d = new java.io.FileOutputStream(Driver.targetDir + configClassName + ".dtb") val d = new java.io.FileOutputStream(Driver.targetDir + "/" + configClassName + ".dtb")
d.write(paramsFromConfig(DeviceTree)) d.write(paramsFromConfig(DeviceTree))
d.close d.close
val w = createOutputFile(configClassName + ".cst") val w = createOutputFile(configClassName + ".cst")

2
src/main/scala/Vlsi.scala
View File

@ -11,7 +11,7 @@ class MemDessert(topParams: Parameters) extends Module {
implicit val p = topParams implicit val p = topParams
val io = new MemDesserIO(p(HtifKey).width) val io = new MemDesserIO(p(HtifKey).width)
val x = Module(new MemDesser(p(HtifKey).width)) val x = Module(new MemDesser(p(HtifKey).width))
io.narrow <> x.io.narrow x.io.narrow <> io.narrow
io.wide <> x.io.wide io.wide <> x.io.wide
} }