[XEN PATCH] automation/eclair: extend deviations of MISRA C:2012 Rule 16.3

[Federico Serafini <federico.serafini@xxxxxxxxxxx>]

Update ECLAIR configuration to deviate more cases where an
unintentional fallthrough cannot happen.

Signed-off-by: Federico Serafini <federico.serafini@xxxxxxxxxxx>
---
 .../eclair_analysis/ECLAIR/deviations.ecl     | 15 +++++++++++++--
 docs/misra/deviations.rst                     | 19 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl 
b/automation/eclair_analysis/ECLAIR/deviations.ecl
index fd32ff8a9c..28ce251dc1 100644
--- a/automation/eclair_analysis/ECLAIR/deviations.ecl
+++ b/automation/eclair_analysis/ECLAIR/deviations.ecl
@@ -349,11 +349,14 @@ therefore have the same behavior of a boolean"
 # Series 16.
 #
 
--doc_begin="Switch clauses ending with continue, goto, return statements are
-safe."
+-doc_begin="Switch clauses ending with an unconditional flow control statement 
(i.e. continue, goto or return) are safe."
 -config=MC3R1.R16.3,terminals+={safe, 
"node(continue_stmt||goto_stmt||return_stmt)"}
 -doc_end
 
+-doc_begin="Switch clauses ending with an if-else statement are safe if both 
branches consist of a flow control statement (i.e., break, continue, goto, 
return)."
+-config=MC3R1.R16.3,terminals+={safe, 
"node(if_stmt)&&child(then,node(break_stmt||continue_stmt||goto_stmt||return_stmt))&&child(else,node(break_stmt||continue_stmt||goto_stmt||return_stmt))"}
+-doc_end
+
 -doc_begin="Switch clauses ending with a call to a function that does not give
 the control back (i.e., a function with attribute noreturn) are safe."
 -config=MC3R1.R16.3,terminals+={safe, "call(property(noreturn))"}
@@ -368,6 +371,14 @@ safe."
 -config=MC3R1.R16.3,reports+={safe, 
"any_area(end_loc(any_exp(text(/BUG\\(\\);/))))"}
 -doc_end
 
+-doc_begin="On X86, switch clauses ending generating an exception through 
\"generate_exception()\" are safe."
+-config=MC3R1.R16.3,reports+={safe, 
"any_area(any_loc(file(^xen/arch/x86/.*$)&&any_exp(text(/generate_exception(.*?)/))))"}
+-doc_end
+
+-doc_begin="Switch clauses ending generating a parse error through 
\"PARSE_ERR_RET()\" are safe."
+-config=MC3R1.R16.3,reports+={safe, 
"any_area(any_loc(any_exp(text(/PARSE_ERR_RET(.*?)/))))"}
+-doc_end
+
 -doc_begin="Switch clauses not ending with the break statement are safe if an
 explicit comment indicating the fallthrough intention is present."
 -config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* 
[fF]all ?through.? \\*/.*$,0..1))))"}
diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst
index 123c78e20a..dbff17f493 100644
--- a/docs/misra/deviations.rst
+++ b/docs/misra/deviations.rst
@@ -291,7 +291,14 @@ Deviations related to MISRA C:2012 Rules:
      - Project-wide deviation; tagged as `deliberate` for ECLAIR.
 
    * - R16.3
-     - Switch clauses ending with continue, goto, return statements are safe.
+     - Switch clauses ending with an unconditional flow control statement
+       (i.e., continue, goto, or return) are safe.
+     - Tagged as `safe` for ECLAIR.
+
+   * - R16.3
+     - Switch clauses ending with an if-else statement are safe if both
+       branches consist of a flow control statement (i.e., continue, break,
+       goto, return).
      - Tagged as `safe` for ECLAIR.
 
    * - R16.3
@@ -307,6 +314,16 @@ Deviations related to MISRA C:2012 Rules:
      - Switch clauses ending with failure method \"BUG()\" are safe.
      - Tagged as `safe` for ECLAIR.
 
+   * - R16.3
+     - On X86, switch clauses ending generating an exception through
+       \"generate_exception()\" are safe.
+     - Tagged as `safe` for ECLAIR.
+
+   * - R16.3
+     - Switch clauses ending generating a parse error through
+       \"PARSE_ERR_RET()\" are safe.
+     - Tagged as `safe` for ECLAIR.
+
    * - R16.3
      - Existing switch clauses not ending with the break statement are safe if
        an explicit comment indicating the fallthrough intention is present.
-- 
2.34.1