Remove deprecated Cil.featureDescr

Replaced by Feature.t. Note that fd_enabled
has been changed, from a bool ref to a mutable
bool field.

Author: kerneis

src/cil.ml

@@ -866,33 +866,6 @@ and typsig =
   | TSEnum of string * attribute list
   | TSBase of typ
 
-
-
-(** To be able to add/remove features easily, each feature should be packaged 
-   * as an interface with the following interface. These features should be *)
-type featureDescr = {
-    fd_enabled: bool ref; 
-    (** The enable flag. Set to default value  *)
-
-    fd_name: string; 
-    (** This is used to construct an option "--doxxx" and "--dontxxx" that 
-     * enable and disable the feature  *)
-
-    fd_description: string; 
-    (* A longer name that can be used to document the new options  *)
-
-    fd_extraopt: (string * Arg.spec * string) list; 
-    (** Additional command line options.  The description strings should
-        usually start with a space for Arg.align to print the --help nicely. *)
-
-    fd_doit: (file -> unit);
-    (** This performs the transformation *)
-
-    fd_post_check: bool; 
-    (* Whether to perform a CIL consistency checking after this stage, if 
-     * checking is enabled (--check is passed to cilly) *)
-}
-
 let locUnknown = { line = -1; 
 		   file = ""; 
 		   byte = -1;}

src/cil.mli

@@ -1127,32 +1127,6 @@ val lowerConstants: bool ref
 val insertImplicitCasts: bool ref
     (** Do insert implicit casts (default true) *)
 
-(** To be able to add/remove features easily, each feature should be package 
-   * as an interface with the following interface. These features should be *)
-type featureDescr = {
-    fd_enabled: bool ref; 
-    (** The enable flag. Set to default value  *)
-
-    fd_name: string; 
-    (** This is used to construct an option "--doxxx" and "--dontxxx" that 
-     * enable and disable the feature  *)
-
-    fd_description: string; 
-    (** A longer name that can be used to document the new options  *)
-
-    fd_extraopt: (string * Arg.spec * string) list; 
-    (** Additional command line options.  The description strings should
-        usually start with a space for Arg.align to print the --help nicely. *)
-
-    fd_doit: (file -> unit);
-    (** This performs the transformation *)
-
-    fd_post_check: bool; 
-    (** Whether to perform a CIL consistency checking after this stage, if 
-     * checking is enabled (--check is passed to cilly). Set this to true if 
-     * your feature makes any changes for the program. *)
-}
-
 (** Comparison function for locations.
  ** Compares first by filename, then line, then byte *)
 val compareLoc: location -> location -> int

src/cilutil.ml

@@ -40,20 +40,6 @@ let doCheck= ref false   (* Whether to check CIL *)
 let strictChecking= ref false   (* If doCheck is true and warnings are found,
                                 * treat them as errors. *)
 
-let logCalls = ref false (* Whether to produce a log with all the function 
-                          * calls made *)
-let logWrites = ref false (* Whether to produce a log with all the mem 
-                          * writes made *)
-let doPartial = ref false (* Whether to do partial evaluation and constant 
-                          * folding *)                          
-let doSimpleMem = ref false (* reduce complex memory expressions so that
-                          * they contain at most one lval *) 
-let doOneRet = ref false (* make a functions have at most one 'return' *)
-let doStackGuard = ref false (* instrument function calls and returns to
-maintain a separate stack for return addresses *)
-let doHeapify = ref false (* move stack-allocated arrays to the heap *)
-let makeCFG = ref false (* turn the input CIL file into something more like
-                          * a CFG *)
 let printStats = ref false
 
 (* when 'sliceGlobal' is set, then when 'rmtmps' runs, only globals*)
@@ -63,10 +49,3 @@ let sliceGlobal = ref false
 
 
 let printStages = ref false
-
-
-let doCxxPP = ref false
-
-let libDir = ref ""
-
-let dumpFCG = ref false

src/ext/blockinggraph/blockinggraph.ml

@@ -35,6 +35,7 @@
  *
  *)
 open Cil
+open Feature
 open Pretty
 module E = Errormsg
 
@@ -750,9 +751,9 @@ let instrumentProgram (f: file) : unit =
 
 
 
