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 /common | |
| 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 'common')
| -rw-r--r-- | common/Globalenvs.v | 9 | ||||
| -rw-r--r-- | common/Memory.v | 11 |
2 files changed, 1 insertions, 19 deletions
diff --git a/common/Globalenvs.v b/common/Globalenvs.v index 4c9e7889..f424a69d 100644 --- a/common/Globalenvs.v +++ b/common/Globalenvs.v @@ -265,15 +265,6 @@ Qed. Program Definition empty_genv (pub: list ident): t := @mkgenv pub (PTree.empty _) (PTree.empty _) 1%positive _ _ _. -Next Obligation. - rewrite PTree.gempty in H. discriminate. -Qed. -Next Obligation. - rewrite PTree.gempty in H. discriminate. -Qed. -Next Obligation. - rewrite PTree.gempty in H. discriminate. -Qed. Definition globalenv (p: program F V) := add_globals (empty_genv p.(prog_public)) p.(prog_defs). diff --git a/common/Memory.v b/common/Memory.v index ff17efb0..e243d475 100644 --- a/common/Memory.v +++ b/common/Memory.v @@ -348,15 +348,6 @@ Program Definition empty: mem := mkmem (PMap.init (ZMap.init Undef)) (PMap.init (fun ofs k => None)) 1%positive _ _ _. -Next Obligation. - repeat rewrite PMap.gi. red; auto. -Qed. -Next Obligation. - rewrite PMap.gi. auto. -Qed. -Next Obligation. - rewrite PMap.gi. auto. -Qed. (** Allocation of a fresh block with the given bounds. Return an updated memory state and the address of the fresh block, which initially contains @@ -675,7 +666,7 @@ Proof. reflexivity. Qed. Theorem perm_empty: forall b ofs k p, ~perm empty b ofs k p. Proof. - intros. unfold perm, empty; simpl. rewrite PMap.gi. simpl. tauto. + intros. unfold perm, empty; simpl. tauto. Qed. Theorem valid_access_empty: forall chunk b ofs p, ~valid_access empty chunk b ofs p. |