diff options
author | Xavier Leroy <xavier.leroy@inria.fr> | 2016-07-08 14:43:57 +0200 |
---|---|---|
committer | Xavier Leroy <xavier.leroy@inria.fr> | 2016-07-08 14:43:57 +0200 |
commit | e73d5db97cdb22cce2ee479469f62af3c4b6264a (patch) | |
tree | 035d31018c2abec698eb49a205c60bbf5c24ba0d /arm/Archi.v | |
parent | db2445b3b745abd1a26f5a832a29ca269c725277 (diff) | |
download | compcert-e73d5db97cdb22cce2ee479469f62af3c4b6264a.tar.gz compcert-e73d5db97cdb22cce2ee479469f62af3c4b6264a.zip |
Port to Coq 8.5pl2
Manual merging of branch jhjourdan:coq8.5.
No other change un functionality.
Diffstat (limited to 'arm/Archi.v')
-rw-r--r-- | arm/Archi.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm/Archi.v b/arm/Archi.v index e4abf009..6b282022 100644 --- a/arm/Archi.v +++ b/arm/Archi.v @@ -26,7 +26,7 @@ Notation align_int64 := 8%Z (only parsing). Notation align_float64 := 8%Z (only parsing). Program Definition default_pl_64 : bool * nan_pl 53 := - (false, nat_iter 51 xO xH). + (false, iter_nat 51 _ xO xH). Definition choose_binop_pl_64 (s1: bool) (pl1: nan_pl 53) (s2: bool) (pl2: nan_pl 53) := (** Choose second NaN if pl2 is sNaN but pl1 is qNan. @@ -35,7 +35,7 @@ Definition choose_binop_pl_64 (s1: bool) (pl1: nan_pl 53) (s2: bool) (pl2: nan_p negb (Pos.testbit (proj1_sig pl2) 51))%bool. Program Definition default_pl_32 : bool * nan_pl 24 := - (false, nat_iter 22 xO xH). + (false, iter_nat 22 _ xO xH). Definition choose_binop_pl_32 (s1: bool) (pl1: nan_pl 24) (s2: bool) (pl2: nan_pl 24) := (** Choose second NaN if pl2 is sNaN but pl1 is qNan. |