Skip to content
Snippets Groups Projects
Commit 12a8f29b authored by Allan Blanchard's avatar Allan Blanchard
Browse files

[Builtin] header -> directory

parent e9cef177
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 56 additions and 40 deletions
headers/header_spec.txt
+ 10
− 10
View file @ 12a8f29b
...@@ -937,16 +937,16 @@ src/plugins/builtin/builtin_builder.ml: CEA_LGPL_OR_PROPRIETARY ...@@ -937,16 +937,16 @@ src/plugins/builtin/builtin_builder.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/builtin_builder.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/builtin_builder.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/configure.ac: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/configure.ac: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/Makefile.in: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/Makefile.in: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/malloc.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/stdlib/malloc.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/malloc.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/stdlib/malloc.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/memcmp.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/string/memcmp.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/memcmp.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/string/memcmp.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/memcpy.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/string/memcpy.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/memcpy.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/string/memcpy.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/memmove.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/string/memmove.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/memmove.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/string/memmove.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/memset.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/string/memset.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/memset.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/string/memset.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/options.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/options.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/options.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/options.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/builtin/register.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/builtin/register.ml: CEA_LGPL_OR_PROPRIETARY
......
src/plugins/builtin/Makefile.in
+ 20
− 4
View file @ 12a8f29b
...@@ -29,6 +29,17 @@ ifndef FRAMAC_LIBDIR ...@@ -29,6 +29,17 @@ ifndef FRAMAC_LIBDIR
FRAMAC_LIBDIR :=$(shell frama-c-config -print-libpath) FRAMAC_LIBDIR :=$(shell frama-c-config -print-libpath)
endif endif
SRC_STRING:= \
memcpy \
memcmp \
memmove \
memset
SRC_STRING:=$(addprefix string/, $(SRC_STRING))
SRC_STDLIB:= \
malloc
SRC_STDLIB:=$(addprefix stdlib/, $(SRC_STDLIB))
################### ###################
# Plug-in Setting # # Plug-in Setting #
################### ###################
...@@ -36,14 +47,19 @@ endif ...@@ -36,14 +47,19 @@ endif
PLUGIN_DIR ?= . PLUGIN_DIR ?= .
PLUGIN_ENABLE := @ENABLE_BUILTIN@ PLUGIN_ENABLE := @ENABLE_BUILTIN@
PLUGIN_NAME := Builtin PLUGIN_NAME := Builtin
PLUGIN_EXTRA_DIRS:=\
string\
stdlib
PLUGIN_CMI := PLUGIN_CMI :=
PLUGIN_CMO := basic_blocks options builtin_builder transform \ PLUGIN_CMO := \
malloc memcpy memcmp memmove memset \ basic_blocks options builtin_builder transform register \
register $(SRC_STRING) \
$(SRC_STDLIB)
PLUGIN_DISTRIBUTED := $(PLUGIN_ENABLE) PLUGIN_DISTRIBUTED := $(PLUGIN_ENABLE)
PLUGIN_DISTRIB_EXTERNAL:= Makefile.in configure.ac configure PLUGIN_DISTRIB_EXTERNAL:= Makefile.in configure.ac configure
#PLUGIN_NO_DEFAULT_TEST := no #PLUGIN_NO_DEFAULT_TEST := no
PLUGIN_TESTS_DIRS := functions options PLUGIN_TESTS_DIRS := string options
################ ################
# Generic part # # Generic part #
......
src/plugins/builtin/tests/functions/oracle/memcmp.res.oracle → src/plugins/builtin/tests/string/oracle/memcmp.res.oracle
+ 13
− 13
View file @ 12a8f29b
[kernel] Parsing tests/functions/memcmp.c (with preprocessing) [kernel] Parsing tests/string/memcmp.c (with preprocessing)
/* Generated by Frama-C */ /* Generated by Frama-C */
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
...@@ -143,18 +143,18 @@ int nested(int (*src)[10], int (*dest)[10], int n) ...@@ -143,18 +143,18 @@ int nested(int (*src)[10], int (*dest)[10], int n)
} }
[kernel] Parsing tests/functions/result/memcmp.c (with preprocessing) [kernel] Parsing tests/string/result/memcmp.c (with preprocessing)
[kernel] Parsing tests/functions/memcmp.c (with preprocessing) [kernel] Parsing tests/string/memcmp.c (with preprocessing)
[kernel] tests/functions/memcmp.c:10: Warning: [kernel] tests/string/memcmp.c:10: Warning:
def'n of func integer at tests/functions/memcmp.c:10 (sum 1085) conflicts with the one at tests/functions/result/memcmp.c:34 (sum 1972); keeping the one at tests/functions/result/memcmp.c:34. def'n of func integer at tests/string/memcmp.c:10 (sum 1085) conflicts with the one at tests/string/result/memcmp.c:34 (sum 1972); keeping the one at tests/string/result/memcmp.c:34.
[kernel] tests/functions/memcmp.c:14: Warning: [kernel] tests/string/memcmp.c:14: Warning:
def'n of func with_named at tests/functions/memcmp.c:14 (sum 1085) conflicts with the one at tests/functions/result/memcmp.c:41 (sum 1972); keeping the one at tests/functions/result/memcmp.c:41. def'n of func with_named at tests/string/memcmp.c:14 (sum 1085) conflicts with the one at tests/string/result/memcmp.c:41 (sum 1972); keeping the one at tests/string/result/memcmp.c:41.
[kernel] tests/functions/memcmp.c:18: Warning: [kernel] tests/string/memcmp.c:18: Warning:
def'n of func structure at tests/functions/memcmp.c:18 (sum 1085) conflicts with the one at tests/functions/result/memcmp.c:72 (sum 1972); keeping the one at tests/functions/result/memcmp.c:72. def'n of func structure at tests/string/memcmp.c:18 (sum 1085) conflicts with the one at tests/string/result/memcmp.c:72 (sum 1972); keeping the one at tests/string/result/memcmp.c:72.
[kernel] tests/functions/memcmp.c:22: Warning: [kernel] tests/string/memcmp.c:22: Warning:
def'n of func pointers at tests/functions/memcmp.c:22 (sum 1085) conflicts with the one at tests/functions/result/memcmp.c:103 (sum 1972); keeping the one at tests/functions/result/memcmp.c:103. def'n of func pointers at tests/string/memcmp.c:22 (sum 1085) conflicts with the one at tests/string/result/memcmp.c:103 (sum 1972); keeping the one at tests/string/result/memcmp.c:103.
[kernel] tests/functions/memcmp.c:26: Warning: [kernel] tests/string/memcmp.c:26: Warning:
def'n of func nested at tests/functions/memcmp.c:26 (sum 1087) conflicts with the one at tests/functions/result/memcmp.c:137 (sum 1974); keeping the one at tests/functions/result/memcmp.c:137. def'n of func nested at tests/string/memcmp.c:26 (sum 1087) conflicts with the one at tests/string/result/memcmp.c:137 (sum 1974); keeping the one at tests/string/result/memcmp.c:137.
/* Generated by Frama-C */ /* Generated by Frama-C */
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
......
src/plugins/builtin/tests/functions/oracle/memcpy.res.oracle → src/plugins/builtin/tests/string/oracle/memcpy.res.oracle
+ 13
− 13
View file @ 12a8f29b
[kernel] Parsing tests/functions/memcpy.c (with preprocessing) [kernel] Parsing tests/string/memcpy.c (with preprocessing)
/* Generated by Frama-C */ /* Generated by Frama-C */
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
...@@ -154,18 +154,18 @@ void nested(int (*src)[10], int (*dest)[10], int n) ...@@ -154,18 +154,18 @@ void nested(int (*src)[10], int (*dest)[10], int n)
} }
[kernel] Parsing tests/functions/result/memcpy.c (with preprocessing) [kernel] Parsing tests/string/result/memcpy.c (with preprocessing)
[kernel] Parsing tests/functions/memcpy.c (with preprocessing) [kernel] Parsing tests/string/memcpy.c (with preprocessing)
[kernel] tests/functions/memcpy.c:10: Warning: [kernel] tests/string/memcpy.c:10: Warning:
dropping duplicate def'n of func integer at tests/functions/memcpy.c:10 in favor of that at tests/functions/result/memcpy.c:36 dropping duplicate def'n of func integer at tests/string/memcpy.c:10 in favor of that at tests/string/result/memcpy.c:36
[kernel] tests/functions/memcpy.c:15: Warning: [kernel] tests/string/memcpy.c:15: Warning:
dropping duplicate def'n of func with_named at tests/functions/memcpy.c:15 in favor of that at tests/functions/result/memcpy.c:43 dropping duplicate def'n of func with_named at tests/string/memcpy.c:15 in favor of that at tests/string/result/memcpy.c:43
[kernel] tests/functions/memcpy.c:20: Warning: [kernel] tests/string/memcpy.c:20: Warning:
dropping duplicate def'n of func structure at tests/functions/memcpy.c:20 in favor of that at tests/functions/result/memcpy.c:76 dropping duplicate def'n of func structure at tests/string/memcpy.c:20 in favor of that at tests/string/result/memcpy.c:76
[kernel] tests/functions/memcpy.c:25: Warning: [kernel] tests/string/memcpy.c:25: Warning:
dropping duplicate def'n of func pointers at tests/functions/memcpy.c:25 in favor of that at tests/functions/result/memcpy.c:109 dropping duplicate def'n of func pointers at tests/string/memcpy.c:25 in favor of that at tests/string/result/memcpy.c:109
[kernel] tests/functions/memcpy.c:30: Warning: [kernel] tests/string/memcpy.c:30: Warning:
dropping duplicate def'n of func nested at tests/functions/memcpy.c:30 in favor of that at tests/functions/result/memcpy.c:147 dropping duplicate def'n of func nested at tests/string/memcpy.c:30 in favor of that at tests/string/result/memcpy.c:147
/* Generated by Frama-C */ /* Generated by Frama-C */
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment