From fa75f6e81ed9d0e2c159bc6a6a6eba95f5394a2b Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@eecs.berkeley.edu>
Date: Tue, 4 Mar 2014 16:32:09 -0800
Subject: [PATCH] Fix null pointer exception when HAS_FPU=false

---
 rocket/src/main/scala/core.scala | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/rocket/src/main/scala/core.scala b/rocket/src/main/scala/core.scala
index cd8b694c..23fc00a5 100644
--- a/rocket/src/main/scala/core.scala
+++ b/rocket/src/main/scala/core.scala
@@ -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)
 }