From 6c0511a03c8c970435d8b97e600312ac45340801 Mon Sep 17 00:00:00 2001 From: xleroy Date: Tue, 5 Sep 2006 12:32:59 +0000 Subject: Revu traitement des variables globales dans AST.program et dans Globalenvs. Adaptation frontend, backend en consequence. Integration passe C -> C#minor dans common/Main.v. git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@77 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e --- cfrontend/Cminorgen.v | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cfrontend/Cminorgen.v') diff --git a/cfrontend/Cminorgen.v b/cfrontend/Cminorgen.v index 4c611b44..30832e84 100644 --- a/cfrontend/Cminorgen.v +++ b/cfrontend/Cminorgen.v @@ -375,10 +375,10 @@ Definition build_compilenv (globenv, 0). Definition assign_global_variable - (ce: compilenv) (info: ident * var_kind * list init_data) : compilenv := + (ce: compilenv) (info: ident * list init_data * var_kind) : compilenv := match info with - | (id, Vscalar chunk, _) => PMap.set id (Var_global_scalar chunk) ce - | (id, Varray _, _) => PMap.set id Var_global_array ce + | (id, _, Vscalar chunk) => PMap.set id (Var_global_scalar chunk) ce + | (id, _, Varray _) => PMap.set id Var_global_array ce end. Definition build_global_compilenv (p: Csharpminor.program) : compilenv := @@ -428,6 +428,8 @@ Definition transl_function Definition transl_fundef (gce: compilenv) (f: Csharpminor.fundef): option fundef := transf_partial_fundef (transl_function gce) f. +Definition transl_globvar (vk: var_kind) := Some tt. + Definition transl_program (p: Csharpminor.program) : option program := let gce := build_global_compilenv p in - transform_partial_program (transl_fundef gce) (program_of_program p). + transform_partial_program2 (transl_fundef gce) transl_globvar p. -- cgit