diff options
author | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2010-05-10 15:35:02 +0000 |
---|---|---|
committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2010-05-10 15:35:02 +0000 |
commit | 7999c9ee1f09f7d555e3efc39f030564f76a3354 (patch) | |
tree | 6f7937811f9331e3a5f5cdaa59be899c0daf71d3 /backend/Machabstr2concr.v | |
parent | df80f5b3745b5d85cbf42601f9532618c063d703 (diff) | |
download | compcert-7999c9ee1f09f7d555e3efc39f030564f76a3354.tar.gz compcert-7999c9ee1f09f7d555e3efc39f030564f76a3354.zip |
- Extended traces so that pointers within globals are supported as event values.
- Revised handling of volatile reads: the execution environment
dictates the value read, via the trace of events.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1345 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'backend/Machabstr2concr.v')
-rw-r--r-- | backend/Machabstr2concr.v | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/backend/Machabstr2concr.v b/backend/Machabstr2concr.v index b766ed0d..b8232971 100644 --- a/backend/Machabstr2concr.v +++ b/backend/Machabstr2concr.v @@ -407,12 +407,12 @@ Qed. (** [frame_match] is preserved by external calls. *) Lemma frame_match_external_call: - forall fr sp base mm ms mm' ms' ef vargs vres t vargs' vres', + forall symb fr sp base mm ms mm' ms' ef vargs vres t vargs' vres', frame_match fr sp base mm ms -> Mem.extends mm ms -> - external_call ef vargs mm t vres mm' -> + external_call ef symb vargs mm t vres mm' -> Mem.extends mm' ms' -> - external_call ef vargs' ms t vres' ms' -> + external_call ef symb vargs' ms t vres' ms' -> mem_unchanged_on (loc_out_of_bounds mm) ms ms' -> frame_match fr sp base mm' ms'. Proof. @@ -420,7 +420,7 @@ Proof. eapply external_call_valid_block; eauto. eapply external_call_valid_block; eauto. auto. - rewrite (external_call_bounds _ _ _ _ _ _ _ H1); auto. + rewrite (external_call_bounds _ _ _ _ _ _ _ _ H1); auto. red; intros. apply A; auto. red. omega. intros. exploit fm_contents_match0; eauto. intros [v [C D]]. exists v; split; auto. @@ -814,9 +814,9 @@ Lemma match_stacks_external_call: match_stacks s ts mm ms -> forall ef vargs t vres mm' ms' vargs' vres', Mem.extends mm ms -> - external_call ef vargs mm t vres mm' -> + external_call ef (Genv.find_symbol ge) vargs mm t vres mm' -> Mem.extends mm' ms' -> - external_call ef vargs' ms t vres' ms' -> + external_call ef (Genv.find_symbol ge) vargs' ms t vres' ms' -> mem_unchanged_on (loc_out_of_bounds mm) ms ms' -> match_stacks s ts mm' ms'. Proof. |