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, 1 insertions, 1 deletions

diff --git a/arm/Asm.v b/arm/Asm.v
index 6d5edf7..769b3f9 100644
--- a/arm/Asm.v
+++ b/arm/Asm.v
@@ -689,7 +689,7 @@ Inductive initial_state (p: program): state -> Prop :=
         (Pregmap.init Vundef)
         # PC <- (symbol_offset ge p.(prog_main) Int.zero)
         # IR14 <- Vzero
-        # IR13 <- (Vptr Mem.nullptr Int.zero) in
+        # IR13 <- Vzero in
       Genv.init_mem p = Some m0 ->
       initial_state p (State rs0 m0).