diff options
author | Xavier Leroy <xavier.leroy@college-de-france.fr> | 2019-06-01 08:48:20 +0200 |
---|---|---|
committer | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2019-06-06 10:58:13 +0200 |
commit | 26775b65ba98ad798fc72c92ae73bd28609aaeb8 (patch) | |
tree | 3ce9d296ac90df9c2397bb4cf3925f42338667cd | |
parent | 37bc5d7c21278a0f5cab9a2f61bdacd7f5a4d4fb (diff) | |
download | compcert-26775b65ba98ad798fc72c92ae73bd28609aaeb8.tar.gz compcert-26775b65ba98ad798fc72c92ae73bd28609aaeb8.zip |
ARM: select is not supported at type Tlong
-rw-r--r-- | arm/SelectOp.vp | 9 | ||||
-rw-r--r-- | arm/SelectOpproof.v | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/arm/SelectOp.vp b/arm/SelectOp.vp index 61ea6283..d04832d6 100644 --- a/arm/SelectOp.vp +++ b/arm/SelectOp.vp @@ -383,7 +383,14 @@ Definition compfs (c: comparison) (e1: expr) (e2: expr) := Eop (Ocmp (Ccompfs c)) (e1 ::: e2 ::: Enil). Definition select (ty: typ) (cond: condition) (args: exprlist) (e1 e2: expr) := - Some (Eop (Osel cond ty) (e1 ::: e2 ::: args)). + if match ty with + | Tint => true + | Tfloat => true + | Tsingle => true + | _ => false + end + then Some (Eop (Osel cond ty) (e1 ::: e2 ::: args)) + else None. (** ** Integer conversions *) diff --git a/arm/SelectOpproof.v b/arm/SelectOpproof.v index f281f7ce..8b546971 100644 --- a/arm/SelectOpproof.v +++ b/arm/SelectOpproof.v @@ -746,7 +746,9 @@ Theorem eval_select: eval_expr ge sp e m le a v /\ Val.lessdef (Val.select (Some b) v1 v2 ty) v. Proof. - unfold select; intros; inv H. rewrite <- H3; TrivialExists. + unfold select; intros. + destruct (match ty with Tint | Tfloat | Tsingle => true | _ => false end); inv H. + rewrite <- H3; TrivialExists. Qed. Theorem eval_cast8signed: unary_constructor_sound cast8signed (Val.sign_ext 8). |