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/LTL.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/LTL.v')
| -rw-r--r-- | backend/LTL.v | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/backend/LTL.v b/backend/LTL.v index dd79c8e3..8c2749a7 100644 --- a/backend/LTL.v +++ b/backend/LTL.v @@ -45,7 +45,7 @@ Inductive instruction: Type := | Lcall (sg: signature) (ros: mreg + ident) | Ltailcall (sg: signature) (ros: mreg + ident) | Lbuiltin (ef: external_function) (args: list mreg) (res: list mreg) - | Lannot (ef: external_function) (args: list loc) + | Lannot (ef: external_function) (args: list (annot_arg loc)) | Lbranch (s: node) | Lcond (cond: condition) (args: list mreg) (s1 s2: node) | Ljumptable (arg: mreg) (tbl: list node) @@ -244,8 +244,9 @@ Inductive step: state -> trace -> state -> Prop := rs' = Locmap.setlist (map R res) vl (undef_regs (destroyed_by_builtin ef) rs) -> step (Block s f sp (Lbuiltin ef args res :: bb) rs m) t (Block s f sp bb rs' m') - | exec_Lannot: forall s f sp ef args bb rs m t vl m', - external_call' ef ge (map rs args) m t vl m' -> + | exec_Lannot: forall s f sp ef args bb rs vl m t v' m', + eval_annot_args ge rs sp m args vl -> + external_call ef ge vl m t v' m' -> step (Block s f sp (Lannot ef args :: bb) rs m) t (Block s f sp bb rs m') | exec_Lbranch: forall s f sp pc bb rs m, |