diff options
| author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
|---|---|---|
| committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
| commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
| tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /ia32/Archi.v | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'ia32/Archi.v')
| -rw-r--r-- | ia32/Archi.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ia32/Archi.v b/ia32/Archi.v index 674b2761..267c0eee 100644 --- a/ia32/Archi.v +++ b/ia32/Archi.v @@ -25,13 +25,13 @@ Definition big_endian := false. Notation align_int64 := 4%Z (only parsing). Notation align_float64 := 4%Z (only parsing). -Program Definition default_pl_64 : bool * nan_pl 53 := +Program Definition default_pl_64 : bool * nan_pl 53 := (true, nat_iter 51 xO xH). Definition choose_binop_pl_64 (s1: bool) (pl1: nan_pl 53) (s2: bool) (pl2: nan_pl 53) := false. (**r always choose first NaN *) -Program Definition default_pl_32 : bool * nan_pl 24 := +Program Definition default_pl_32 : bool * nan_pl 24 := (true, nat_iter 22 xO xH). Definition choose_binop_pl_32 (s1: bool) (pl1: nan_pl 24) (s2: bool) (pl2: nan_pl 24) := |