From 5530915001c3e8b395d731480e5a6618a08af7af Mon Sep 17 00:00:00 2001 From: Léo Gourdin Date: Tue, 2 Nov 2021 10:57:22 +0100 Subject: being more archi-independant --- backend/Deadcodeproof.v | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'backend/Deadcodeproof.v') diff --git a/backend/Deadcodeproof.v b/backend/Deadcodeproof.v index 305e8eeb..be64a1a7 100644 --- a/backend/Deadcodeproof.v +++ b/backend/Deadcodeproof.v @@ -822,9 +822,8 @@ Ltac UseTransfer := intros. apply nlive_add with bc i; assumption. intros (tv & P & Q). econstructor; split. - eapply exec_Iload; eauto. eapply has_loaded_normal; eauto. - rewrite <- U. apply eval_addressing_preserved. exact symbols_preserved. - eauto. + try (eapply exec_Iload; eauto; eapply has_loaded_normal; eauto; + [ rewrite <- U; apply eval_addressing_preserved; exact symbols_preserved | eauto]). eapply match_succ_states; eauto. simpl; auto. apply eagree_update; eauto 2 with na. eapply magree_monotone; eauto. intros. apply incl_nmem_add; auto. @@ -851,10 +850,8 @@ Ltac UseTransfer := destruct (Mem.loadv chunk tm ta) eqn:Hchunk2. { econstructor; split. - eapply exec_Iload. eauto. eapply has_loaded_normal; eauto. - erewrite eval_addressing_preserved with (ge1 := ge). - assumption. - exact symbols_preserved. + try (eapply exec_Iload; eauto; eapply has_loaded_normal; eauto; + erewrite eval_addressing_preserved with (ge1 := ge); [ assumption | exact symbols_preserved]). eapply match_succ_states; eauto. simpl; auto. apply eagree_update; eauto 2 with na. eapply magree_monotone; eauto. intros. apply incl_nmem_add; auto. -- cgit