improve simulation egornomics a bit

bs/Util.bs

@@ -1,24 +1,37 @@
 package Util(
   (|>),
-  BasicResult(..),
-  simulate_for) where
+  terminateSimNoError,
+  terminateSimWithError,
+  dynamicAssert
+  ) where
+
+import CBindings
 
 infixr 0 |>
 
-data BasicResult = Success
-                 | Failure
-                 deriving (Bits, Eq, FShow)
-
 (|>) :: (a -> b) -> a -> b
 f |> x = f x;
 
-simulate_for :: (Bits a n, Arith a, Eq a) => Reg a -> Reg a -> Rules
-simulate_for curr_cycle end_cycle =
-  rules
-    "count_cycle_rule": when True ==> action
-      curr_cycle := curr_cycle + 1
-      if curr_cycle == end_cycle
-        then
-          $finish
-        else
-          $display "cycle = " curr_cycle
+assertMessage :: String -> String -> String
+assertMessage which mess =
+  letseq pos = getStringPosition mess -- get position of original message literal
+  in (which +++" assertion failed: " +++ printPosition pos +++ mess)
+
+dynamicAssert :: Bool -> String -> Action
+dynamicAssert = if not testAssert then (\ _ _ -> noAction)
+                else (\ b s -> if b then noAction else
+                        action
+                          $display (assertMessage "Dynamic" s)
+                          restoreTerminal
+                          $finish 1
+                     )
+
+terminateSimNoError :: Action
+terminateSimNoError = do
+  restoreTerminal
+  $finish 0
+
+terminateSimWithError :: Action
+terminateSimWithError = do
+  restoreTerminal
+  $finish 1