Merge of branch "unsigned-offsets":

- In pointer values "Vptr b ofs", interpret "ofs" as an unsigned int.
  (Fixes issue with wrong comparison of pointers across 0x8000_0000)
- Revised Stacking pass to not use negative SP offsets.
- Add pointer validity checks to Cminor ... Mach
  to support the use of memory injections in Stacking.
- Cleaned up Stacklayout modules.
- IA32: improved code generation for Mgetparam.
- ARM: improved code generation for op-immediate instructions.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/backend/Allocproof.v b/backend/Allocproof.v
index daa53e5..e7d9995 100644
--- a/backend/Allocproof.v
+++ b/backend/Allocproof.v
@@ -618,7 +618,7 @@ Proof.
   unfold ls1. simpl. apply Locmap.guo. eapply regalloc_not_temporary; eauto. 
   (* Not a move *)
   intros INMO CORR CODE.
-  assert (eval_operation tge sp op (map ls (map assign args)) = Some v).
+  assert (eval_operation tge sp op (map ls (map assign args)) m = Some v).
     replace (map ls (map assign args)) with (rs##args).
     rewrite <- H0. apply eval_operation_preserved. exact symbols_preserved. 
     eapply agree_eval_regs; eauto.
@@ -706,7 +706,7 @@ Proof.
   eapply agree_reg_list_live; eauto.
 
   (* Icond, true *)
-  assert (COND: eval_condition cond (map ls (map assign args)) = Some true).
+  assert (COND: eval_condition cond (map ls (map assign args)) m = Some true).
     replace (map ls (map assign args)) with (rs##args). auto.
     eapply agree_eval_regs; eauto.
   econstructor; split.
@@ -715,7 +715,7 @@ Proof.
   eapply agree_undef_temps; eauto.
   eapply agree_reg_list_live. eauto.
   (* Icond, false *)
-  assert (COND: eval_condition cond (map ls (map assign args)) = Some false).
+  assert (COND: eval_condition cond (map ls (map assign args)) m = Some false).
     replace (map ls (map assign args)) with (rs##args). auto.
     eapply agree_eval_regs; eauto.
   econstructor; split.