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

Fix null pointer exception when HAS_FPU=false

Browse Source
This commit is contained in:
Andrew Waterman
2014-03-04 16:32:09 -08:00
parent c7110c8389
commit fa75f6e81e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rocket/src/main/scala/core.scala
View File

@@ -21,12 +21,13 @@ class Core(implicit conf: RocketConfiguration) extends Module
val ctrl = Module(new Control)
val dpath = Module(new Datapath)
val fpu: FPU = if (!conf.fpu.isEmpty) {
if (!conf.fpu.isEmpty) {
val fpu = Module(new FPU(conf.fpu.get))
dpath.io.fpu <> fpu.io.dpath
ctrl.io.fpu <> fpu.io.ctrl
fpu
} else null
fpu.io.sfma.valid := Bool(false)
fpu.io.dfma.valid := Bool(false)
}
ctrl.io.dpath <> dpath.io.ctrl
dpath.io.host <> io.host
@@ -41,7 +42,4 @@ class Core(implicit conf: RocketConfiguration) extends Module
ctrl.io.rocc <> io.rocc
dpath.io.rocc <> io.rocc
fpu.io.sfma.valid := Bool(false)
fpu.io.dfma.valid := Bool(false)
}