diff options
| author | Maxime Dénès | 2015-01-23 14:22:53 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2015-01-23 14:22:53 +0100 |
| commit | 87106cd6a0e613fc61943959d8fc7d3ff025fc5d (patch) | |
| tree | 0bbcb291dc6cde03707e615024c6d3090186c8c2 /kernel/nativevalues.ml | |
| parent | c2d053c6f38a54e3083c8726eccb3e73942107b7 (diff) | |
| parent | 4f632721be8b083126f49dd900a3294521879ec4 (diff) | |
Merge branch 'v8.5' into trunk
Diffstat (limited to 'kernel/nativevalues.ml')
| -rw-r--r-- | kernel/nativevalues.ml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/nativevalues.ml b/kernel/nativevalues.ml index d7a2195052..e4a7799933 100644 --- a/kernel/nativevalues.ml +++ b/kernel/nativevalues.ml @@ -370,6 +370,11 @@ type coq_pair = | Paccu of t | PPair of t * t +type coq_zn2z = + | Zaccu of t + | ZW0 + | ZWW of t * t + let mkCarry b i = if b then (Obj.magic (C1(of_uint i)):t) else (Obj.magic (C0(of_uint i)):t) @@ -413,8 +418,13 @@ let subcarryc accu x y = let of_pair (x, y) = (Obj.magic (PPair(of_uint x, of_uint y)):t) +let zn2z_of_pair (x,y) = + if Uint31.equal x (Uint31.of_uint 0) && + Uint31.equal y (Uint31.of_uint 0) then Obj.magic ZW0 + else (Obj.magic (ZWW(of_uint x, of_uint y)) : t) + let no_check_mulc x y = - of_pair(Uint31.mulc (to_uint x) (to_uint y)) + zn2z_of_pair(Uint31.mulc (to_uint x) (to_uint y)) let mulc accu x y = if is_int x && is_int y then no_check_mulc x y |