diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-06-16 06:56:02 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-06-16 06:56:02 +0000 |
| commit | b40e056328e183522b50c68aefdbff057bca29cc (patch) | |
| tree | b05fd2f0490e979e68ea06e1931bfcfba9b35771 /powerpc | |
| parent | 0648e79b98cc8d79e1942d15dbf05ba7b9eaaa8c (diff) | |
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
Diffstat (limited to 'powerpc')
| -rw-r--r-- | powerpc/Asm.v | 2 | ||||
| -rw-r--r-- | powerpc/Asmgenproof.v | 2 | ||||
| -rw-r--r-- | powerpc/Op.v | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/powerpc/Asm.v b/powerpc/Asm.v index 55a23f2..bbe2d3e 100644 --- a/powerpc/Asm.v +++ b/powerpc/Asm.v @@ -889,7 +889,7 @@ Inductive initial_state (p: program): state -> Prop := (Pregmap.init Vundef) # PC <- (symbol_offset ge p.(prog_main) Int.zero) # LR <- Vzero - # GPR1 <- (Vptr Mem.nullptr Int.zero) in + # GPR1 <- Vzero in initial_state p (State rs0 m0). Inductive final_state: state -> int -> Prop := diff --git a/powerpc/Asmgenproof.v b/powerpc/Asmgenproof.v index 2c155ea..869fab3 100644 --- a/powerpc/Asmgenproof.v +++ b/powerpc/Asmgenproof.v @@ -973,7 +973,7 @@ Proof. econstructor; eauto. constructor. apply Mem.extends_refl. - split. auto. simpl. congruence. intros. rewrite Regmap.gi. auto. + split. auto. simpl. unfold Vzero; congruence. intros. rewrite Regmap.gi. auto. unfold symbol_offset. rewrite (transform_partial_program_main _ _ TRANSF). rewrite symbols_preserved. diff --git a/powerpc/Op.v b/powerpc/Op.v index 3963c6b..1952304 100644 --- a/powerpc/Op.v +++ b/powerpc/Op.v @@ -347,7 +347,7 @@ Proof with (try exact I). destruct v0... destruct v0; destruct v1... destruct v0... - destruct v0; destruct v1... simpl. destruct (zeq b b0)... + destruct v0; destruct v1... simpl. destruct (eq_block b b0)... destruct v0... destruct v0; destruct v1... destruct v0... @@ -754,7 +754,7 @@ Proof. apply Values.val_add_inject; auto. inv H4; inv H2; simpl; auto. econstructor; eauto. rewrite Int.sub_add_l. auto. - destruct (zeq b1 b0); auto. subst. rewrite H1 in H0. inv H0. rewrite zeq_true. + destruct (eq_block b1 b0); auto. subst. rewrite H1 in H0. inv H0. rewrite dec_eq_true. rewrite Int.sub_shifted. auto. inv H4; auto. inv H4; inv H2; simpl; auto. |