diff options
author | Xavier Leroy <xavier.leroy@inria.fr> | 2017-06-15 15:11:26 +0200 |
---|---|---|
committer | Bernhard Schommer <bschommer@users.noreply.github.com> | 2017-07-06 15:41:51 +0200 |
commit | dff22ef6d855973e0e0f05c7203a6bfa9a4cf01a (patch) | |
tree | 82c09b8cff023557084d6257acdef84b1311dd35 /common/Events.v | |
parent | 92fc8a425034abc1247203a4c0d471e8b6d0e941 (diff) | |
download | compcert-dff22ef6d855973e0e0f05c7203a6bfa9a4cf01a.tar.gz compcert-dff22ef6d855973e0e0f05c7203a6bfa9a4cf01a.zip |
Extend builtin arguments with a pointer addition operator
This extension enables more addressing modes to be encoded as builtin arguments and used in conjunction with volatile memory accesses.
Current status: x86 port only, the only new addressing mode handled is reg + offset.
Diffstat (limited to 'common/Events.v')
-rw-r--r-- | common/Events.v | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/common/Events.v b/common/Events.v index 14cd27c5..ab804aa7 100644 --- a/common/Events.v +++ b/common/Events.v @@ -1555,7 +1555,11 @@ Inductive eval_builtin_arg: builtin_arg A -> val -> Prop := eval_builtin_arg (BA_addrglobal id ofs) (Senv.symbol_address ge id ofs) | eval_BA_splitlong: forall hi lo vhi vlo, eval_builtin_arg hi vhi -> eval_builtin_arg lo vlo -> - eval_builtin_arg (BA_splitlong hi lo) (Val.longofwords vhi vlo). + eval_builtin_arg (BA_splitlong hi lo) (Val.longofwords vhi vlo) + | eval_BA_addptr: forall a1 a2 v1 v2, + eval_builtin_arg a1 v1 -> eval_builtin_arg a2 v2 -> + eval_builtin_arg (BA_addptr a1 a2) + (if Archi.ptr64 then Val.addl v1 v2 else Val.add v1 v2). Definition eval_builtin_args (al: list (builtin_arg A)) (vl: list val) : Prop := list_forall2 eval_builtin_arg al vl. @@ -1565,6 +1569,7 @@ Lemma eval_builtin_arg_determ: Proof. induction 1; intros v' EV; inv EV; try congruence. f_equal; eauto. + apply IHeval_builtin_arg1 in H3. apply IHeval_builtin_arg2 in H5. subst; auto. Qed. Lemma eval_builtin_args_determ: @@ -1637,6 +1642,10 @@ Proof. - destruct IHeval_builtin_arg1 as (vhi' & P & Q). destruct IHeval_builtin_arg2 as (vlo' & R & S). econstructor; split; eauto with barg. apply Val.longofwords_lessdef; auto. +- destruct IHeval_builtin_arg1 as (vhi' & P & Q). + destruct IHeval_builtin_arg2 as (vlo' & R & S). + econstructor; split; eauto with barg. + destruct Archi.ptr64; auto using Val.add_lessdef, Val.addl_lessdef. Qed. Lemma eval_builtin_args_lessdef: |