diff options
author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2015-04-01 18:28:02 +0200 |
---|---|---|
committer | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2015-04-01 18:28:02 +0200 |
commit | 95ba79b10e832025bbc9843f9d14614f7dff0fcb (patch) | |
tree | 8ca03b99cf6be2aab8c7b266196569019a2a7f13 /backend/Linear.v | |
parent | 68e2ce02f8d69b26c9cea6e0d338f855cbea3ace (diff) | |
parent | e11b3b885a6d359925b86743b89698cc6757157a (diff) | |
download | compcert-95ba79b10e832025bbc9843f9d14614f7dff0fcb.tar.gz compcert-95ba79b10e832025bbc9843f9d14614f7dff0fcb.zip |
Merge pull request #34 from AbsInt/extended-annotations
Extended annotations
Diffstat (limited to 'backend/Linear.v')
-rw-r--r-- | backend/Linear.v | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/backend/Linear.v b/backend/Linear.v index 56d1eb99..5d1fc0d8 100644 --- a/backend/Linear.v +++ b/backend/Linear.v @@ -42,7 +42,7 @@ Inductive instruction: Type := | Lcall: signature -> mreg + ident -> instruction | Ltailcall: signature -> mreg + ident -> instruction | Lbuiltin: external_function -> list mreg -> list mreg -> instruction - | Lannot: external_function -> list loc -> instruction + | Lannot: external_function -> list (annot_arg loc) -> instruction | Llabel: label -> instruction | Lgoto: label -> instruction | Lcond: condition -> list mreg -> label -> instruction @@ -204,8 +204,9 @@ Inductive step: state -> trace -> state -> Prop := step (State s f sp (Lbuiltin ef args res :: b) rs m) t (State s f sp b rs' m') | exec_Lannot: - forall s f sp rs m ef args b t v m', - external_call' ef ge (map rs args) m t v m' -> + forall s f sp rs m ef args vl b t v m', + eval_annot_args ge rs sp m args vl -> + external_call ef ge vl m t v m' -> step (State s f sp (Lannot ef args :: b) rs m) t (State s f sp b rs m') | exec_Llabel: |