coverage: Simplify counter expressions using simple algebra
Some of these cases currently don't occur in practice, but are included for completeness, and to avoid having to add them later as branch coverage and MC/DC coverage start building more complex expressions.
This commit is contained in:
Zalathar
parent
a68bb5e176
commit
d01df6f9aa
43 changed files with 845 additions and 1315 deletions
|
|
@ -1,44 +1,35 @@
|
|||
Function name: lazy_boolean::branch_and
|
||||
Raw bytes (42): 0x[01, 01, 03, 09, 0a, 05, 09, 05, 09, 06, 01, 13, 01, 01, 10, 03, 04, 09, 00, 0a, 05, 00, 0d, 00, 0e, 20, 09, 0a, 00, 0d, 00, 0e, 09, 00, 12, 00, 13, 03, 01, 05, 01, 02]
|
||||
Raw bytes (38): 0x[01, 01, 01, 05, 09, 06, 01, 13, 01, 01, 10, 05, 04, 09, 00, 0a, 05, 00, 0d, 00, 0e, 20, 09, 02, 00, 0d, 00, 0e, 09, 00, 12, 00, 13, 05, 01, 05, 01, 02]
|
||||
Number of files: 1
|
||||
- file 0 => global file 1
|
||||
Number of expressions: 3
|
||||
- expression 0 operands: lhs = Counter(2), rhs = Expression(2, Sub)
|
||||
- expression 1 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
- expression 2 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
Number of expressions: 1
|
||||
- expression 0 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
Number of file 0 mappings: 6
|
||||
- Code(Counter(0)) at (prev + 19, 1) to (start + 1, 16)
|
||||
- Code(Expression(0, Add)) at (prev + 4, 9) to (start + 0, 10)
|
||||
= (c2 + (c1 - c2))
|
||||
- Code(Counter(1)) at (prev + 4, 9) to (start + 0, 10)
|
||||
- Code(Counter(1)) at (prev + 0, 13) to (start + 0, 14)
|
||||
- Branch { true: Counter(2), false: Expression(2, Sub) } at (prev + 0, 13) to (start + 0, 14)
|
||||
- Branch { true: Counter(2), false: Expression(0, Sub) } at (prev + 0, 13) to (start + 0, 14)
|
||||
true = c2
|
||||
false = (c1 - c2)
|
||||
- Code(Counter(2)) at (prev + 0, 18) to (start + 0, 19)
|
||||
- Code(Expression(0, Add)) at (prev + 1, 5) to (start + 1, 2)
|
||||
= (c2 + (c1 - c2))
|
||||
- Code(Counter(1)) at (prev + 1, 5) to (start + 1, 2)
|
||||
|
||||
Function name: lazy_boolean::branch_or
|
||||
Raw bytes (44): 0x[01, 01, 04, 09, 0e, 05, 09, 05, 09, 05, 09, 06, 01, 1b, 01, 01, 10, 03, 04, 09, 00, 0a, 05, 00, 0d, 00, 0e, 20, 09, 0e, 00, 0d, 00, 0e, 0e, 00, 12, 00, 13, 03, 01, 05, 01, 02]
|
||||
Raw bytes (38): 0x[01, 01, 01, 05, 09, 06, 01, 1b, 01, 01, 10, 05, 04, 09, 00, 0a, 05, 00, 0d, 00, 0e, 20, 09, 02, 00, 0d, 00, 0e, 02, 00, 12, 00, 13, 05, 01, 05, 01, 02]
|
||||
Number of files: 1
|
||||
- file 0 => global file 1
|
||||
Number of expressions: 4
|
||||
- expression 0 operands: lhs = Counter(2), rhs = Expression(3, Sub)
|
||||
- expression 1 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
- expression 2 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
- expression 3 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
Number of expressions: 1
|
||||
- expression 0 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
Number of file 0 mappings: 6
|
||||
- Code(Counter(0)) at (prev + 27, 1) to (start + 1, 16)
|
||||
- Code(Expression(0, Add)) at (prev + 4, 9) to (start + 0, 10)
|
||||
= (c2 + (c1 - c2))
|
||||
- Code(Counter(1)) at (prev + 4, 9) to (start + 0, 10)
|
||||
- Code(Counter(1)) at (prev + 0, 13) to (start + 0, 14)
|
||||
- Branch { true: Counter(2), false: Expression(3, Sub) } at (prev + 0, 13) to (start + 0, 14)
|
||||
- Branch { true: Counter(2), false: Expression(0, Sub) } at (prev + 0, 13) to (start + 0, 14)
|
||||
true = c2
|
||||
false = (c1 - c2)
|
||||
- Code(Expression(3, Sub)) at (prev + 0, 18) to (start + 0, 19)
|
||||
- Code(Expression(0, Sub)) at (prev + 0, 18) to (start + 0, 19)
|
||||
= (c1 - c2)
|
||||
- Code(Expression(0, Add)) at (prev + 1, 5) to (start + 1, 2)
|
||||
= (c2 + (c1 - c2))
|
||||
- Code(Counter(1)) at (prev + 1, 5) to (start + 1, 2)
|
||||
|
||||
Function name: lazy_boolean::chain
|
||||
Raw bytes (149): 0x[01, 01, 13, 11, 07, 0b, 16, 15, 1a, 09, 0d, 05, 09, 05, 09, 09, 0d, 47, 25, 4b, 21, 19, 1d, 03, 19, 03, 19, 3e, 1d, 03, 19, 3e, 1d, 03, 19, 47, 25, 4b, 21, 19, 1d, 13, 01, 24, 01, 01, 10, 03, 04, 09, 00, 0a, 05, 00, 0d, 00, 12, 20, 09, 16, 00, 0d, 00, 12, 09, 00, 16, 00, 1b, 20, 0d, 1a, 00, 16, 00, 1b, 0d, 00, 1f, 00, 24, 20, 11, 15, 00, 1f, 00, 24, 11, 00, 28, 00, 2d, 03, 01, 05, 00, 11, 43, 03, 09, 00, 0a, 03, 00, 0d, 00, 12, 20, 19, 3e, 00, 0d, 00, 12, 3e, 00, 16, 00, 1b, 20, 1d, 3a, 00, 16, 00, 1b, 3a, 00, 1f, 00, 24, 20, 21, 25, 00, 1f, 00, 24, 25, 00, 28, 00, 2d, 43, 01, 05, 01, 02]
|
||||
|
|
@ -105,73 +96,71 @@ Number of file 0 mappings: 19
|
|||
= (((c6 + c7) + c8) + c9)
|
||||
|
||||
Function name: lazy_boolean::nested_mixed
|
||||
Raw bytes (159): 0x[01, 01, 18, 07, 22, 11, 36, 3b, 11, 09, 0d, 26, 0d, 05, 09, 05, 09, 05, 09, 26, 0d, 05, 09, 09, 0d, 3b, 11, 09, 0d, 3b, 11, 09, 0d, 19, 5f, 1d, 21, 03, 15, 15, 19, 52, 56, 15, 19, 03, 15, 19, 5f, 1d, 21, 13, 01, 31, 01, 01, 10, 03, 04, 09, 00, 0a, 05, 00, 0e, 00, 13, 20, 09, 26, 00, 0e, 00, 13, 26, 00, 17, 00, 1d, 20, 0d, 22, 00, 17, 00, 1d, 3b, 00, 23, 00, 28, 20, 11, 36, 00, 23, 00, 28, 36, 00, 2c, 00, 33, 03, 01, 05, 00, 11, 5b, 03, 09, 00, 0a, 03, 00, 0e, 00, 13, 20, 15, 56, 00, 0e, 00, 13, 15, 00, 17, 00, 1c, 20, 19, 52, 00, 17, 00, 1c, 4f, 00, 22, 00, 28, 20, 1d, 21, 00, 22, 00, 28, 1d, 00, 2c, 00, 33, 5b, 01, 05, 01, 02]
|
||||
Raw bytes (155): 0x[01, 01, 16, 33, 1a, 09, 0d, 1e, 0d, 05, 09, 05, 09, 05, 09, 1e, 0d, 05, 09, 09, 0d, 33, 11, 09, 0d, 33, 11, 09, 0d, 19, 57, 1d, 21, 03, 15, 15, 19, 4a, 4e, 15, 19, 03, 15, 19, 57, 1d, 21, 13, 01, 31, 01, 01, 10, 03, 04, 09, 00, 0a, 05, 00, 0e, 00, 13, 20, 09, 1e, 00, 0e, 00, 13, 1e, 00, 17, 00, 1d, 20, 0d, 1a, 00, 17, 00, 1d, 33, 00, 23, 00, 28, 20, 11, 2e, 00, 23, 00, 28, 2e, 00, 2c, 00, 33, 03, 01, 05, 00, 11, 53, 03, 09, 00, 0a, 03, 00, 0e, 00, 13, 20, 15, 4e, 00, 0e, 00, 13, 15, 00, 17, 00, 1c, 20, 19, 4a, 00, 17, 00, 1c, 47, 00, 22, 00, 28, 20, 1d, 21, 00, 22, 00, 28, 1d, 00, 2c, 00, 33, 53, 01, 05, 01, 02]
|
||||
Number of files: 1
|
||||
- file 0 => global file 1
|
||||
Number of expressions: 24
|
||||
- expression 0 operands: lhs = Expression(1, Add), rhs = Expression(8, Sub)
|
||||
- expression 1 operands: lhs = Counter(4), rhs = Expression(13, Sub)
|
||||
- expression 2 operands: lhs = Expression(14, Add), rhs = Counter(4)
|
||||
- expression 3 operands: lhs = Counter(2), rhs = Counter(3)
|
||||
- expression 4 operands: lhs = Expression(9, Sub), rhs = Counter(3)
|
||||
Number of expressions: 22
|
||||
- expression 0 operands: lhs = Expression(12, Add), rhs = Expression(6, Sub)
|
||||
- expression 1 operands: lhs = Counter(2), rhs = Counter(3)
|
||||
- expression 2 operands: lhs = Expression(7, Sub), rhs = Counter(3)
|
||||
- expression 3 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
- expression 4 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
- expression 5 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
- expression 6 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
- expression 6 operands: lhs = Expression(7, Sub), rhs = Counter(3)
|
||||
- expression 7 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
- expression 8 operands: lhs = Expression(9, Sub), rhs = Counter(3)
|
||||
- expression 9 operands: lhs = Counter(1), rhs = Counter(2)
|
||||
- expression 8 operands: lhs = Counter(2), rhs = Counter(3)
|
||||
- expression 9 operands: lhs = Expression(12, Add), rhs = Counter(4)
|
||||
- expression 10 operands: lhs = Counter(2), rhs = Counter(3)
|
||||
- expression 11 operands: lhs = Expression(14, Add), rhs = Counter(4)
|
||||
- expression 11 operands: lhs = Expression(12, Add), rhs = Counter(4)
|
||||
- expression 12 operands: lhs = Counter(2), rhs = Counter(3)
|
||||
- expression 13 operands: lhs = Expression(14, Add), rhs = Counter(4)
|
||||
- expression 14 operands: lhs = Counter(2), rhs = Counter(3)
|
||||
- expression 15 operands: lhs = Counter(6), rhs = Expression(23, Add)
|
||||
- expression 16 operands: lhs = Counter(7), rhs = Counter(8)
|
||||
- expression 17 operands: lhs = Expression(0, Add), rhs = Counter(5)
|
||||
- expression 13 operands: lhs = Counter(6), rhs = Expression(21, Add)
|
||||
- expression 14 operands: lhs = Counter(7), rhs = Counter(8)
|
||||
- expression 15 operands: lhs = Expression(0, Add), rhs = Counter(5)
|
||||
- expression 16 operands: lhs = Counter(5), rhs = Counter(6)
|
||||
- expression 17 operands: lhs = Expression(18, Sub), rhs = Expression(19, Sub)
|
||||
- expression 18 operands: lhs = Counter(5), rhs = Counter(6)
|
||||
- expression 19 operands: lhs = Expression(20, Sub), rhs = Expression(21, Sub)
|
||||
- expression 20 operands: lhs = Counter(5), rhs = Counter(6)
|
||||
- expression 21 operands: lhs = Expression(0, Add), rhs = Counter(5)
|
||||
- expression 22 operands: lhs = Counter(6), rhs = Expression(23, Add)
|
||||
- expression 23 operands: lhs = Counter(7), rhs = Counter(8)
|
||||
- expression 19 operands: lhs = Expression(0, Add), rhs = Counter(5)
|
||||
- expression 20 operands: lhs = Counter(6), rhs = Expression(21, Add)
|
||||
- expression 21 operands: lhs = Counter(7), rhs = Counter(8)
|
||||
Number of file 0 mappings: 19
|
||||
- Code(Counter(0)) at (prev + 49, 1) to (start + 1, 16)
|
||||
- Code(Expression(0, Add)) at (prev + 4, 9) to (start + 0, 10)
|
||||
= ((c4 + ((c2 + c3) - c4)) + ((c1 - c2) - c3))
|
||||
= ((c2 + c3) + ((c1 - c2) - c3))
|
||||
- Code(Counter(1)) at (prev + 0, 14) to (start + 0, 19)
|
||||
- Branch { true: Counter(2), false: Expression(9, Sub) } at (prev + 0, 14) to (start + 0, 19)
|
||||
- Branch { true: Counter(2), false: Expression(7, Sub) } at (prev + 0, 14) to (start + 0, 19)
|
||||
true = c2
|
||||
false = (c1 - c2)
|
||||
- Code(Expression(9, Sub)) at (prev + 0, 23) to (start + 0, 29)
|
||||
- Code(Expression(7, Sub)) at (prev + 0, 23) to (start + 0, 29)
|
||||
= (c1 - c2)
|
||||
- Branch { true: Counter(3), false: Expression(8, Sub) } at (prev + 0, 23) to (start + 0, 29)
|
||||
- Branch { true: Counter(3), false: Expression(6, Sub) } at (prev + 0, 23) to (start + 0, 29)
|
||||
true = c3
|
||||
false = ((c1 - c2) - c3)
|
||||
- Code(Expression(14, Add)) at (prev + 0, 35) to (start + 0, 40)
|
||||
- Code(Expression(12, Add)) at (prev + 0, 35) to (start + 0, 40)
|
||||
= (c2 + c3)
|
||||
- Branch { true: Counter(4), false: Expression(13, Sub) } at (prev + 0, 35) to (start + 0, 40)
|
||||
- Branch { true: Counter(4), false: Expression(11, Sub) } at (prev + 0, 35) to (start + 0, 40)
|
||||
true = c4
|
||||
false = ((c2 + c3) - c4)
|
||||
- Code(Expression(13, Sub)) at (prev + 0, 44) to (start + 0, 51)
|
||||
- Code(Expression(11, Sub)) at (prev + 0, 44) to (start + 0, 51)
|
||||
= ((c2 + c3) - c4)
|
||||
- Code(Expression(0, Add)) at (prev + 1, 5) to (start + 0, 17)
|
||||
= ((c4 + ((c2 + c3) - c4)) + ((c1 - c2) - c3))
|
||||
- Code(Expression(22, Add)) at (prev + 3, 9) to (start + 0, 10)
|
||||
= ((c2 + c3) + ((c1 - c2) - c3))
|
||||
- Code(Expression(20, Add)) at (prev + 3, 9) to (start + 0, 10)
|
||||
= (c6 + (c7 + c8))
|
||||
- Code(Expression(0, Add)) at (prev + 0, 14) to (start + 0, 19)
|
||||
= ((c4 + ((c2 + c3) - c4)) + ((c1 - c2) - c3))
|
||||
- Branch { true: Counter(5), false: Expression(21, Sub) } at (prev + 0, 14) to (start + 0, 19)
|
||||
= ((c2 + c3) + ((c1 - c2) - c3))
|
||||
- Branch { true: Counter(5), false: Expression(19, Sub) } at (prev + 0, 14) to (start + 0, 19)
|
||||
true = c5
|
||||
false = (((c4 + ((c2 + c3) - c4)) + ((c1 - c2) - c3)) - c5)
|
||||
false = (((c2 + c3) + ((c1 - c2) - c3)) - c5)
|
||||
- Code(Counter(5)) at (prev + 0, 23) to (start + 0, 28)
|
||||
- Branch { true: Counter(6), false: Expression(20, Sub) } at (prev + 0, 23) to (start + 0, 28)
|
||||
- Branch { true: Counter(6), false: Expression(18, Sub) } at (prev + 0, 23) to (start + 0, 28)
|
||||
true = c6
|
||||
false = (c5 - c6)
|
||||
- Code(Expression(19, Add)) at (prev + 0, 34) to (start + 0, 40)
|
||||
= ((c5 - c6) + (((c4 + ((c2 + c3) - c4)) + ((c1 - c2) - c3)) - c5))
|
||||
- Code(Expression(17, Add)) at (prev + 0, 34) to (start + 0, 40)
|
||||
= ((c5 - c6) + (((c2 + c3) + ((c1 - c2) - c3)) - c5))
|
||||
- Branch { true: Counter(7), false: Counter(8) } at (prev + 0, 34) to (start + 0, 40)
|
||||
true = c7
|
||||
false = c8
|
||||
- Code(Counter(7)) at (prev + 0, 44) to (start + 0, 51)
|
||||
- Code(Expression(22, Add)) at (prev + 1, 5) to (start + 1, 2)
|
||||
- Code(Expression(20, Add)) at (prev + 1, 5) to (start + 1, 2)
|
||||
= (c6 + (c7 + c8))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue