diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2014-04-11 13:45:43 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2014-04-11 13:45:43 +0000 |
| commit | 0b927a1f21a6a0b7c2d8ef99457b2d5c32ca181d (patch) | |
| tree | eed1e2c6e19f2ec54074f39008463779708c6801 /ia32/SelectOp.vp | |
| parent | 336a1f906a9c617e68e9d43e244bf42e9bdbae64 (diff) | |
ia32/Select*: complete the modifications to shifts.
Makefile: missing "clean" actions.
Makefile/pg/coq: honor $COQBIN if set (as suggested by P. Boutillier)
to facilitate testing with different Coq versions.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2453 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'ia32/SelectOp.vp')
| -rw-r--r-- | ia32/SelectOp.vp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ia32/SelectOp.vp b/ia32/SelectOp.vp index e82d0a3..214608e 100644 --- a/ia32/SelectOp.vp +++ b/ia32/SelectOp.vp @@ -144,9 +144,9 @@ Definition shift_is_scale (n: int) : bool := Int.eq n (Int.repr 1) || Int.eq n (Int.repr 2) || Int.eq n (Int.repr 3). Nondetfunction shlimm (e1: expr) (n: int) := - if Int.eq n Int.zero then e1 + if Int.eq n Int.zero then e1 else if negb (Int.ltu n Int.iwordsize) then - Eop Oshl (e1:::Eop (Ointconst n):::Enil) + Eop Oshl (e1:::Eop (Ointconst n) Enil:::Enil) else match e1 with | Eop (Ointconst n1) Enil => @@ -168,7 +168,7 @@ Nondetfunction shlimm (e1: expr) (n: int) := Nondetfunction shruimm (e1: expr) (n: int) := if Int.eq n Int.zero then e1 else if negb (Int.ltu n Int.iwordsize) then - Eop Oshru (e1:::Eop (Ointconst n):::Enil) + Eop Oshru (e1:::Eop (Ointconst n) Enil:::Enil) else match e1 with | Eop (Ointconst n1) Enil => @@ -184,7 +184,7 @@ Nondetfunction shruimm (e1: expr) (n: int) := Nondetfunction shrimm (e1: expr) (n: int) := if Int.eq n Int.zero then e1 else if negb (Int.ltu n Int.iwordsize) then - Eop Oshr (e1:::Eop (Ointconst n):::Enil) + Eop Oshr (e1:::Eop (Ointconst n) Enil:::Enil) else match e1 with | Eop (Ointconst n1) Enil => |