[Eva] Fixes summary of garbled mix origins at the end of an analysis.

Prints the number of statements at which a garbled mix from a given origin
has been read and propagated, instead of the total number of times such a
garbled mix has been read/propagated.
This is more stable and depends less on states partitioning.

tests/value/oracle/bitwise_pointer.0.res.oracle

@@ -46,9 +46,11 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     bitwise_pointer.i:18: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{t}
+      (read in 1 statement, propagated through 1 statement) garbled mix of &
+      {t}
     bitwise_pointer.i:22: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{t1}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{t1}
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   t[0] ∈ {0; 5}

tests/value/oracle/bitwise_pointer.1.res.oracle

@@ -46,9 +46,11 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     bitwise_pointer.i:18: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{t}
+      (read in 1 statement, propagated through 1 statement) garbled mix of &
+      {t}
     bitwise_pointer.i:22: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{t1}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{t1}
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   t[0] ∈ {0; 5}

tests/value/oracle/context_free.res.oracle

@@ -92,7 +92,7 @@
 [eva] Done for function f
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
-    Initial state (read 9 times, propagated 5 times)
+    Initial state (read in 7 statements, propagated through 5 statements)
       garbled mix of &{WELL_uu; S_p_svoid; S_qvoid; S_0_S_vvv; S_vv}
 [eva] context_free.i:62: 
   assertion 'Eva,function_pointer' got final status invalid.

tests/value/oracle/degeneration2.res.oracle

@@ -26,7 +26,8 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     degeneration2.i:14: arithmetic operation on addresses
-      (read 6 times, propagated 1 times) garbled mix of &{B; C; D; E}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{B; C; D; E}
 [eva] degeneration2.i:25: 
   assertion 'Eva,initialization' got final status invalid.
 [eva] ====== VALUES COMPUTED ======

tests/value/oracle/empty_struct.6.res.oracle

@@ -24,7 +24,8 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     empty_struct.c:99: assigns clause on addresses
-      (read 2 times, propagated 3 times) garbled mix of &{gs}
+      (read in 1 statement, propagated through 2 statements)
+      garbled mix of &{gs}
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main4:
   r ∈

tests/value/oracle/gauges.res.oracle

@@ -719,7 +719,8 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     gauges.c:188: arithmetic operation on addresses
-      (read 14 times, propagated 12 times) garbled mix of &{x; y}
+      (read in 2 statements, propagated through 2 statements)
+      garbled mix of &{x; y}
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main0:
   i ∈ {1; 162}

tests/value/oracle/imprecise_invalid_write.res.oracle

@@ -48,9 +48,11 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     imprecise_invalid_write.i:9: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{main1}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{main1}
     imprecise_invalid_write.i:16: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{"abc"}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{"abc"}
 [eva] imprecise_invalid_write.i:5: 
   assertion 'Eva,mem_access' got final status invalid.
 [eva] imprecise_invalid_write.i:10: 

tests/value/oracle/initialized.res.oracle

@@ -234,7 +234,8 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     initialized.c:50: arithmetic operation on addresses
-      (read 1 times, propagated 2 times) garbled mix of &{b4}
+      (read in 1 statement, propagated through 2 statements)
+      garbled mix of &{b4}
 [eva] initialized.c:93: assertion 'Eva,initialization' got final status invalid.
 [eva] initialized.c:104: 
   assertion 'Eva,initialization' got final status invalid.

tests/value/oracle/leaf.res.oracle

@@ -143,9 +143,11 @@
 [eva] Done for function main
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
-    leaf.i:55: assigns clause on addresses (read 10 times, propagated 2 times)
+    leaf.i:55: assigns clause on addresses
+      (read in 4 statements, propagated through 1 statement)
       garbled mix of &{pg}
-    leaf.i:50: assigns clause on addresses (read 4 times, propagated 2 times)
+    leaf.i:50: assigns clause on addresses
+      (read in 2 statements, propagated through 1 statement)
       garbled mix of &{g}
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:

tests/value/oracle/leaf2.res.oracle

@@ -24,7 +24,8 @@
 [eva] Done for function main
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
-    leaf2.i:6: assigns clause on addresses (read 4 times, propagated 4 times)
+    leaf2.i:6: assigns clause on addresses
+      (read in 2 statements, propagated through 2 statements)
       garbled mix of &{I}
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:

tests/value/oracle/library.res.oracle

@@ -138,11 +138,14 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     library.i:31: assigns clause on addresses
-      (read 2 times, propagated 2 times) garbled mix of &{S_gpi}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{S_gpi}
     library.i:41: assigns clause on addresses
-      (read 2 times, propagated 2 times) garbled mix of &{S_gpf}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{S_gpf}
     library.i:45: assigns clause on addresses
-      (read 2 times, propagated 2 times) garbled mix of &{S_gpd}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{S_gpd}
 [eva] library.i:38: assertion 'Eva,function_pointer' got final status invalid.
 [eva] library.i:39: assertion 'Eva,function_pointer' got final status invalid.
 [eva] library.i:40: assertion 'Eva,function_pointer' got final status invalid.

