From 4622f49fd089ae47d0c853343cb0a05f986c962a Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Fri, 27 Mar 2015 08:55:05 +0100 Subject: Extend annotations so that they can keep track of global variables and local variables whose address is taken. - CminorSel, RTL: add "annot" instructions. - CminorSel to Asm: use type "annot_arg" for arguments of "annot" instructions. - AST, Events: simplify EF_annot because constants are now part of the arguments. Implementation is not complete yet. --- backend/LTL.v | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'backend/LTL.v') 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, -- cgit