Skip to content
Snippets Groups Projects
Commit 33f8fd57 authored by Virgile Prevosto's avatar Virgile Prevosto
Browse files

Merge branch 'feature/andre/libc-misc-improvements' into 'master'

sync with frama-c/frama-c!1602

See merge request frama-c/e-acsl!180
parents ff54369d 70d08f03
No related branches found
No related tags found
No related merge requests found
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
FRAMAC_SHARE/e-acsl/e_acsl.h:94:[value] warning: function __e_acsl_assert: precondition got status unknown. FRAMAC_SHARE/e-acsl/e_acsl.h:94:[value] warning: function __e_acsl_assert: precondition got status unknown.
tests/runtime/initialized.c:66:[value] warning: assertion got status unknown. tests/runtime/initialized.c:66:[value] warning: assertion got status unknown.
tests/runtime/initialized.c:70:[value] warning: assertion got status unknown. tests/runtime/initialized.c:70:[value] warning: assertion got status unknown.
FRAMAC_SHARE/libc/stdlib.h:358:[value] warning: function realloc: precondition got status unknown. FRAMAC_SHARE/libc/stdlib.h:368:[value] warning: function realloc: precondition got status unknown.
FRAMAC_SHARE/libc/stdlib.h:373:[value] warning: function realloc, behavior dealloc: precondition got status unknown. FRAMAC_SHARE/libc/stdlib.h:383:[value] warning: function realloc, behavior dealloc: precondition got status unknown.
tests/runtime/initialized.c:75:[value] warning: assertion got status unknown. tests/runtime/initialized.c:75:[value] warning: assertion got status unknown.
tests/runtime/initialized.c:77:[value] warning: assertion got status unknown. tests/runtime/initialized.c:77:[value] warning: assertion got status unknown.
FRAMAC_SHARE/libc/stdlib.h:345:[value] warning: function free, behavior deallocation: precondition 'freeable' got status unknown. FRAMAC_SHARE/libc/stdlib.h:355:[value] warning: function free, behavior deallocation: precondition 'freeable' got status unknown.
tests/runtime/initialized.c:85:[value] warning: assertion got status unknown. tests/runtime/initialized.c:85:[value] warning: assertion got status unknown.
tests/runtime/initialized.c:86:[value] warning: assertion got status unknown. tests/runtime/initialized.c:86:[value] warning: assertion got status unknown.
tests/runtime/initialized.c:94:[value] warning: assertion got status unknown. tests/runtime/initialized.c:94:[value] warning: assertion got status unknown.
......
...@@ -84,13 +84,6 @@ void __e_acsl_globals_init(void) ...@@ -84,13 +84,6 @@ void __e_acsl_globals_init(void)
__e_acsl_full_init((void *)(& Str)); __e_acsl_full_init((void *)(& Str));
__e_acsl_store_block((void *)(Strings),(size_t)32); __e_acsl_store_block((void *)(Strings),(size_t)32);
__e_acsl_full_init((void *)(& Strings)); __e_acsl_full_init((void *)(& Strings));
__e_acsl_temporal_store_nblock((void *)(Str),
(void *)__gen_e_acsl_literal_string_5);
__e_acsl_temporal_store_nblock((void *)(& Str[1]),
(void *)__gen_e_acsl_literal_string_6);
__e_acsl_temporal_store_nblock((void *)(& Str[2]),
(void *)__gen_e_acsl_literal_string_7);
__e_acsl_temporal_store_nblock((void *)(& Str[3]),(void *)0);
__e_acsl_temporal_store_nblock((void *)(& Strings[0][0]), __e_acsl_temporal_store_nblock((void *)(& Strings[0][0]),
(void *)__gen_e_acsl_literal_string); (void *)__gen_e_acsl_literal_string);
__e_acsl_temporal_store_nblock((void *)(& Strings[0][1]), __e_acsl_temporal_store_nblock((void *)(& Strings[0][1]),
...@@ -99,6 +92,13 @@ void __e_acsl_globals_init(void) ...@@ -99,6 +92,13 @@ void __e_acsl_globals_init(void)
(void *)__gen_e_acsl_literal_string_3); (void *)__gen_e_acsl_literal_string_3);
__e_acsl_temporal_store_nblock((void *)(& Strings[1][1]), __e_acsl_temporal_store_nblock((void *)(& Strings[1][1]),
(void *)__gen_e_acsl_literal_string_4); (void *)__gen_e_acsl_literal_string_4);
__e_acsl_temporal_store_nblock((void *)(Str),
(void *)__gen_e_acsl_literal_string_5);
__e_acsl_temporal_store_nblock((void *)(& Str[1]),
(void *)__gen_e_acsl_literal_string_6);
__e_acsl_temporal_store_nblock((void *)(& Str[2]),
(void *)__gen_e_acsl_literal_string_7);
__e_acsl_temporal_store_nblock((void *)(& Str[3]),(void *)0);
return; return;
} }
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
[e-acsl] warning: annotating undefined function `getenv': [e-acsl] warning: annotating undefined function `getenv':
the generated program may miss memory instrumentation the generated program may miss memory instrumentation
if there are memory-related annotations. if there are memory-related annotations.
FRAMAC_SHARE/libc/stdlib.h:417:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported. FRAMAC_SHARE/libc/stdlib.h:427:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
Ignoring annotation. Ignoring annotation.
[e-acsl] translation done in project "e-acsl". [e-acsl] translation done in project "e-acsl".
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment