From bcc3050c9120287c48e3c3294e0eea8b99dd61cc Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Thu, 7 Oct 2021 19:49:11 +0100 Subject: Fix naming and remove warnings --- src/hls/HTLPargen.v | 14 +++++++------- src/hls/RTLBlockInstr.v | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/hls/HTLPargen.v b/src/hls/HTLPargen.v index 9746f92..06b3fcb 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. diff --git a/src/hls/RTLBlockInstr.v b/src/hls/RTLBlockInstr.v index 8d3fde4..5162b38 100644 --- a/src/hls/RTLBlockInstr.v +++ b/src/hls/RTLBlockInstr.v @@ -348,9 +348,9 @@ Fixpoint init_regs (vl: list val) (rl: list reg) {struct rl} : regset := end. Record instr_state := mk_instr_state { - instr_st_regset: regset; - instr_st_predset: predset; - instr_st_mem: mem; + is_rs: regset; + is_ps: predset; + is_mem: mem; }. Section DEFINITION. -- cgit