implementation

Author: jsinglet

c/misra/src/rules/DIR-4-3/LanguageNotEncapsulatedAndIsolated.ql

@@ -15,7 +15,14 @@
 import cpp
 import codingstandards.c.misra
 
-from
+from AsmStmt asm
 where
-  not isExcluded(x, Language1Package::languageNotEncapsulatedAndIsolatedQuery()) and
-select
+  not isExcluded(asm, Language1Package::languageNotEncapsulatedAndIsolatedQuery()) and
+  not exists(asm.getEnclosingFunction())
+  or
+  // in concept statements within the body constitute intermingling assembly,
+  // rather than expressions and are more general.
+  exists(Stmt sp | sp = asm.getEnclosingFunction().getEntryPoint().getASuccessor*() |
+    not sp instanceof AsmStmt and not sp instanceof ReturnStmt and not sp instanceof BlockStmt
+  )
+select asm, "Usage of non-isolated and non-encapsulated assembly language."

c/misra/test/rules/DIR-4-3/LanguageNotEncapsulatedAndIsolated.expected

@@ -1 +1,5 @@
-No expected results have yet been specified
+| test.c:6:3:6:5 | asm statement | Usage of non-isolated and non-encapsulated assembly language. |
+| test.c:11:3:11:5 | asm statement | Usage of non-isolated and non-encapsulated assembly language. |
+| test.c:32:3:32:5 | asm statement | Usage of non-isolated and non-encapsulated assembly language. |
+| test.c:37:3:37:5 | asm statement | Usage of non-isolated and non-encapsulated assembly language. |
+| test.c:58:3:58:5 | asm statement | Usage of non-isolated and non-encapsulated assembly language. |

c/misra/test/rules/DIR-4-3/test.c

@@ -1,54 +1,80 @@
-#define N1 asm("HCF") 
-#define N2 __asm__("HCF") 
+#define N1 asm("HCF")
+#define N2 __asm__("HCF")
 
-void f1(){
-    int a;
-    N1; // NON_COMPLIANT 
+void f1() {
+  int a;
+  N1; // NON_COMPLIANT
 }
 
-void f2(){
-    int a;
-    N2; // NON_COMPLIANT 
+void f2() {
+  int a;
+  N2; // NON_COMPLIANT
 }
 
-void f3(){
-    N1;
+void f3() {
+  N1; // COMPLIANT
 }
 
-void f4(){
-    N2;
+void f4() {
+  N2; // COMPLIANT
 }
 
-void f5(){
-    __asm__("HCF");
+void f5() {
+  __asm__("HCF"); // COMPLIANT
 }
 
-void f6(){
-    asm("HCF");
+void f6() {
+  asm("HCF"); // COMPLIANT
 }
 
-inline void f7(){
-    int a;
-    N1; // NON_COMPLIANT 
+inline void f7() {
+  int a;
+  N1; // NON_COMPLIANT
 }
 
-inline void f8(){
-    int a;
-    N2; // NON_COMPLIANT 
+inline void f8() {
+  int a;
+  N2; // NON_COMPLIANT
 }
 
-inline void f9(){
-    N1;
+inline void f9() {
+  N1; // COMPLIANT
 }
 
-inline void f10(){
-    N2;
+inline void f10() {
+  N2; // COMPLIANT
 }
 
-inline void f11(){
-    __asm__("HCF");
+inline void f11() {
+  __asm__("HCF"); // COMPLIANT
 }
 
-inline void f12(){
-    asm("HCF");
+inline void f12() {
+  asm("HCF"); // COMPLIANT
+}
+
+inline int f13() {
+  int a;
+  N2; // NON_COMPLIANT
+  return 0;
+}
+
+inline int f14() {
+  N1; // COMPLIANT
+  return 0;
+}
+
+inline int f15() {
+  N2; // COMPLIANT
+  return 0;
+}
+
+inline int f16() {
+  __asm__("HCF"); // COMPLIANT
+  return 0;
+}
+
+inline int f17() {
+  asm("HCF"); // COMPLIANT
+  return 0;
 }