diff options
author | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2021-12-01 13:18:32 +0100 |
---|---|---|
committer | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2021-12-01 14:53:56 +0100 |
commit | a781244930ababd25e40c40e8df8bd437f3fbf8c (patch) | |
tree | b5222bc32623c7ec58c66178f22afc3c9a2e065f /backend | |
parent | 20cdd9c6c3962f7bec5c85719cfa7b0ee22f0100 (diff) | |
parent | a79f0f99831aa0b0742bf7cce459cc9353bd7cd0 (diff) | |
download | compcert-kvx-a781244930ababd25e40c40e8df8bd437f3fbf8c.tar.gz compcert-kvx-a781244930ababd25e40c40e8df8bd437f3fbf8c.zip |
Merge remote-tracking branch 'absint/master' into towards_3.10
Mostly changes in PTree
Diffstat (limited to 'backend')
-rw-r--r-- | backend/CSEdomain.v | 2 | ||||
-rw-r--r-- | backend/ValueDomain.v | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backend/CSEdomain.v b/backend/CSEdomain.v index 9641d012..3fee2db6 100644 --- a/backend/CSEdomain.v +++ b/backend/CSEdomain.v @@ -149,7 +149,7 @@ Proof. - split; simpl; intros. + contradiction. + rewrite PTree.gempty in H; discriminate. - + rewrite PMap.gi in H; contradiction. + + contradiction. - contradiction. - rewrite PTree.gempty in H; discriminate. Qed. diff --git a/backend/ValueDomain.v b/backend/ValueDomain.v index 5a7cfc12..7a55147b 100644 --- a/backend/ValueDomain.v +++ b/backend/ValueDomain.v @@ -3900,7 +3900,7 @@ Lemma ablock_init_sound: forall m b p, smatch m b p -> bmatch m b (ablock_init p). Proof. intros; split; auto; intros. - unfold ablock_load, ablock_init; simpl. rewrite ZTree.gempty. + unfold ablock_load, ablock_init; simpl. eapply vnormalize_cast; eauto. eapply H; eauto. Qed. @@ -5020,7 +5020,7 @@ Lemma ematch_init: ematch (init_regs vl rl) (einit_regs rl). Proof. induction rl; simpl; intros. -- red; intros. rewrite Regmap.gi. simpl AE.get. rewrite PTree.gempty. +- red; intros. rewrite Regmap.gi. simpl. constructor. - destruct vl as [ | v1 vs ]. + assert (ematch (init_regs nil rl) (einit_regs rl)). |