summaryrefslogtreecommitdiff
path: root/powerpc
diff options
context:
space:
mode:
Diffstat (limited to 'powerpc')
-rw-r--r--powerpc/Asm.v2
-rw-r--r--powerpc/Asmgenproof.v2
-rw-r--r--powerpc/Op.v4
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.