aboutsummaryrefslogtreecommitdiffstats
path: root/riscV/SelectOp.vp
diff options
context:
space:
mode:
Diffstat (limited to 'riscV/SelectOp.vp')
-rw-r--r--riscV/SelectOp.vp9
1 files changed, 9 insertions, 0 deletions
diff --git a/riscV/SelectOp.vp b/riscV/SelectOp.vp
index 99806006..23235d95 100644
--- a/riscV/SelectOp.vp
+++ b/riscV/SelectOp.vp
@@ -452,7 +452,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