Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 94d5da57 authored by Cyril SIX's avatar Cyril SIX
Browse files

Merge remote-tracking branch 'absint/master' into kvx-work

parents 75a2885f 9eccbd39
...@@ -394,7 +394,7 @@ and string_literal startp accu = parse ...@@ -394,7 +394,7 @@ and string_literal startp accu = parse
(* We assume gcc -E syntax but try to tolerate variations. *) (* We assume gcc -E syntax but try to tolerate variations. *)
and hash = parse and hash = parse
| whitespace_char_no_newline + | whitespace_char_no_newline +
(decimal_constant as n) (digit + as n)
whitespace_char_no_newline * whitespace_char_no_newline *
"\"" ([^ '\n' '\"']* as file) "\"" "\"" ([^ '\n' '\"']* as file) "\""
[^ '\n']* '\n' [^ '\n']* '\n'
......
...@@ -1092,7 +1092,7 @@ Inductive step: state -> trace -> state -> Prop := ...@@ -1092,7 +1092,7 @@ Inductive step: state -> trace -> state -> Prop :=
rs' = nextinstr rs' = nextinstr
(set_res res vres (set_res res vres
(undef_regs (map preg_of (destroyed_by_builtin ef)) (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') step (State rs m) t (State rs' m')
| exec_step_external: | exec_step_external:
forall b ef args res rs m t rs' m', forall b ef args res rs m t rs' m',
......
...@@ -869,13 +869,15 @@ Local Transparent destroyed_by_op. ...@@ -869,13 +869,15 @@ Local Transparent destroyed_by_op.
econstructor; eauto. econstructor; eauto.
instantiate (2 := tf); instantiate (1 := x). instantiate (2 := tf); instantiate (1 := x).
unfold nextinstr. rewrite Pregmap.gss. 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. rewrite <- H1. simpl. econstructor; eauto.
eapply code_tail_next_int; eauto. eapply code_tail_next_int; eauto.
rewrite preg_notin_charact. intros. auto with asmgen. rewrite preg_notin_charact. intros. auto with asmgen.
auto with asmgen. auto with asmgen.
apply agree_nextinstr. eapply agree_set_res; auto. 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. congruence.
- (* Mgoto *) - (* Mgoto *)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment