From e73d5db97cdb22cce2ee479469f62af3c4b6264a Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Fri, 8 Jul 2016 14:43:57 +0200 Subject: Port to Coq 8.5pl2 Manual merging of branch jhjourdan:coq8.5. No other change un functionality. --- arm/Asmgenproof.v | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'arm/Asmgenproof.v') diff --git a/arm/Asmgenproof.v b/arm/Asmgenproof.v index 5bd2b54f..431743c6 100644 --- a/arm/Asmgenproof.v +++ b/arm/Asmgenproof.v @@ -166,11 +166,11 @@ Proof. intros. unfold loadimm. set (l1 := length (decompose_int n)). set (l2 := length (decompose_int (Int.not n))). - destruct (NPeano.leb l1 1%nat). TailNoLabel. - destruct (NPeano.leb l2 1%nat). TailNoLabel. + destruct (Nat.leb l1 1%nat). TailNoLabel. + destruct (Nat.leb l2 1%nat). TailNoLabel. destruct (thumb tt). unfold loadimm_thumb. destruct (Int.eq (Int.shru n (Int.repr 16)) Int.zero); TailNoLabel. - destruct (NPeano.leb l1 l2); auto with labels. + destruct (Nat.leb l1 l2); auto with labels. Qed. Hint Resolve loadimm_label: labels. @@ -179,7 +179,7 @@ Remark addimm_label: Proof. intros; unfold addimm. destruct (Int.ltu (Int.repr (-256)) n). TailNoLabel. - destruct (NPeano.leb (length (decompose_int n)) (length (decompose_int (Int.neg n)))); + destruct (Nat.leb (length (decompose_int n)) (length (decompose_int (Int.neg n)))); auto with labels. Qed. Hint Resolve addimm_label: labels. -- cgit