On 2023-11-22 15:27, Andrew Cooper wrote:
The differences between inline, __inline and __inline__ keywords are a
vestigial remnant of older C standards, and in Xen we use inline almost
exclusively.
Replace __inline and __inline__ with regular inline, and remove their
exceptions from the MISRA configuration.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Roger Pau Monné <roger....@citrix.com>
CC: Wei Liu <w...@xen.org>
CC: Stefano Stabellini <sstabell...@kernel.org>
CC: Roberto Bagnara <roberto.bagn...@bugseng.com>
CC: Nicola Vetrini <nicola.vetr...@bugseng.com>
CC: Simone Ballarin <simone.balla...@bugseng.com>
I'm entirely guessing at the Eclair configuration.
---
The configuration changes are ok. One observation below.
.../eclair_analysis/ECLAIR/toolchain.ecl | 6 +++---
docs/misra/C-language-toolchain.rst | 2 +-
xen/arch/x86/include/asm/apic.h | 20 +++++++++----------
xen/include/acpi/cpufreq/cpufreq.h | 4 ++--
xen/include/xen/bitops.h | 4 ++--
xen/include/xen/compiler.h | 7 +++----
6 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/automation/eclair_analysis/ECLAIR/toolchain.ecl
b/automation/eclair_analysis/ECLAIR/toolchain.ecl
index e6cd289b5e92..71a1e2cce029 100644
--- a/automation/eclair_analysis/ECLAIR/toolchain.ecl
+++ b/automation/eclair_analysis/ECLAIR/toolchain.ecl
@@ -15,7 +15,7 @@
_Static_assert: see Section \"2.1 C Language\" of "GCC_MANUAL".
asm, __asm__: see Sections \"6.48 Alternate Keywords\" and \"6.47
How to Use Inline Assembly Language in C Code\" of "GCC_MANUAL".
__volatile__: see Sections \"6.48 Alternate Keywords\" and
\"6.47.2.1 Volatile\" of "GCC_MANUAL".
- __const__, __inline__, __inline: see Section \"6.48 Alternate
Keywords\" of "GCC_MANUAL".
+ __const__ : see Section \"6.48 Alternate Keywords\" of
"GCC_MANUAL".
typeof, __typeof__: see Section \"6.7 Referring to a Type with
typeof\" of "GCC_MANUAL".
__alignof__, __alignof: see Sections \"6.48 Alternate Keywords\"
and \"6.44 Determining the Alignment of Functions, Types or Variables\"
of "GCC_MANUAL".
__attribute__: see Section \"6.39 Attribute Syntax\" of
"GCC_MANUAL".
@@ -23,8 +23,8 @@
__builtin_va_arg: non-documented GCC extension.
__builtin_offsetof: see Section \"6.53 Support for offsetof\" of
"GCC_MANUAL".
"
--config=STD.tokenext,behavior+={c99, GCC_ARM64,
"^(_Static_assert|asm|__asm__|__volatile__|__const__|__inline__|typeof|__typeof__|__alignof__|__attribute__|__builtin_types_compatible_p|__builtin_va_arg|__builtin_offsetof)$"}
--config=STD.tokenext,behavior+={c99, GCC_X86_64,
"^(_Static_assert|asm|__asm__|__volatile__|__const__|__inline__|__inline|typeof|__typeof__|__alignof__|__alignof|__attribute__|__builtin_types_compatible_p|__builtin_va_arg|__builtin_offsetof)$"}
+-config=STD.tokenext,behavior+={c99, GCC_ARM64,
"^(_Static_assert|asm|__asm__|__volatile__|__const__|typeof|__typeof__|__alignof__|__attribute__|__builtin_types_compatible_p|__builtin_va_arg|__builtin_offsetof)$"}
+-config=STD.tokenext,behavior+={c99, GCC_X86_64,
"^(_Static_assert|asm|__asm__|__volatile__|__const__|typeof|__typeof__|__alignof__|__alignof|__attribute__|__builtin_types_compatible_p|__builtin_va_arg|__builtin_offsetof)$"}
-doc_end
-doc_begin="Non-documented GCC extension."
diff --git a/docs/misra/C-language-toolchain.rst
b/docs/misra/C-language-toolchain.rst
index 2866cb191b1a..b7c2000992ac 100644
--- a/docs/misra/C-language-toolchain.rst
+++ b/docs/misra/C-language-toolchain.rst
@@ -84,7 +84,7 @@ The table columns are as follows:
see Sections "6.48 Alternate Keywords" and "6.47 How to Use
Inline Assembly Language in C Code" of GCC_MANUAL.
__volatile__:
see Sections "6.48 Alternate Keywords" and "6.47.2.1
Volatile" of GCC_MANUAL.
- __const__, __inline__, __inline:
+ __const__:
see Section "6.48 Alternate Keywords" of GCC_MANUAL.
typeof, __typeof__:
see Section "6.7 Referring to a Type with typeof" of
GCC_MANUAL.
diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h
index 04b8bc18df0e..16d554f2a593 100644
--- a/xen/include/xen/compiler.h
+++ b/xen/include/xen/compiler.h
@@ -20,9 +20,8 @@
#define likely(x) __builtin_expect(!!(x),1)
#define unlikely(x) __builtin_expect(!!(x),0)
-#define inline __inline__
-#define always_inline __inline__ __attribute__ ((__always_inline__))
-#define gnu_inline __inline__ __attribute__ ((__gnu_inline__))
+#define always_inline inline __attribute__((__always_inline__))
+#define gnu_inline inline __attribute__((__gnu_inline__))
#define noinline __attribute__((__noinline__))
#define noreturn __attribute__((__noreturn__))
@@ -83,7 +82,7 @@
* inline functions not expanded inline get placed in .init.text.
*/
#include <xen/init.h>
-#define __inline__ __inline__ __init
+#define inline inline __init
The violation of Rule 20.4 (A macro shall not be defined with the same
name as a keyword) is still present due to this macro.
#endif
#define __attribute_pure__ __attribute__((__pure__))
--
Nicola Vetrini, BSc
Software Engineer, BUGSENG srl (https://bugseng.com)
