From 4c379d48b35e7c8156f3953fede31d5e47faf8ca Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Fri, 19 Jul 2019 18:59:44 +0200 Subject: helpers broke compilation --- riscV/SelectOp.vp | 4 +--- riscV/SelectOpproof.v | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'riscV') diff --git a/riscV/SelectOp.vp b/riscV/SelectOp.vp index 23235d95..e9920e46 100644 --- a/riscV/SelectOp.vp +++ b/riscV/SelectOp.vp @@ -452,16 +452,14 @@ Nondetfunction builtin_arg (e: expr) := | _ => BA e end. -<<<<<<< HEAD (* floats *) Definition divf_base (e1: expr) (e2: expr) := Eop Odivf (e1 ::: e2 ::: Enil). Definition divfs_base (e1: expr) (e2: expr) := Eop Odivfs (e1 ::: e2 ::: Enil). -======= + (** Platform-specific known builtins *) Definition platform_builtin (b: platform_builtin) (args: exprlist) : option expr := None. ->>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf diff --git a/riscV/SelectOpproof.v b/riscV/SelectOpproof.v index ca271342..52a535fb 100644 --- a/riscV/SelectOpproof.v +++ b/riscV/SelectOpproof.v @@ -933,8 +933,6 @@ Proof. - constructor; auto. Qed. -<<<<<<< HEAD - (* floating-point division without HELPERS *) Theorem eval_divf_base: forall le a b x y, @@ -955,7 +953,7 @@ Proof. intros; unfold divfs_base. TrivialExists. Qed. -======= + (** Platform-specific known builtins *) Theorem eval_platform_builtin: @@ -968,5 +966,4 @@ Proof. intros. discriminate. Qed. ->>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf End CMCONSTR. -- cgit