diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2015-10-11 10:16:51 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2015-10-11 10:16:51 +0200 |
| commit | 9a62a6663a25c74c537f79bfc767f75fd4994181 (patch) | |
| tree | c92c3c2a881a54208ad4f63295daec0dd6836c02 /flocq/Prop/Fprop_mult_error.v | |
| parent | 378ac3925503e6efd24cc34796e85d95c031e72d (diff) | |
| parent | 659b735ed2dbefcbe8bcb2ec2123b66019ddaf14 (diff) | |
| download | compcert-9a62a6663a25c74c537f79bfc767f75fd4994181.tar.gz compcert-9a62a6663a25c74c537f79bfc767f75fd4994181.zip | |
Merge branch 'master' into ppc64
Resolved conflicts in:configure powerpc/Asmexpand.ml
Diffstat (limited to 'flocq/Prop/Fprop_mult_error.v')
| -rw-r--r-- | flocq/Prop/Fprop_mult_error.v | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/flocq/Prop/Fprop_mult_error.v b/flocq/Prop/Fprop_mult_error.v index e84e80b4..7c71627b 100644 --- a/flocq/Prop/Fprop_mult_error.v +++ b/flocq/Prop/Fprop_mult_error.v @@ -126,8 +126,9 @@ apply Zplus_le_compat_r. rewrite ln_beta_unique with (1 := Hexy). apply ln_beta_le_bpow with (1 := Hz). replace (bpow (exy - prec)) with (ulp beta (FLX_exp prec) (x * y)). -apply ulp_error... -unfold ulp, canonic_exp. +apply error_lt_ulp... +rewrite ulp_neq_0; trivial. +unfold canonic_exp. now rewrite ln_beta_unique with (1 := Hexy). apply Hc1. reflexivity. |