diff options
author | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2011-04-09 16:59:13 +0000 |
---|---|---|
committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2011-04-09 16:59:13 +0000 |
commit | abe2bb5c40260a31ce5ee27b841bcbd647ff8b88 (patch) | |
tree | ae109a136508da283a9e2be5f039c5f9cca4f95c /backend/Lineartyping.v | |
parent | ffd6080f9e1e742c73ac38354b31c6fc4e3963ba (diff) | |
download | compcert-kvx-abe2bb5c40260a31ce5ee27b841bcbd647ff8b88.tar.gz compcert-kvx-abe2bb5c40260a31ce5ee27b841bcbd647ff8b88.zip |
Merge of branch "unsigned-offsets":
- In pointer values "Vptr b ofs", interpret "ofs" as an unsigned int.
(Fixes issue with wrong comparison of pointers across 0x8000_0000)
- Revised Stacking pass to not use negative SP offsets.
- Add pointer validity checks to Cminor ... Mach
to support the use of memory injections in Stacking.
- Cleaned up Stacklayout modules.
- IA32: improved code generation for Mgetparam.
- ARM: improved code generation for op-immediate instructions.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1632 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'backend/Lineartyping.v')
-rw-r--r-- | backend/Lineartyping.v | 69 |
1 files changed, 66 insertions, 3 deletions
diff --git a/backend/Lineartyping.v b/backend/Lineartyping.v index 4ea2ea95..ef6194c0 100644 --- a/backend/Lineartyping.v +++ b/backend/Lineartyping.v @@ -16,10 +16,10 @@ Require Import Coqlib. Require Import Maps. Require Import AST. Require Import Integers. -Require Import Memdata. +Require Import Values. Require Import Op. -Require Import RTL. Require Import Locations. +Require Import LTL. Require Import Linear. Require Import Conventions. @@ -106,7 +106,7 @@ Inductive wt_instr : instruction -> Prop := | wt_Ljumptable: forall arg tbl, mreg_type arg = Tint -> - list_length_z tbl * 4 <= Int.max_signed -> + list_length_z tbl * 4 <= Int.max_unsigned -> wt_instr (Ljumptable arg tbl) | wt_Lreturn: wt_instr (Lreturn). @@ -129,3 +129,66 @@ Inductive wt_fundef: fundef -> Prop := Definition wt_program (p: program) : Prop := forall i f, In (i, f) (prog_funct p) -> wt_fundef f. +(** Typing the run-time state. These definitions are used in [Stackingproof]. *) + +Require Import Values. + +Definition wt_locset (ls: locset) : Prop := + forall l, Val.has_type (ls l) (Loc.type l). + +Lemma wt_setloc: + forall ls l v, + Val.has_type v (Loc.type l) -> wt_locset ls -> wt_locset (Locmap.set l v ls). +Proof. + intros; red; intros. + unfold Locmap.set. + destruct (Loc.eq l l0). congruence. + destruct (Loc.overlap l l0). red. auto. + auto. +Qed. + +Lemma wt_undef_temps: + forall ls, wt_locset ls -> wt_locset (undef_temps ls). +Proof. + unfold undef_temps. generalize temporaries. induction l; simpl; intros. + auto. + apply IHl. apply wt_setloc; auto. red; auto. +Qed. + +Lemma wt_undef_op: + forall op ls, wt_locset ls -> wt_locset (undef_op op ls). +Proof. + intros. generalize (wt_undef_temps ls H); intro. case op; simpl; auto. +Qed. + +Lemma wt_undef_getstack: + forall s ls, wt_locset ls -> wt_locset (undef_getstack s ls). +Proof. + intros. unfold undef_getstack. destruct s; auto. apply wt_setloc; auto. red; auto. +Qed. + +Lemma wt_call_regs: + forall ls, wt_locset ls -> wt_locset (call_regs ls). +Proof. + intros; red; intros. unfold call_regs. destruct l. auto. + destruct (in_dec Loc.eq (R m) temporaries). red; auto. auto. + destruct s. red; auto. + change (Loc.type (S (Incoming z t))) with (Loc.type (S (Outgoing z t))). auto. + red; auto. +Qed. + +Lemma wt_return_regs: + forall caller callee, + wt_locset caller -> wt_locset callee -> wt_locset (return_regs caller callee). +Proof. + intros; red; intros. + unfold return_regs. destruct l; auto. + destruct (in_dec Loc.eq (R m) temporaries); auto. + destruct (in_dec Loc.eq (R m) destroyed_at_call); auto. +Qed. + +Lemma wt_init: + wt_locset (Locmap.init Vundef). +Proof. + red; intros. unfold Locmap.init. red; auto. +Qed. |