diff options
Diffstat (limited to 'src/VeriFuzz/Simulator')
| -rw-r--r-- | src/VeriFuzz/Simulator/Icarus.hs | 8 | ||||
| -rw-r--r-- | src/VeriFuzz/Simulator/Xst.hs | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/VeriFuzz/Simulator/Icarus.hs b/src/VeriFuzz/Simulator/Icarus.hs index 443f096..fdb1ad6 100644 --- a/src/VeriFuzz/Simulator/Icarus.hs +++ b/src/VeriFuzz/Simulator/Icarus.hs @@ -38,15 +38,11 @@ defaultIcarus = Icarus "iverilog" "vvp" addDisplay :: [Stmnt] -> [Stmnt] addDisplay s = concat $ transpose - [ s - , replicate l $ TimeCtrl 1 Nothing - , replicate l . SysTaskEnable $ Task "display" ["%h", Id "y"] - ] + [s, replicate l $ TimeCtrl 1 Nothing, replicate l . SysTaskEnable $ Task "display" ["%h", Id "y"]] where l = length s assignFunc :: [Port] -> ByteString -> Stmnt -assignFunc inp bs = - NonBlockAssign . Assign conc Nothing . Number (B.length bs * 4) $ bsToI bs +assignFunc inp bs = NonBlockAssign . Assign conc Nothing . Number (B.length bs * 4) $ bsToI bs where conc = RegConcat (portToExpr <$> inp) runSimIcarus :: Icarus -> ModDecl -> [ByteString] -> Sh Int diff --git a/src/VeriFuzz/Simulator/Xst.hs b/src/VeriFuzz/Simulator/Xst.hs index 3209caf..1a0763c 100644 --- a/src/VeriFuzz/Simulator/Xst.hs +++ b/src/VeriFuzz/Simulator/Xst.hs @@ -33,8 +33,8 @@ instance Synthesize Xst where runSynth = runSynthXst defaultXst :: Xst -defaultXst = Xst "/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/xst" - "/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/netgen" +defaultXst = + Xst "/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/xst" "/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/netgen" -- brittany-disable-next-binding runSynthXst :: Xst -> ModDecl -> FilePath -> Sh () |