diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-07-19 18:25:09 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-07-19 18:25:09 +0200 |
| commit | 3b79923a6c9fa8c76916df1eecfdecd7ae2124a5 (patch) | |
| tree | 98b27b88ea7195a244eff90eaa5f63028ad518a6 /arm/SelectOp.vp | |
| parent | 9bc337d05eed466e2bfc9b18aa35fac34d3954a9 (diff) | |
| parent | 91381b65f5aa76e5195caae9ef331b3f5f95afaf (diff) | |
| download | compcert-kvx-3b79923a6c9fa8c76916df1eecfdecd7ae2124a5.tar.gz compcert-kvx-3b79923a6c9fa8c76916df1eecfdecd7ae2124a5.zip | |
Merge branch 'master' of https://github.com/AbsInt/CompCert into mppa-work-upstream-merge
Diffstat (limited to 'arm/SelectOp.vp')
| -rw-r--r-- | arm/SelectOp.vp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arm/SelectOp.vp b/arm/SelectOp.vp index e3ef3eaf..ed4c2c95 100644 --- a/arm/SelectOp.vp +++ b/arm/SelectOp.vp @@ -38,12 +38,8 @@ Require Import Coqlib. Require Import Compopts. -Require Import AST. -Require Import Integers. -Require Import Floats. -Require Import Op. -Require Import OpHelpers. -Require Import CminorSel. +Require Import AST Integers Floats Builtins. +Require Import Op OpHelpers CminorSel. Local Open Scope cminorsel_scope. @@ -520,9 +516,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 |