aboutsummaryrefslogtreecommitdiffstats
path: root/powerpc/SelectOp.vp
diff options
context:
space:
mode:
Diffstat (limited to 'powerpc/SelectOp.vp')
-rw-r--r--powerpc/SelectOp.vp18
1 files changed, 18 insertions, 0 deletions
diff --git a/powerpc/SelectOp.vp b/powerpc/SelectOp.vp
index ba6612e8..07c325c1 100644
--- a/powerpc/SelectOp.vp
+++ b/powerpc/SelectOp.vp
@@ -38,8 +38,17 @@
Require Import Coqlib.
Require Import Compopts.
+<<<<<<< HEAD
+Require Import AST.
+Require Import Integers.
+Require Import Floats.
+Require Import Op.
+Require Import CminorSel.
+Require Import OpHelpers.
+=======
Require Import AST Integers Floats Builtins.
Require Import Op CminorSel.
+>>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf
Require Archi.
Local Open Scope cminorsel_scope.
@@ -564,7 +573,16 @@ 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