From 7b8b55cbd29c202d98ce643fb7578739cf8878b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Tue, 11 Feb 2020 13:17:32 +0100
Subject: [PATCH] [Eva] In abstractions, reorder the registration of abstract
domains.
Starting with the most useful domains.
The order of registration is also the order in which domains are listed in the
help message of the -eva-domains option.
---
src/plugins/value/engine/abstractions.ml | 31 +++++++++++++-----------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/plugins/value/engine/abstractions.ml b/src/plugins/value/engine/abstractions.ml
index 0e06c7ac408..b8095b0274b 100644
--- a/src/plugins/value/engine/abstractions.ml
+++ b/src/plugins/value/engine/abstractions.ml
@@ -100,21 +100,9 @@ module Config = struct
create_domain rank name enable (module Main_values.CVal)
let cvalue = make 9 "cvalue" CvalueDomain.get (module Cvalue_domain.State)
- let gauges = make 6 "gauges" GaugesDomain.get (module Gauges_domain.D)
- let octagon = make 6 "octagon" OctagonDomain.get (module Octagons)
- let inout = make 5 "inout" InoutDomain.get (module Inout_domain.D)
- let traces = make 2 "traces" TracesDomain.get (module Traces_domain.D)
- let printer = make 2 "printer" PrinterDomain.get (module Printer_domain)
- let symbolic_locations =
- make 7 "symbolic_locations" SymbolicLocsDomain.get (module Symbolic_locs.D)
- let sign =
- create_domain 4 "sign" SignDomain.get
- (module Sign_value) (module Sign_domain)
-
- let bitwise =
- create_domain 3 "bitwise" BitwiseOffsmDomain.get
- (module Offsm_value.Offsm) (module Offsm_domain.D)
+ let symbolic_locations =
+ make 7 "symbolic-locations" SymbolicLocsDomain.get (module Symbolic_locs.D)
let equality_domain =
{ name = "equality";
@@ -123,6 +111,21 @@ module Config = struct
domain = Functor (module Equality_domain.Make); }
let equality = create ~enable:EqualityDomain.get equality_domain
+ let gauges = make 6 "gauges" GaugesDomain.get (module Gauges_domain.D)
+ let octagon = make 6 "octagon" OctagonDomain.get (module Octagons)
+
+ let bitwise =
+ create_domain 3 "bitwise" BitwiseOffsmDomain.get
+ (module Offsm_value.Offsm) (module Offsm_domain.D)
+
+ let sign =
+ create_domain 4 "sign" SignDomain.get
+ (module Sign_value) (module Sign_domain)
+
+ let inout = make 5 "inout" InoutDomain.get (module Inout_domain.D)
+ let traces = make 2 "traces" TracesDomain.get (module Traces_domain.D)
+ let printer = make 2 "printer" PrinterDomain.get (module Printer_domain)
+
(* --- Default and legacy configurations ---------------------------------- *)
let default = configure ()
--
GitLab