-let feature : featureDescr = 
+let feature =
   { fd_name = "FCG";
-    fd_enabled = ref false;
+    fd_enabled = false;
     fd_description = "computing and printing a static call graph";
     fd_extraopt = [];
     fd_doit = 

src/ext/blockinggraph/blockinggraph.mli

@@ -37,4 +37,4 @@
 
 (* This module finds and analyzes yield points. *)
 
-val feature: Cil.featureDescr
+val feature: Feature.t

src/ext/callgraph/callgraph.ml

@@ -4,6 +4,7 @@
 (* see copyright notice at end of this file *)
 
 open Cil
+open Feature
 open Trace
 open Printf
 module P = Pretty
@@ -201,11 +202,9 @@ let printGraph (out:out_channel) (g:callgraph) : unit = begin
     g
   end
 
-let doCallGraph = ref false
-
-let feature : featureDescr = 
+let feature = 
   { fd_name = "callgraph";
-    fd_enabled = doCallGraph;
+    fd_enabled = false;
     fd_description = "generation of a static call graph";
     fd_extraopt = [];
     fd_doit = 

src/ext/callgraph/callgraph.mli

@@ -88,7 +88,7 @@ val computeGraph : Cil.file -> callgraph
 val printGraph : out_channel -> callgraph -> unit
 
 
-val feature: Cil.featureDescr
+val feature: Feature.t
 (*
  *
  * Copyright (c) 2001-2002 by

src/ext/canonicalize/canonicalize.ml

@@ -63,6 +63,7 @@
  ************************************************************************)
 
 open Cil
+open Feature
 module E = Errormsg
 module H = Hashtbl
 
@@ -282,9 +283,9 @@ let canonicalize (f:file) =
 
 
 
-let feature : featureDescr = 
+let feature = 
   { fd_name = "canonicalize";
-    fd_enabled = ref false;
+    fd_enabled = false;
     fd_description = "fixing some C-isms so that the result is C++ compliant.";
     fd_extraopt = [];
     fd_doit = canonicalize;

src/ext/canonicalize/canonicalize.mli

@@ -45,4 +45,4 @@
  *
  ************************************************************************)
 
-val feature: Cil.featureDescr
+val feature: Feature.t

src/ext/ccl/ccl.ml

@@ -34,6 +34,7 @@
  *
  *)
 open Cil
+open Feature
 open Pretty
 module E = Errormsg
 
@@ -1930,9 +1931,9 @@ let analyzeFile (f : file) : unit =
   if !E.hadErrors then
     E.s (E.error "Verification failed")
 
-let feature : featureDescr = 
+let feature = 
   { fd_name = "CCL";
-    fd_enabled = ref false;
+    fd_enabled = false;
     fd_description = "CCured Lite";
     fd_extraopt = [
       "--cclverbose", Arg.Set verbose, "Enable verbose output for CCL";

src/ext/ccl/ccl.mli

@@ -37,4 +37,4 @@
 val verifiedExps: Cil.exp list ref
 val verifiedArgs: Cil.exp list ref
 
-val feature: Cil.featureDescr
+val feature: Feature.t

src/ext/cqualann/cqualann.ml

@@ -29,6 +29,7 @@
 *)
 
 open Cil  
+open Feature
 open Pretty
 module E = Errormsg
 module H = Hashtbl
@@ -498,15 +499,13 @@ let entry_point (f : file) =
 
 
 
-let enableAnn = ref false 
-
 (***********************
  * The Cil.featureDesc that tells the CIL front-end how to call this module.
  * This is the only value that needs to be exported from smalloc.ml. **)
 
-let feature : featureDescr = 
+let feature = 
   { fd_name = "CqualAnn";
-    fd_enabled = enableAnn;
+    fd_enabled = false;
     fd_description = "adding assembly annotations for Cqual qualifiers." ;
     fd_extraopt = [ "--doCollapseCallCast", 
                     Arg.Set Cabs2cil.doCollapseCallCast,

src/ext/dataslicing/dataslicing.ml

@@ -34,6 +34,7 @@
  *
  *)
 open Cil
+open Feature
 open Pretty
 module E = Errormsg
 
@@ -444,9 +445,9 @@ let sliceFile (f : file) : unit =
   f.globals <- List.rev !newGlobals;
   visitCilFile (new dropAttrsVisitor) f
 
-let feature : featureDescr = 
+let feature = 
   { fd_name = "DataSlicing";
-    fd_enabled = ref false;
+    fd_enabled = false;
     fd_description = "data slicing";
     fd_extraopt = [];
     fd_doit = sliceFile;

src/ext/dataslicing/dataslicing.mli

@@ -38,4 +38,4 @@
  * and function types with region(i) annotations, and this transformation
  * will separate the fields into parallel data structures accordingly. *)
 
-val feature: Cil.featureDescr
+val feature: Feature.t

src/ext/epicenter/epicenter.ml

@@ -6,6 +6,7 @@
 
 open Callgraph
 open Cil
+open Feature
 open Trace
 open Pretty
 module H = Hashtbl
@@ -54,13 +55,12 @@ let sliceFile (f:file) (epicenter:string) (maxHops:int) : unit =
   Cilutil.sliceGlobal := true;
   Rmtmps.removeUnusedTemps ~isRoot:isRoot f
 
-let doEpicenter = ref false
 let epicenterName = ref ""
 let epicenterHops = ref 0
 
-let feature : featureDescr = 
+let feature = 
   { fd_name = "epicenter";
-    fd_enabled = doEpicenter;
+    fd_enabled = false;
     fd_description = "remove all functions except those within some number" ^
                 "\n\t\t\t\tof hops (in the call graph) from a given function";
     fd_extraopt = 

src/ext/heapify/heapify.ml

@@ -43,6 +43,7 @@
  * and frees the structure on return. 
  *)
 open Cil
+open Feature
 
 (* utilities that should be in Cil.ml *)
 (* sfg: this function appears to never be called *)
@@ -223,17 +224,17 @@ void * stackguard_pop() {
     ignore (stackguard f push pop get_ra set_ra )
 
 
-let feature1 : featureDescr = 
+let feature1 = 
   { fd_name = "stackGuard";
-    fd_enabled = Cilutil.doStackGuard;
+    fd_enabled = false;
     fd_description = "instrument function calls and returns to maintain a\n\t\t\t\tseparate stack for return addresses" ;
     fd_extraopt = [];
     fd_doit = (function (f: file) -> default_stackguard f);
     fd_post_check = true;
   } 
-let feature2 : featureDescr = 
+let feature2 = 
   { fd_name = "heapify";
-    fd_enabled = Cilutil.doHeapify;
+    fd_enabled = false;
     fd_description = "move stack-allocated arrays to the heap" ;
     fd_extraopt = [
       "--heapifyAll", Arg.Set heapifyNonArrays,

src/ext/inliner/inliner.ml

@@ -49,12 +49,12 @@
 
 open Pretty
 open Cil
+open Feature
 module E = Errormsg
 module H = Hashtbl
 module IH = Inthash
 module A = Alpha
 
-let doInline = ref false
 let debug = true
 
 exception Recursion (* Used to signal recursion *)
@@ -431,12 +431,12 @@ let doit (fl: file) =
 
   doFile inlineWhat fl
 
-let feature : featureDescr = 
+let rec feature = 
   { fd_name = "inliner";
-    fd_enabled = doInline;
+    fd_enabled = false;
     fd_description = "inline function calls";
     fd_extraopt = [
-    "--inline", Arg.String (fun s -> doInline := true;
+    "--inline", Arg.String (fun s -> feature.fd_enabled <- true;
                                      toinline := s :: !toinline), 
                 "<func> inline this function";
     ];

src/ext/liveness/liveness.ml

@@ -7,6 +7,7 @@
  *)
 
 open Cil
+open Feature
 open Pretty
 
 module DF = Dataflow
@@ -329,7 +330,7 @@ let do_live_feature (f:file) =
 let feature =
   {
    fd_name = "Liveness";
-   fd_enabled = ref false;
+   fd_enabled = false;
    fd_description = "Spit out live variables at a label";
    fd_extraopt = [
    "--live_label",

src/ext/llvm/llvm.ml

@@ -54,6 +54,7 @@
      - iBinop/MinusPP: will get an exception when computing elemsize
 *)
 open Cil
+open Feature
 open Pretty
 open List
 open Llvmutils
@@ -163,9 +164,9 @@ let generate (f:file) : doc =
   (globals#printGlobals ()) ++ body
 
 (* CIL feature setup *)
-let feature : featureDescr = 
+let feature =
   { fd_name = "llvm";              
-    fd_enabled = ref false;
+    fd_enabled = false;
     fd_description = "generate llvm code";
     fd_extraopt = [];
     fd_doit =