diff options
Diffstat (limited to 'x86/SelectOp.vp')
| -rw-r--r-- | x86/SelectOp.vp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/x86/SelectOp.vp b/x86/SelectOp.vp index d734ecc6..a23c37d5 100644 --- a/x86/SelectOp.vp +++ b/x86/SelectOp.vp @@ -40,11 +40,8 @@ Require Import Coqlib. Require Import Compopts. Require Import AST Integers Floats Builtins. Require Import Op CminorSel. -<<<<<<< HEAD Require Import OpHelpers. -======= Require Archi. ->>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf Local Open Scope cminorsel_scope. @@ -580,16 +577,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 |