aboutsummaryrefslogtreecommitdiffstats
path: root/backend
diff options
context:
space:
mode:
authorDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2020-04-01 09:15:28 +0200
committerDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2020-04-01 09:15:28 +0200
commitaedaa5cb1435008d1d872b7d6687bec5843798a0 (patch)
treea232723633ef95ae15d5222f0d407b6ec012c065 /backend
parent82c4699c8d5dd12e29b79045b6b8d2daf573ac91 (diff)
downloadcompcert-kvx-aedaa5cb1435008d1d872b7d6687bec5843798a0.tar.gz
compcert-kvx-aedaa5cb1435008d1d872b7d6687bec5843798a0.zip
adapting new stuff for ARM and AArch64
Diffstat (limited to 'backend')
-rw-r--r--backend/FirstNopproof.v17
-rw-r--r--backend/Injectproof.v15
2 files changed, 14 insertions, 18 deletions
diff --git a/backend/FirstNopproof.v b/backend/FirstNopproof.v
index 5d9a7d6a..a5d63c25 100644
--- a/backend/FirstNopproof.v
+++ b/backend/FirstNopproof.v
@@ -168,26 +168,25 @@ Proof.
+ constructor; auto with firstnop.
- left. econstructor. split.
+ eapply plus_one. eapply exec_Iload with (v:=v); eauto with firstnop.
- rewrite <- H0.
- apply eval_addressing_preserved.
- apply symbols_preserved.
+ all: rewrite <- H0.
+ all: auto using eval_addressing_preserved, symbols_preserved.
+ constructor; auto with firstnop.
- left. econstructor. split.
+ eapply plus_one. eapply exec_Iload_notrap1; eauto with firstnop.
- rewrite <- H0.
- apply eval_addressing_preserved.
+ all: rewrite <- H0;
+ apply eval_addressing_preserved;
apply symbols_preserved.
+ constructor; auto with firstnop.
- left. econstructor. split.
+ eapply plus_one. eapply exec_Iload_notrap2; eauto with firstnop.
- rewrite <- H0.
- apply eval_addressing_preserved.
+ all: rewrite <- H0;
+ apply eval_addressing_preserved;
apply symbols_preserved.
+ constructor; auto with firstnop.
- left. econstructor. split.
+ eapply plus_one. eapply exec_Istore; eauto with firstnop.
- rewrite <- H0.
- apply eval_addressing_preserved.
+ all: rewrite <- H0;
+ apply eval_addressing_preserved;
apply symbols_preserved.
+ constructor; auto with firstnop.
- left. econstructor. split.
diff --git a/backend/Injectproof.v b/backend/Injectproof.v
index 1dd26a24..77cae8a1 100644
--- a/backend/Injectproof.v
+++ b/backend/Injectproof.v
@@ -778,23 +778,20 @@ Section INJECTOR.
* exists (trs # res <- v).
split.
** apply exec_Iload with (trap := NOTRAP) (chunk := chunk) (addr := addr) (args := args) (dst := res) (a := a); trivial.
- rewrite eval_addressing_preserved with (ge1 := ge).
- assumption.
- exact symbols_preserved.
+ all: try rewrite eval_addressing_preserved with (ge1 := ge).
+ all: auto using symbols_preserved.
** apply assign_above; auto.
* exists (trs # res <- Vundef).
split.
** apply exec_Iload_notrap2 with (chunk := chunk) (addr := addr) (args := args) (dst := res) (a := a); trivial.
- rewrite eval_addressing_preserved with (ge1 := ge).
- assumption.
- exact symbols_preserved.
+ all: rewrite eval_addressing_preserved with (ge1 := ge).
+ all: auto using symbols_preserved.
** apply assign_above; auto.
+ exists (trs # res <- Vundef).
split.
* apply exec_Iload_notrap1 with (chunk := chunk) (addr := addr) (args := args) (dst := res); trivial.
- rewrite eval_addressing_preserved with (ge1 := ge).
- assumption.
- exact symbols_preserved.
+ all: rewrite eval_addressing_preserved with (ge1 := ge).
+ all: auto using symbols_preserved.
* apply assign_above; auto.
Qed.