[Builtin] Override Std becomes Builtin

headers/header_spec.txt

@@ -930,24 +930,24 @@ src/plugins/occurrence/options.mli: CEA_LGPL_OR_PROPRIETARY
 src/plugins/occurrence/register.ml: CEA_LGPL_OR_PROPRIETARY
 src/plugins/occurrence/register_gui.ml: CEA_LGPL_OR_PROPRIETARY
 src/plugins/occurrence/register_gui.mli: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/basic_blocks.ml: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/basic_blocks.mli: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/configure.ac: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/Makefile.in: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/memcmp.ml: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/memcmp.mli: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/memcpy.ml: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/memcpy.mli: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/memmove.ml: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/memmove.mli: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/options.ml: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/options.mli: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/override_table.ml: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/override_table.mli: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/OverrideStd.mli: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/register.ml: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/transform.ml: CEA_LGPL_OR_PROPRIETARY
-src/plugins/override_std/transform.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/basic_blocks.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/basic_blocks.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/builtin_cache.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/builtin_cache.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/Builtin.mli: 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/memcmp.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/memcmp.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/memcpy.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/memcpy.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/memmove.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/memmove.mli: 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/register.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/transform.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/builtin/transform.mli: CEA_LGPL_OR_PROPRIETARY
 src/plugins/pdg/Pdg.mli: CEA_LGPL_OR_PROPRIETARY
 src/plugins/pdg/annot.ml: CEA_LGPL_OR_PROPRIETARY
 src/plugins/pdg/annot.mli: CEA_LGPL_OR_PROPRIETARY

src/plugins/override_std/Makefile.in → src/plugins/builtin/Makefile.in

@@ -34,10 +34,10 @@ endif
 ###################
 
 PLUGIN_DIR ?= .
-PLUGIN_ENABLE := @ENABLE_OVERRIDE_STD@
-PLUGIN_NAME := OverrideStd
+PLUGIN_ENABLE := @ENABLE_BUILTIN@
+PLUGIN_NAME := Builtin
 PLUGIN_CMI := 
-PLUGIN_CMO := options transform override_table basic_blocks memcpy memcmp memmove register
+PLUGIN_CMO := options transform builtin_cache basic_blocks memcpy memcmp memmove register
 PLUGIN_DISTRIBUTED := $(PLUGIN_ENABLE)
 PLUGIN_DISTRIB_EXTERNAL:= Makefile.in configure.ac configure
 #PLUGIN_NO_DEFAULT_TEST := no
@@ -59,6 +59,6 @@ else
 CONFIG_STATUS_DIR=.
 endif
 
-$(OverrideStd_DIR)/Makefile: $(OverrideStd_DIR)/Makefile.in \
+$(Builtin_DIR)/Makefile: $(Builtin_DIR)/Makefile.in \
 				$(CONFIG_STATUS_DIR)/config.status
 	cd $(CONFIG_STATUS_DIR) && ./config.status --file $@

src/plugins/override_std/override_table.ml → src/plugins/builtin/builtin_cache.ml

@@ -21,29 +21,29 @@
 (**************************************************************************)
 
 module type Table = sig
-  val get_override: Cil_types.typ -> Cil_types.varinfo
+  val get_function: Cil_types.typ -> Cil_types.varinfo
   val get_globals: Cil_types.location -> Cil_types.global list
   val mark_as_computed: ?project:Project.t -> unit -> unit
 end
 
-module type Override_generator = sig
+module type Generator = sig
   val function_name: String.t
   val build_prototype: Cil_types.typ -> Cil_types.varinfo
   val build_spec: Cil_types.varinfo -> Cil_types.location -> Cil_types.funspec
 end
 
-module Make_internal_table (M: Override_generator) =
+module Make_internal_table (M: Generator) =
   (State_builder.Hashtbl(Cil_datatype.Typ.Hashtbl) (Cil_datatype.Varinfo)
      (struct
        let size = 5
        let dependencies = [Ast.self]
-       let name = "Override." ^ M.function_name
+       let name = "Builtins." ^ M.function_name
      end))
 
-module Make (Generator: Override_generator) = struct
+module Make (Generator: Generator) = struct
   module Internal_table = Make_internal_table(Generator)
 
-  let get_override t = try
+  let get_function t = try
       Internal_table.find t
     with Not_found ->
       let fct = Generator.build_prototype t in

src/plugins/override_std/override_table.mli → src/plugins/builtin/builtin_cache.mli

@@ -20,16 +20,16 @@
 (*                                                                        *)
 (**************************************************************************)
 
