From 1fceb8fa72e5113f77f16df28d9034cd17015ef9 Mon Sep 17 00:00:00 2001
From: Jonathan Woodruff <jdw57@cam.ac.uk>
Date: Mon, 25 Jul 2022 11:27:55 +0000
Subject: [PATCH] Use standard imports as the fixes have been upstreamed.

---
 src_Core/RISCY_OOO/fpgautils/lib/XilinxIntDiv.bsv | 2 +-
 src_Core/RISCY_OOO/procs/lib/Fpu.bsv              | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src_Core/RISCY_OOO/fpgautils/lib/XilinxIntDiv.bsv b/src_Core/RISCY_OOO/fpgautils/lib/XilinxIntDiv.bsv
index ed8587e..14d690f 100644
--- a/src_Core/RISCY_OOO/fpgautils/lib/XilinxIntDiv.bsv
+++ b/src_Core/RISCY_OOO/fpgautils/lib/XilinxIntDiv.bsv
@@ -2,7 +2,7 @@ import FIFOF::*;
 import FIFO::*;
 
 import WaitAutoReset::*;
-import NonPipelinedMath::*;
+import Divide::*;
 import ClientServer::*;
 import GetPut::*;
 
diff --git a/src_Core/RISCY_OOO/procs/lib/Fpu.bsv b/src_Core/RISCY_OOO/procs/lib/Fpu.bsv
index fd61e18..37e72f0 100644
--- a/src_Core/RISCY_OOO/procs/lib/Fpu.bsv
+++ b/src_Core/RISCY_OOO/procs/lib/Fpu.bsv
@@ -48,9 +48,8 @@ import FIFO::*;
 import FIFOF::*;
 import ClientServer::*;
 import GetPut::*;
-//import Divide::*;
-//import SquareRoot::*;
-import NonPipelinedMath :: *;
+import Divide::*;
+import SquareRoot::*;
 import FloatingPoint::*;
 import XilinxFpu::*;
 import HasSpecBits::*;