tests/value/oracle/logic.res.oracle

@@ -565,7 +565,8 @@
 [eva] Done for function main
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
-    logic.c:411: assigns clause on addresses (read 1 times, propagated 2 times)
+    logic.c:411: assigns clause on addresses
+      (read in 1 statement, propagated through 1 statement)
       garbled mix of &{x_0}
 [eva] logic.c:530: 
   Cannot evaluate range bound __fc_len - 1

tests/value/oracle/multidim-relations.res.oracle

@@ -50,10 +50,12 @@
 [eva] Done for function main
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
-    multidim-relations.c:18: imprecise merge of addresses
-      (read 7 times, propagated 0 times) garbled mix of &{g; h}
     multidim-relations.c:19: imprecise merge of addresses
-      (read 4 times, propagated 0 times) garbled mix of &{g; h}
+      (read in 2 statements, propagated through 0 statements)
+      garbled mix of &{g; h}
+    multidim-relations.c:18: imprecise merge of addresses
+      (read in 1 statement, propagated through 0 statements)
+      garbled mix of &{g; h}
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function init_array:
   t[0]{.kind; .[bits 8 to 31]#} ∈ {0; 1} repeated %8 

tests/value/oracle/origin.0.res.oracle

@@ -200,17 +200,23 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     origin.i:19: arithmetic operation on addresses
-      (read 3 times, propagated 2 times) garbled mix of &{ta2; tta2}
+      (read in 2 statements, propagated through 2 statements)
+      garbled mix of &{ta2; tta2}
     origin.i:54: misaligned read of addresses
-      (read 3 times, propagated 1 times) garbled mix of &{a; b}
+      (read in 2 statements, propagated through 1 statement)
+      garbled mix of &{a; b}
     origin.i:14: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{ta1}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{ta1}
     origin.i:25: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{ta3}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{ta3}
     origin.i:100: assigns clause on addresses
-      (read 2 times, propagated 2 times) garbled mix of &{S_gpp}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{S_gpp}
     origin.i:48: misaligned read of addresses
-      (read 2 times, propagated 1 times) garbled mix of &{a; b}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{a; b}
 [eva] origin.i:75: assertion 'Eva,initialization' got final status invalid.
 [scope:rm_asserts] removing 2 assertion(s)
 [eva] ====== VALUES COMPUTED ======

tests/value/oracle/origin.1.res.oracle

@@ -77,7 +77,8 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     origin.i:126: misaligned read of addresses
-      (read 1 times, propagated 2 times) garbled mix of &{x; y}
+      (read in 1 statement, propagated through 2 statements)
+      garbled mix of &{x; y}
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function origin:
   r.c ∈ [--..--]

tests/value/oracle/period.res.oracle

@@ -97,9 +97,11 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     period.c:51: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{g}
+      (read in 1 statement, propagated through 1 statement) garbled mix of &
+      {g}
     period.c:53: arithmetic operation on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{g}
+      (read in 1 statement, propagated through 1 statement) garbled mix of &
+      {g}
 [scope:rm_asserts] removing 1 assertion(s)
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:

tests/value/oracle/recursion.0.res.oracle

@@ -242,7 +242,8 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     recursion.c:311: assigns clause on addresses
-      (read 2 times, propagated 1 times) garbled mix of &{x; a; \copy<x>[1]}
+      (read in 1 statement, propagated through 1 statement)
+      garbled mix of &{x; a; \copy<x>[1]}
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function alarm:
   res ∈ [10..2147483647]

tests/value/oracle/reduce_by_valid.res.oracle

@@ -182,7 +182,8 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     reduce_by_valid.i:272: assigns clause on addresses
-      (read 3 times, propagated 2 times) garbled mix of &{x; a}
+      (read in 2 statements, propagated through 1 statement)
+      garbled mix of &{x; a}
 [scope:rm_asserts] removing 12 assertion(s)
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main1:

tests/value/oracle/shift.0.res.oracle

@@ -64,7 +64,8 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     shift.i:52: arithmetic operation on addresses
-      (read 1 times, propagated 2 times) garbled mix of &{t}
+      (read in 1 statement, propagated through 2 statements)
+      garbled mix of &{t}
 [eva] shift.i:35: assertion 'Eva,shift' got final status invalid.
 [eva] shift.i:36: assertion 'Eva,shift' got final status invalid.
 [eva] shift.i:40: assertion 'Eva,shift' got final status invalid.

tests/value/oracle/shift.1.res.oracle

@@ -54,7 +54,8 @@
 [eva:garbled-mix:summary] 
   Origins of garbled mix generated during analysis:
     shift.i:52: arithmetic operation on addresses
-      (read 1 times, propagated 2 times) garbled mix of &{t}
+      (read in 1 statement, propagated through 2 statements)
+      garbled mix of &{t}
 [eva] shift.i:35: assertion 'Eva,shift' got final status invalid.
 [eva] shift.i:36: assertion 'Eva,shift' got final status invalid.
 [eva] shift.i:40: assertion 'Eva,shift' got final status invalid.