diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-02-24 18:06:23 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-02-24 18:06:23 +0100 |
| commit | 3609ee93e39f4896d749640760f82abdcde33fed (patch) | |
| tree | ab2233664ba2dc1587bd58e61c174171c6349fed /common | |
| parent | f64f6374c4b9db9f1111f272d842a625f0507ae6 (diff) | |
| download | compcert-kvx-3609ee93e39f4896d749640760f82abdcde33fed.tar.gz compcert-kvx-3609ee93e39f4896d749640760f82abdcde33fed.zip | |
thread local declarations now work
Diffstat (limited to 'common')
| -rw-r--r-- | common/Sections.ml | 21 | ||||
| -rw-r--r-- | common/Sections.mli | 5 |
2 files changed, 17 insertions, 9 deletions
diff --git a/common/Sections.ml b/common/Sections.ml index 30be9e69..9555c203 100644 --- a/common/Sections.ml +++ b/common/Sections.ml @@ -17,7 +17,8 @@ type section_name = | Section_text - | Section_data of bool (* true = init data, false = uninit data *) + | Section_data of bool (* true = init data, false = uninit data *) + * bool (* thread local? *) | Section_small_data of bool | Section_const of bool | Section_small_const of bool @@ -47,8 +48,8 @@ type section_info = { } let default_section_info = { - sec_name_init = Section_data true; - sec_name_uninit = Section_data false; + sec_name_init = Section_data (true, false); + sec_name_uninit = Section_data (false, false); sec_writable = true; sec_executable = false; sec_access = Access_default @@ -63,8 +64,13 @@ let builtin_sections = [ sec_writable = false; sec_executable = true; sec_access = Access_default}; "DATA", - {sec_name_init = Section_data true; - sec_name_uninit = Section_data false; + {sec_name_init = Section_data (true, false); + sec_name_uninit = Section_data (false, false); + sec_writable = true; sec_executable = false; + sec_access = Access_default}; + "TDATA", + {sec_name_init = Section_data (true, true); + sec_name_uninit = Section_data (false, true); sec_writable = true; sec_executable = false; sec_access = Access_default}; "SDATA", @@ -162,7 +168,7 @@ let gcc_section name readonly exec = (* Determine section for a variable definition *) -let for_variable env id ty init = +let for_variable env id ty init thrl = let attr = Cutil.attributes_of_type env ty in let readonly = List.mem C.AConst attr && not(List.mem C.AVolatile attr) in let si = @@ -181,7 +187,8 @@ let for_variable env id ty init = let name = if readonly then if size <= !Clflags.option_small_const then "SCONST" else "CONST" - else if size <= !Clflags.option_small_data then "SDATA" else "DATA" in + else if size <= !Clflags.option_small_data then "SDATA" else + if thrl then "TDATA" else "DATA" in try Hashtbl.find current_section_table name with Not_found -> diff --git a/common/Sections.mli b/common/Sections.mli index bc97814d..e882f042 100644 --- a/common/Sections.mli +++ b/common/Sections.mli @@ -18,7 +18,8 @@ type section_name = | Section_text - | Section_data of bool (* true = init data, false = uninit data *) + | Section_data of bool (* true = init data, false = uninit data *) + * bool (* thread local? *) | Section_small_data of bool | Section_const of bool | Section_small_const of bool @@ -46,7 +47,7 @@ val define_section: -> ?writable:bool -> ?executable:bool -> ?access:access_mode -> unit -> unit val use_section_for: AST.ident -> string -> bool -val for_variable: Env.t -> AST.ident -> C.typ -> bool -> +val for_variable: Env.t -> AST.ident -> C.typ -> bool -> bool -> section_name * access_mode val for_function: Env.t -> AST.ident -> C.attributes -> section_name list val for_stringlit: unit -> section_name |