Merge remote-tracking branch 'origin/master' into rocc-fpu-port

2015-10-22 16:38:28 -07:00
parent 942f6a7d7f 0c587704a7
commit 652fb393a3
15 changed files with 15 additions and 1 deletions
--- 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