Merge of the "princeton" branch:

- Define type "block" as "positive" instead of "Z".
- Strengthen mem_unchanged_on so that the permissions are identical,
  instead of possibly increasing.
- Move mem_unchanged_on from Events to Memory.Mem.
- Define it in terms of mem_contents rather than in terms of Mem.load.
- ExportClight: try to name temporaries introduced by SimplExpr
- SimplExpr: avoid reusing temporaries between different functions,
  instead, thread a single generator through all functions.


git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2276 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/Coqlib.v b/lib/Coqlib.v
index 58c9572..35d5385 100644
--- a/lib/Coqlib.v
+++ b/lib/Coqlib.v
@@ -177,6 +177,9 @@ Proof (Pos.lt_irrefl).
 
 Hint Resolve Ple_refl Plt_Ple Ple_succ Plt_strict: coqlib.
 
+Ltac xomega := unfold Plt, Ple in *; zify; omega.
+Ltac xomegaContradiction := exfalso; xomega.
+
 (** Peano recursion over positive numbers. *)
 
 Section POSITIVE_ITERATION.