diff options
author | Yann Herklotz <git@yannherklotz.com> | 2021-10-18 17:05:46 +0100 |
---|---|---|
committer | Yann Herklotz <git@yannherklotz.com> | 2021-10-18 17:05:46 +0100 |
commit | fbfa988072ce2eba808b9a6631af5f8e86cd9df0 (patch) | |
tree | 5146e558d5c9c6e9a399225eed0784b8dc12558f /src/hls/HTLPargen.v | |
parent | 603768a49eac2005729dd03e723ff6c5a6b292f7 (diff) | |
parent | fe06668f0de56635efe55310d7a64289a37c1d90 (diff) | |
download | vericert-fbfa988072ce2eba808b9a6631af5f8e86cd9df0.tar.gz vericert-fbfa988072ce2eba808b9a6631af5f8e86cd9df0.zip |
Merge branch 'master' into dev/michalisdev/michalis
Diffstat (limited to 'src/hls/HTLPargen.v')
-rw-r--r-- | src/hls/HTLPargen.v | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/hls/HTLPargen.v b/src/hls/HTLPargen.v index d292722..b4291ea 100644 --- a/src/hls/HTLPargen.v +++ b/src/hls/HTLPargen.v @@ -33,11 +33,11 @@ Require Import vericert.hls.RTLPar. Require Import vericert.hls.ValueInt. Require Import vericert.hls.Verilog. -Hint Resolve AssocMap.gempty : htlh. -Hint Resolve AssocMap.gso : htlh. -Hint Resolve AssocMap.gss : htlh. -Hint Resolve Ple_refl : htlh. -Hint Resolve Ple_succ : htlh. +#[local] Hint Resolve AssocMap.gempty : htlh. +#[local] Hint Resolve AssocMap.gso : htlh. +#[local] Hint Resolve AssocMap.gss : htlh. +#[local] Hint Resolve Ple_refl : htlh. +#[local] Hint Resolve Ple_succ : htlh. Definition assignment : Type := expr -> expr -> stmnt. @@ -74,10 +74,10 @@ Module HTLState <: State. s1.(st_controllogic)!n = None \/ s2.(st_controllogic)!n = s1.(st_controllogic)!n) -> st_incr s1 s2. - Hint Constructors st_incr : htlh. + #[local] Hint Constructors st_incr : htlh. Definition st_prop := st_incr. - Hint Unfold st_prop : htlh. + #[local] Hint Unfold st_prop : htlh. Lemma st_refl : forall s, st_prop s s. Proof. auto with htlh. Qed. @@ -129,7 +129,7 @@ Lemma declare_reg_state_incr : s.(st_arrdecls) s.(st_datapath) s.(st_controllogic)). -Proof. auto with htlh. Qed. +Proof. Admitted. Definition declare_reg (i : option io) (r : reg) (sz : nat) : mon unit := fun s => OK tt (mkstate @@ -641,9 +641,9 @@ Definition add_control_instr_force_state_incr : s.(st_arrdecls) s.(st_datapath) (AssocMap.set n st s.(st_controllogic))). -Abort. +Admitted. -(*Definition add_control_instr_force (n : node) (st : stmnt) : mon unit := +Definition add_control_instr_force (n : node) (st : stmnt) : mon unit := fun s => OK tt (mkstate s.(st_st) @@ -658,7 +658,9 @@ Abort. Fixpoint pred_expr (preg: reg) (p: pred_op) := match p with | Pvar pred => - Vrange preg (Vlit (natToValue pred)) (Vlit (natToValue 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 => @@ -707,7 +709,7 @@ Lemma create_new_state_state_incr: s.(st_arrdecls) s.(st_datapath) s.(st_controllogic)). -Abort. +Admitted. Definition create_new_state (p: node): mon node := fun s => OK s.(st_freshstate) @@ -875,4 +877,3 @@ Definition transl_program (p : RTLBlockInstr.program) : Errors.res HTL.program : if main_is_internal p then transform_partial_program transl_fundef p else Errors.Error (Errors.msg "Main function is not Internal."). -*) |