import

Author: jsinglet

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

@@ -0,0 +1,21 @@
+/**
+ * @id c/misra/language-not-encapsulated-and-isolated
+ * @name DIR-4-3: Assembly language shall be encapsulated and isolated
+ * @description Failing to encapsulate assembly language limits the portability, reliability, and
+ *              readability of programs.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/dir-4-3
+ *       maintainability
+ *       readability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from
+where
+  not isExcluded(x, Language1Package::languageNotEncapsulatedAndIsolatedQuery()) and
+select

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

@@ -0,0 +1 @@
+No expected results have yet been specified

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

@@ -0,0 +1 @@
+rules/DIR-4-3/LanguageNotEncapsulatedAndIsolated.ql

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

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

cpp/common/src/codingstandards/cpp/exclusions/c/Language1.qll

@@ -3,9 +3,7 @@ import cpp
 import RuleMetadata
 import codingstandards.cpp.exclusions.RuleMetadata
 
-newtype Language1Query =
-  TLanguageNotEncapsulatedAndIsolatedQuery() or
-  TLanguageExtensionsShouldNotBeUsedQuery()
+newtype Language1Query = TLanguageNotEncapsulatedAndIsolatedQuery()
 
 predicate isLanguage1QueryMetadata(Query query, string queryId, string ruleId) {
   query =
@@ -15,14 +13,6 @@ predicate isLanguage1QueryMetadata(Query query, string queryId, string ruleId) {
     // `@id` for the `languageNotEncapsulatedAndIsolated` query
     "c/misra/language-not-encapsulated-and-isolated" and
   ruleId = "DIR-4-3"
-  or
-  query =
-    // `Query` instance for the `languageExtensionsShouldNotBeUsed` query
-    Language1Package::languageExtensionsShouldNotBeUsedQuery() and
-  queryId =
-    // `@id` for the `languageExtensionsShouldNotBeUsed` query
-    "c/misra/language-extensions-should-not-be-used" and
-  ruleId = "RULE-1-2"
 }
 
 module Language1Package {
@@ -32,11 +22,4 @@ module Language1Package {
       // `Query` type for `languageNotEncapsulatedAndIsolated` query
       TQueryC(TLanguage1PackageQuery(TLanguageNotEncapsulatedAndIsolatedQuery()))
   }
-
-  Query languageExtensionsShouldNotBeUsedQuery() {
-    //autogenerate `Query` type
-    result =
-      // `Query` type for `languageExtensionsShouldNotBeUsed` query
-      TQueryC(TLanguage1PackageQuery(TLanguageExtensionsShouldNotBeUsedQuery()))
-  }
 }

rule_packages/c/Language1.json

@@ -19,25 +19,6 @@
         }
       ],
       "title": "Assembly language shall be encapsulated and isolated"
-    },
-    "RULE-1-2": {
-      "properties": {
-        "obligation": "advisory"
-      },
-      "queries": [
-        {
-          "description": "The use of language extensions may reduce the portability and reliability of programs.",
-          "kind": "problem",
-          "name": "Language extensions should not be used",
-          "precision": "very-high",
-          "severity": "error",
-          "short_name": "LanguageExtensionsShouldNotBeUsed",
-          "tags": [
-            "maintainability"
-          ]
-        }
-      ],
-      "title": "Language extensions should not be used"
     }
   }
 }

rules.csv

@@ -617,7 +617,7 @@ c,MISRA-C-2012,RULE-4-12,Yes,Required,,,Dynamic memory allocation shall not be u
 c,MISRA-C-2012,RULE-4-13,Yes,Advisory,,,Functions which are designed to provide operations on a resource should be called in an appropriate sequence,,Contracts,Hard,
 c,MISRA-C-2012,RULE-4-14,Yes,Required,,,The validity of values received from external sources shall be checked,,Contracts,Hard,
 c,MISRA-C-2012,RULE-1-1,Yes,Required,,,"The program shall contain no violations of the standard C syntax and constraints, and shall not exceed the implementation�s translation limits",,Language,Easy,
-c,MISRA-C-2012,RULE-1-2,Yes,Advisory,,,Language extensions should not be used,,Language1,Easy,
+c,MISRA-C-2012,RULE-1-2,Yes,Advisory,,,Language extensions should not be used,,Language,Easy,
 c,MISRA-C-2012,RULE-1-3,Yes,Required,,,There shall be no occurrence of undefined or critical unspecified behaviour,,Language,Hard,
 c,MISRA-C-2012,RULE-1-4,Yes,Required,,,Emergent language features shall not be used,,Language,Medium,
 c,MISRA-C-2012,RULE-2-1,Yes,Required,,,A project shall not contain unreachable code,M0-1-1,DeadCode,Import,