diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-12-08 09:17:41 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-12-08 09:17:41 +0100 |
| commit | cb93a301fd2ddae3071ae0838290b201496d90ef (patch) | |
| tree | b1531d98e7c7e57a2c56e0550cb0e354278f1016 /arm | |
| parent | 23da7b35d0edf98f271401ac93a1fa06adb062a2 (diff) | |
| parent | b40aef6c55b837786cd749260e8e8d8a1d328034 (diff) | |
| download | compcert-kvx-cb93a301fd2ddae3071ae0838290b201496d90ef.tar.gz compcert-kvx-cb93a301fd2ddae3071ae0838290b201496d90ef.zip | |
Merge github.com:AbsInt/CompCert into kvx-workv3.8_kvx_instructions_fixed
Diffstat (limited to 'arm')
| -rw-r--r-- | arm/Asm.v | 4 | ||||
| -rw-r--r-- | arm/Asmgenproof.v | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -696,7 +696,7 @@ Definition exec_instr (f: function) (i: instruction) (rs: regset) (m: mem) : out | Pfsubd r1 r2 r3 => Next (nextinstr (rs#r1 <- (Val.subf rs#r2 rs#r3))) m | Pflid r1 f => - Next (nextinstr (rs#r1 <- (Vfloat f))) m + Next (nextinstr (rs#IR14 <- Vundef #r1 <- (Vfloat f))) m | Pfcmpd r1 r2 => Next (nextinstr (compare_float rs rs#r1 rs#r2)) m | Pfcmpzd r1 => @@ -923,7 +923,7 @@ Inductive step: state -> trace -> state -> Prop := external_call ef ge vargs m t vres m' -> rs' = nextinstr (set_res res vres - (undef_regs (map preg_of (destroyed_by_builtin ef)) rs)) -> + (undef_regs (IR IR14 :: map preg_of (destroyed_by_builtin ef)) rs)) -> step (State rs m) t (State rs' m') | exec_step_external: forall b ef args res rs m t rs' m', diff --git a/arm/Asmgenproof.v b/arm/Asmgenproof.v index b3c64ba9..fd70c9ad 100644 --- a/arm/Asmgenproof.v +++ b/arm/Asmgenproof.v @@ -761,13 +761,15 @@ Opaque loadind. econstructor; eauto. instantiate (2 := tf); instantiate (1 := x). unfold nextinstr. rewrite Pregmap.gss. - rewrite set_res_other. rewrite undef_regs_other_2. + rewrite set_res_other. simpl. rewrite undef_regs_other_2. + rewrite Pregmap.gso by auto with asmgen. rewrite <- H1. simpl. econstructor; eauto. eapply code_tail_next_int; eauto. rewrite preg_notin_charact. intros. auto with asmgen. auto with asmgen. apply agree_nextinstr. eapply agree_set_res; auto. - eapply agree_undef_regs; eauto. intros; apply undef_regs_other_2; auto. + eapply agree_undef_regs; eauto. + intros. simpl. rewrite undef_regs_other_2; auto. apply Pregmap.gso. auto with asmgen. congruence. - (* Mgoto *) |