diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2021-06-01 15:24:12 +0200 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2021-06-01 15:30:00 +0200 |
| commit | 94d5da57acadbaee825347da527e3aacfca2cd9d (patch) | |
| tree | c535a9d9e7f15decf9079878c4a8e2a0a688a02c /riscV | |
| parent | 75a2885f610e1d6e91df8e2386a4a4559b615bb9 (diff) | |
| parent | 9eccbd39710aab5d6bfe021c57f50a1916d37f70 (diff) | |
| download | compcert-kvx-94d5da57acadbaee825347da527e3aacfca2cd9d.tar.gz compcert-kvx-94d5da57acadbaee825347da527e3aacfca2cd9d.zip | |
Merge remote-tracking branch 'absint/master' into kvx-work
Diffstat (limited to 'riscV')
| -rw-r--r-- | riscV/Asm.v | 2 | ||||
| -rw-r--r-- | riscV/Asmgenproof.v | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/riscV/Asm.v b/riscV/Asm.v index 2bc6d956..c80c6cc2 100644 --- a/riscV/Asm.v +++ b/riscV/Asm.v @@ -1092,7 +1092,7 @@ Inductive step: state -> trace -> state -> Prop := rs' = nextinstr (set_res res vres (undef_regs (map preg_of (destroyed_by_builtin ef)) - (rs#X31 <- Vundef))) -> + (rs #X1 <- Vundef #X31 <- Vundef))) -> step (State rs m) t (State rs' m') | exec_step_external: forall b ef args res rs m t rs' m', diff --git a/riscV/Asmgenproof.v b/riscV/Asmgenproof.v index a7259390..e59c4535 100644 --- a/riscV/Asmgenproof.v +++ b/riscV/Asmgenproof.v @@ -869,13 +869,15 @@ Local Transparent destroyed_by_op. econstructor; eauto. instantiate (2 := tf); instantiate (1 := x). unfold nextinstr. rewrite Pregmap.gss. - rewrite set_res_other. rewrite undef_regs_other_2. rewrite Pregmap.gso by congruence. + rewrite set_res_other. rewrite undef_regs_other_2. + rewrite ! Pregmap.gso by congruence. 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. rewrite undef_regs_other_2; auto. apply Pregmap.gso; auto with asmgen. + eapply agree_undef_regs; eauto. intros. rewrite undef_regs_other_2; auto. + rewrite ! Pregmap.gso; auto with asmgen. congruence. - (* Mgoto *) |