aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <git@yannherklotz.com>2021-10-14 12:20:03 +0100
committerYann Herklotz <git@yannherklotz.com>2021-10-14 12:20:03 +0100
commitfe06668f0de56635efe55310d7a64289a37c1d90 (patch)
tree8b63e7453940109dc1bbccf97769fbe785106fce
parentfe42fed367f54b81021107473499465296db41c8 (diff)
downloadvericert-fe06668f0de56635efe55310d7a64289a37c1d90.tar.gz
vericert-fe06668f0de56635efe55310d7a64289a37c1d90.zip
[sched] Fix passes with new predicates
-rw-r--r--src/hls/HTLPargen.v3
-rw-r--r--src/hls/RTLPargen.v1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/hls/HTLPargen.v b/src/hls/HTLPargen.v
index 47e9467..64996c6 100644
--- a/src/hls/HTLPargen.v
+++ b/src/hls/HTLPargen.v
@@ -655,11 +655,12 @@ Definition add_control_instr_force (n : node) (st : stmnt) : mon unit :=
(AssocMap.set n st s.(st_controllogic)))
(add_control_instr_force_state_incr s n st).
-
Fixpoint pred_expr (preg: reg) (p: pred_op) :=
match p with
| Pvar pred =>
Vrange preg (Vlit (posToValue pred)) (Vlit (posToValue pred))
+ | Ptrue => Vlit (ZToValue 1)
+ | Pfalse => Vlit (ZToValue 0)
| Pnot pred =>
Vunop Vnot (pred_expr preg pred)
| Pand p1 p2 =>
diff --git a/src/hls/RTLPargen.v b/src/hls/RTLPargen.v
index 3cc9a57..13d9480 100644
--- a/src/hls/RTLPargen.v
+++ b/src/hls/RTLPargen.v
@@ -33,6 +33,7 @@ Require Import vericert.hls.RTLBlockInstr.
Require Import vericert.hls.Abstr.
#[local] Open Scope positive.
+#[local] Open Scope forest.
(*Parameter op_le : Op.operation -> Op.operation -> bool.
Parameter chunk_le : AST.memory_chunk -> AST.memory_chunk -> bool.