RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Avoid cyclic header file dependencies

Browse Source 
There was a cyclic dependency: For RTEMS_STATIC_ANALYSIS we needed
basedefs.h in assert.h. For RTEMS_UNREACHABLE() we needed _Assert() from
assert.h in basedefs.h.

Fix this by introducing _Debug_Unreachable() in basedefs.h.

Add RTEMS_FUNCTION_NAME to basedefs.h and use it in basedefs.h and
assert.h.

Close #4900.
This commit is contained in:
Sebastian Huber
2023-04-24 14:46:43 +02:00
parent 3e4fa73935
commit 863b26ee3a
5 changed files with 129 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
testsuites/validation/tc-basedefs-no-debug.c
View File

@@ -72,9 +72,9 @@
*
* - Check that the string is equal to the expected statement.
*
* - Expand and stringify _Assert_Unreachable().
* - Expand RTEMS_FUNCTION_NAME.
*
* - Check that the string is equal to the expected statement.
* - Check that the string is equal to the expected function name.
*
* @{
*/
@@ -95,24 +95,30 @@ static void RtemsBasedefsValBasedefsNoDebug_Action_0( void )
0,
IsEqualIgnoreWhiteSpace(
s,
"do{__builtin_unreachable();do{}while(0);}while(0)"
"__builtin_unreachable()"
)
);
}
/**
* @brief Expand and stringify _Assert_Unreachable().
* @brief Expand RTEMS_FUNCTION_NAME.
*/
static void RtemsBasedefsValBasedefsNoDebug_Action_1( void )
{
const char *s;
s = RTEMS_XSTRING( _Assert_Unreachable() );
s = RTEMS_FUNCTION_NAME;
/*
* Check that the string is equal to the expected statement.
* Check that the string is equal to the expected function name.
*/
T_step_true( 1, IsEqualIgnoreWhiteSpace( s, "do{}while(0)" ) );
T_step_true(
1,
IsEqualIgnoreWhiteSpace(
s,
"RtemsBasedefsValBasedefsNoDebug_Action_1"
)
);
}
/**