From 983669aa390c4cc1aaf6e4bee914d1a7de9a58e4 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Thu, 10 Jan 2019 18:56:58 +0000 Subject: Fix all the warnings --- src/VeriFuzz/Simulator/Xst.hs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/VeriFuzz/Simulator/Xst.hs') diff --git a/src/VeriFuzz/Simulator/Xst.hs b/src/VeriFuzz/Simulator/Xst.hs index 902b244..16e9b97 100644 --- a/src/VeriFuzz/Simulator/Xst.hs +++ b/src/VeriFuzz/Simulator/Xst.hs @@ -15,8 +15,6 @@ Xst (ise) simulator implementation. module VeriFuzz.Simulator.Xst where import Control.Lens hiding ((<.>)) -import Data.Text (Text) -import qualified Data.Text as T import Prelude hiding (FilePath) import Shelly import Text.Shakespeare.Text (st) @@ -38,7 +36,7 @@ defaultXst :: Xst defaultXst = Xst "/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/xst" "/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/netgen" runSynthXst :: Xst -> ModDecl -> FilePath -> Sh () -runSynthXst sim mod outf = do +runSynthXst sim m outf = do writefile xstFile [st|run -ifn #{modName}.prj -ofn #{modName} -p artix7 -top #{modName} -iobuf NO -ram_extract NO -rom_extract NO -use_dsp48 NO @@ -46,13 +44,12 @@ runSynthXst sim mod outf = do -change_error_to_warning "HDLCompiler:226 HDLCompiler:1832" |] writefile prjFile [st|verilog work "rtl.v"|] - writefile "rtl.v" $ genSource mod + writefile "rtl.v" $ genSource m timeout_ (xstPath sim) ["-ifn", toTextIgnore xstFile] run_ (netgenPath sim) ["-w", "-ofmt", "verilog", toTextIgnore $ modFile <.> "ngc", toTextIgnore outf] run_ "sed" ["-i", "/^`ifndef/,/^`endif/ d; s/ *Timestamp: .*//;", toTextIgnore outf] where - modName = mod ^. moduleId . getIdentifier + modName = m ^. moduleId . getIdentifier modFile = fromText modName xstFile = modFile <.> "xst" prjFile = modFile <.> "prj" - vFile = modFile <.> "v" -- cgit