-module type Override_generator = sig
+module type Generator = sig
   val function_name: String.t
   val build_prototype: Cil_types.typ -> Cil_types.varinfo
   val build_spec: Cil_types.varinfo -> Cil_types.location -> Cil_types.funspec
 end
 
 module type Table = sig
-  val get_override: Cil_types.typ -> Cil_types.varinfo
+  val get_function: Cil_types.typ -> Cil_types.varinfo
   val get_globals: Cil_types.location -> Cil_types.global list
   val mark_as_computed: ?project:Project.t -> unit -> unit
 end
 
-module Make (M: Override_generator) : Table
+module Make (M: Generator) : Table

src/plugins/override_std/configure.ac → src/plugins/builtin/configure.ac

@@ -21,7 +21,7 @@
 ##########################################################################
 
 ##########################################
-# Override stdlib C plugin               #
+# Builtin stdlib C plugin                #
 ##########################################
 
 m4_define([plugin_file],Makefile.in)
@@ -35,8 +35,8 @@ m4_define([FRAMAC_SHARE],
 
 m4_ifndef([FRAMAC_M4_MACROS], [m4_include(FRAMAC_SHARE/configure.ac)])
 
-check_plugin(overridestd,PLUGIN_RELATIVE_PATH(plugin_file),
-	     [support for override-std plug-in],yes)
+check_plugin(builtin,PLUGIN_RELATIVE_PATH(plugin_file),
+	     [support for builtin plug-in],yes)
 
 #######################
 # Generating Makefile #

src/plugins/override_std/memcmp.ml → src/plugins/builtin/memcmp.ml

@@ -84,7 +84,7 @@ let generate_prototype t =
   Cil.setFormalsDecl vi fun_t ;
   vi
 
-module Table = Override_table.Make(struct
+module Table = Builtin_cache.Make(struct
     let function_name = function_name
     let build_prototype = generate_prototype
     let build_spec = generate_spec
@@ -104,7 +104,7 @@ let well_typed_parameters s1 s2 =
 let create_call fct (s1, s2, len) =
   if well_typed_parameters s1 s2 then
     let typ = type_from_parameter s1 in
-    let fct = Table.get_override typ in
+    let fct = Table.get_function typ in
     let s1 = Cil.stripCasts s1 in
     let s2 = Cil.stripCasts s2 in
     fct, (s1, s2, len)

src/plugins/override_std/memcpy.ml → src/plugins/builtin/memcpy.ml

@@ -87,7 +87,7 @@ let generate_prototype t =
   Cil.setFormalsDecl vi fun_t ;
   vi
 
-module Table = Override_table.Make(struct
+module Table = Builtin_cache.Make(struct
     let function_name = function_name
     let build_prototype = generate_prototype
     let build_spec = generate_spec
@@ -107,7 +107,7 @@ let well_typed_parameters dest src =
 let create_call fct (dest, src, len) =
   if well_typed_parameters dest src then
     let typ = type_from_parameter dest in
-    let fct = Table.get_override typ in
+    let fct = Table.get_function typ in
     let dest = Cil.stripCasts dest in
     let src = Cil.stripCasts src in
     fct, (dest, src, len)

src/plugins/override_std/memmove.ml → src/plugins/builtin/memmove.ml

@@ -82,7 +82,7 @@ let generate_prototype t =
   Cil.setFormalsDecl vi fun_t ;
   vi
 
-module Table = Override_table.Make(struct
+module Table = Builtin_cache.Make(struct
     let function_name = function_name
     let build_prototype = generate_prototype
     let build_spec = generate_spec
@@ -102,7 +102,7 @@ let well_typed_parameters dest src =
 let create_call fct (dest, src, len) =
   if well_typed_parameters dest src then
     let typ = type_from_parameter dest in
-    let fct = Table.get_override typ in
+    let fct = Table.get_function typ in
     let dest = Cil.stripCasts dest in
     let src = Cil.stripCasts src in
     fct, (dest, src, len)

src/plugins/override_std/options.ml → src/plugins/builtin/options.ml

@@ -20,8 +20,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
-let name = "Override Std"
-let shortname = "override-std"
+let name = "Builtin"
+let shortname = "builtin"
 
 include Plugin.Register
     (struct
@@ -32,7 +32,7 @@ include Plugin.Register
 
 module Enabled = False
     (struct
-      let option_name = "-override-std"
+      let option_name = "-builtin"
       let help = ""
     end)
 

src/plugins/override_std/register.ml → src/plugins/builtin/register.ml

@@ -20,7 +20,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-let category = File.register_code_transformation_category "override-std"
+let category = File.register_code_transformation_category "builtin"
 
 let () =
   let perform file =