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/Linear.v | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'backend/Linear.v') 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: -- cgit