From 3ba43da922e92e76c159529acd6f868696923cb5 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 28 Jul 2023 11:55:01 +0200 Subject: score: Move Move to . These functions do not belong to an super core service. --- cpukit/include/rtems/score/gcov.h | 87 ---------------------------- cpukit/include/rtems/test-gcov.h | 87 ++++++++++++++++++++++++++++ cpukit/libtest/gcovdumpinfo.c | 96 +++++++++++++++++++++++++++++++ cpukit/libtest/gcovdumpinfobase64.c | 104 ++++++++++++++++++++++++++++++++++ cpukit/libtest/gcovinfoset.c | 43 ++++++++++++++ cpukit/libtest/testgcovbspreset.c | 2 +- cpukit/libtest/testgcovcpufatalhalt.c | 2 +- cpukit/libtest/testgcovdumpinfo.c | 4 +- cpukit/score/src/gcovdumpinfo.c | 96 ------------------------------- cpukit/score/src/gcovdumpinfobase64.c | 104 ---------------------------------- cpukit/score/src/gcovinfoset.c | 43 -------------- spec/build/cpukit/librtemscpu.yml | 4 -- spec/build/cpukit/librtemstest.yml | 4 ++ 13 files changed, 338 insertions(+), 338 deletions(-) delete mode 100644 cpukit/include/rtems/score/gcov.h create mode 100644 cpukit/include/rtems/test-gcov.h create mode 100644 cpukit/libtest/gcovdumpinfo.c create mode 100644 cpukit/libtest/gcovdumpinfobase64.c create mode 100644 cpukit/libtest/gcovinfoset.c delete mode 100644 cpukit/score/src/gcovdumpinfo.c delete mode 100644 cpukit/score/src/gcovdumpinfobase64.c delete mode 100644 cpukit/score/src/gcovinfoset.c diff --git a/cpukit/include/rtems/score/gcov.h b/cpukit/include/rtems/score/gcov.h deleted file mode 100644 index ff8ad62a15..0000000000 --- a/cpukit/include/rtems/score/gcov.h +++ /dev/null @@ -1,87 +0,0 @@ -/* SPDX-License-Identifier: BSD-2-Clause */ - -/** - * @file - * - * @ingroup RTEMSScoreGcov - * - * @brief This header file provides the interfaces of the - * @ref RTEMSScoreGcov. - */ - -/* - * Copyright (C) 2013, 2014 embedded brains GmbH & Co. KG - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _RTEMS_SCORE_GCOV_H -#define _RTEMS_SCORE_GCOV_H - -#include - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/** - * @defgroup RTEMSScoreGcov Gcov Support - * - * @ingroup RTEMSScore - * - * @brief This group contains the gocv support. - * - * @{ - */ - -RTEMS_LINKER_ROSET_DECLARE( gcov_info, const struct gcov_info * ); - -/** - * @brief Dumps the gcov information as a binary gcfn and gcda data - * stream using the put character handler. - * - * @param put_char is the put character handler used to output the data stream. - * - * @param arg is the argument passed to the put character handler. - */ -void _Gcov_Dump_info( IO_Put_char put_char, void *arg ); - -/** - * @brief Dumps the gcov information as a base64 encoded gcfn and gcda data - * stream using the put character handler. - * - * @param put_char is the put character handler used to output the data stream. - * - * @param arg is the argument passed to the put character handler. - */ -void _Gcov_Dump_info_base64( IO_Put_char put_char, void *arg ); - -/** @} */ - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _RTEMS_SCORE_GCOV_H */ diff --git a/cpukit/include/rtems/test-gcov.h b/cpukit/include/rtems/test-gcov.h new file mode 100644 index 0000000000..4c5bd44aab --- /dev/null +++ b/cpukit/include/rtems/test-gcov.h @@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSTestGcov + * + * @brief This header file provides the interfaces of the + * @ref RTEMSTestGcov. + */ + +/* + * Copyright (C) 2013, 2014 embedded brains GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _RTEMS_TEST_GCOV_H +#define _RTEMS_TEST_GCOV_H + +#include + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/** + * @defgroup RTEMSTestGcov Gcov Support + * + * @ingroup RTEMSTest + * + * @brief This group contains the gocv support. + * + * @{ + */ + +RTEMS_LINKER_ROSET_DECLARE( gcov_info, const struct gcov_info * ); + +/** + * @brief Dumps the gcov information as a binary gcfn and gcda data + * stream using the put character handler. + * + * @param put_char is the put character handler used to output the data stream. + * + * @param arg is the argument passed to the put character handler. + */ +void _Gcov_Dump_info( IO_Put_char put_char, void *arg ); + +/** + * @brief Dumps the gcov information as a base64 encoded gcfn and gcda data + * stream using the put character handler. + * + * @param put_char is the put character handler used to output the data stream. + * + * @param arg is the argument passed to the put character handler. + */ +void _Gcov_Dump_info_base64( IO_Put_char put_char, void *arg ); + +/** @} */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* _RTEMS_TEST_GCOV_H */ diff --git a/cpukit/libtest/gcovdumpinfo.c b/cpukit/libtest/gcovdumpinfo.c new file mode 100644 index 0000000000..ad2cef4eae --- /dev/null +++ b/cpukit/libtest/gcovdumpinfo.c @@ -0,0 +1,96 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSTestFrameworkImpl + * + * @brief This source file contains the implementation of _Gcov_Ddump_info(). + */ + +/* + * Copyright (C) 2021, 2022 embedded brains GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include + +typedef struct { + IO_Put_char put_char; + void *arg; +} Gcov_Context; + +static void _Gcov_Dump( const void *data, unsigned length, void *arg ) +{ + Gcov_Context *ctx; + IO_Put_char put_char; + void *ctx_arg; + const char *in; + const void *end; + + ctx = arg; + in = data; + end = in + length; + put_char = ctx->put_char; + ctx_arg = ctx->arg; + + while ( in != end ) { + ( *put_char )( *in, ctx_arg ); + ++in; + } +} + +static void _Gcov_Filename( const char *filename, void *arg ) +{ + __gcov_filename_to_gcfn( filename, _Gcov_Dump, arg ); +} + +static void *_Gcov_Allocate( unsigned length, void *arg ) +{ + (void) length; + (void) arg; + return NULL; +} + +void _Gcov_Dump_info( IO_Put_char put_char, void *arg ) +{ + Gcov_Context ctx; + const struct gcov_info * const *item; + + ctx.put_char = put_char; + ctx.arg = arg; + + RTEMS_LINKER_SET_FOREACH( gcov_info, item ) { + __gcov_info_to_gcda( + *item, + _Gcov_Filename, + _Gcov_Dump, + _Gcov_Allocate, + &ctx + ); + } +} diff --git a/cpukit/libtest/gcovdumpinfobase64.c b/cpukit/libtest/gcovdumpinfobase64.c new file mode 100644 index 0000000000..39b470fc55 --- /dev/null +++ b/cpukit/libtest/gcovdumpinfobase64.c @@ -0,0 +1,104 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSTestFrameworkImpl + * + * @brief This source file contains the implementation of + * _Gcov_Dump_info_base64(). + */ + +/* + * Copyright (C) 2021, 2022 embedded brains GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include + +#include +#include + +typedef struct { + IO_Put_char put_char; + void *arg; + int out; + size_t index; + char buf[ 57 ]; +} Gcov_Base64_context; + +static void _Gcov_Base64_put_char( int c, void *arg ) +{ + Gcov_Base64_context *ctx; + + ctx = arg; + + ( *ctx->put_char )( c, ctx->arg ); + ++ctx->out; + + if ( ctx->out >= 76 ) { + ctx->out = 0; + ( *ctx->put_char )( '\n', ctx->arg ); + } +} + +static void _Gcov_Base64_encode( int c, void *arg ) +{ + Gcov_Base64_context *ctx; + size_t index; + + ctx = arg; + index = ctx->index; + ctx->buf[ index ] = (char) c; + + if ( index == RTEMS_ARRAY_SIZE( ctx->buf ) - 1 ) { + index = 0; + _IO_Base64( + _Gcov_Base64_put_char, + ctx, + ctx->buf, + sizeof( ctx->buf ), + NULL, + INT_MAX + ); + } else { + ++index; + } + + ctx->index = index; +} + +void _Gcov_Dump_info_base64( IO_Put_char put_char, void *arg ) +{ + Gcov_Base64_context ctx; + + memset( &ctx, 0, sizeof( ctx ) ); + ctx.put_char = put_char; + ctx.arg = arg; + _Gcov_Dump_info( _Gcov_Base64_encode, &ctx ); + _IO_Base64( _Gcov_Base64_put_char, &ctx, ctx.buf, ctx.index, NULL, INT_MAX ); +} diff --git a/cpukit/libtest/gcovinfoset.c b/cpukit/libtest/gcovinfoset.c new file mode 100644 index 0000000000..79114e4d67 --- /dev/null +++ b/cpukit/libtest/gcovinfoset.c @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSTestFrameworkImpl + * + * @brief This source file contains the definition of the gcov information + * linker set. + */ + +/* + * Copyright (C) 2021, 2022 embedded brains GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include + +RTEMS_LINKER_ROSET( gcov_info, const struct gcov_info * ); diff --git a/cpukit/libtest/testgcovbspreset.c b/cpukit/libtest/testgcovbspreset.c index 2b1e399bc4..f40102c944 100644 --- a/cpukit/libtest/testgcovbspreset.c +++ b/cpukit/libtest/testgcovbspreset.c @@ -3,7 +3,7 @@ /** * @file * - * @ingroup RTEMSTest + * @ingroup RTEMSTestFrameworkImpl * * @brief This source file contains the implementation of a wrapper for * bsp_reset() which dumps the gcov information using diff --git a/cpukit/libtest/testgcovcpufatalhalt.c b/cpukit/libtest/testgcovcpufatalhalt.c index 55a4c3ee40..9ac242885b 100644 --- a/cpukit/libtest/testgcovcpufatalhalt.c +++ b/cpukit/libtest/testgcovcpufatalhalt.c @@ -3,7 +3,7 @@ /** * @file * - * @ingroup RTEMSTest + * @ingroup RTEMSTestFrameworkImpl * * @brief This source file contains the implementation of a wrapper for * _CPU_Fatal_halt() which dumps the gcov information using diff --git a/cpukit/libtest/testgcovdumpinfo.c b/cpukit/libtest/testgcovdumpinfo.c index 68ce0439fa..c1d07275e7 100644 --- a/cpukit/libtest/testgcovdumpinfo.c +++ b/cpukit/libtest/testgcovdumpinfo.c @@ -3,7 +3,7 @@ /** * @file * - * @ingroup RTEMSTest + * @ingroup RTEMSTestFrameworkImpl * * @brief This source file contains the implementation of * rtems_test_gcov_dump_info(). @@ -40,7 +40,7 @@ #include -#include +#include #include #include diff --git a/cpukit/score/src/gcovdumpinfo.c b/cpukit/score/src/gcovdumpinfo.c deleted file mode 100644 index be00df2db8..0000000000 --- a/cpukit/score/src/gcovdumpinfo.c +++ /dev/null @@ -1,96 +0,0 @@ -/* SPDX-License-Identifier: BSD-2-Clause */ - -/** - * @file - * - * @ingroup RTEMSScoreIO - * - * @brief This source file contains the implementation of _Gcov_Ddump_info(). - */ - -/* - * Copyright (C) 2021, 2022 embedded brains GmbH & Co. KG - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -typedef struct { - IO_Put_char put_char; - void *arg; -} Gcov_Context; - -static void _Gcov_Dump( const void *data, unsigned length, void *arg ) -{ - Gcov_Context *ctx; - IO_Put_char put_char; - void *ctx_arg; - const char *in; - const void *end; - - ctx = arg; - in = data; - end = in + length; - put_char = ctx->put_char; - ctx_arg = ctx->arg; - - while ( in != end ) { - ( *put_char )( *in, ctx_arg ); - ++in; - } -} - -static void _Gcov_Filename( const char *filename, void *arg ) -{ - __gcov_filename_to_gcfn( filename, _Gcov_Dump, arg ); -} - -static void *_Gcov_Allocate( unsigned length, void *arg ) -{ - (void) length; - (void) arg; - return NULL; -} - -void _Gcov_Dump_info( IO_Put_char put_char, void *arg ) -{ - Gcov_Context ctx; - const struct gcov_info * const *item; - - ctx.put_char = put_char; - ctx.arg = arg; - - RTEMS_LINKER_SET_FOREACH( gcov_info, item ) { - __gcov_info_to_gcda( - *item, - _Gcov_Filename, - _Gcov_Dump, - _Gcov_Allocate, - &ctx - ); - } -} diff --git a/cpukit/score/src/gcovdumpinfobase64.c b/cpukit/score/src/gcovdumpinfobase64.c deleted file mode 100644 index b7a9849084..0000000000 --- a/cpukit/score/src/gcovdumpinfobase64.c +++ /dev/null @@ -1,104 +0,0 @@ -/* SPDX-License-Identifier: BSD-2-Clause */ - -/** - * @file - * - * @ingroup RTEMSScoreIO - * - * @brief This source file contains the implementation of - * _Gcov_Dump_info_base64(). - */ - -/* - * Copyright (C) 2021, 2022 embedded brains GmbH & Co. KG - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include -#include - -typedef struct { - IO_Put_char put_char; - void *arg; - int out; - size_t index; - char buf[ 57 ]; -} Gcov_Base64_context; - -static void _Gcov_Base64_put_char( int c, void *arg ) -{ - Gcov_Base64_context *ctx; - - ctx = arg; - - ( *ctx->put_char )( c, ctx->arg ); - ++ctx->out; - - if ( ctx->out >= 76 ) { - ctx->out = 0; - ( *ctx->put_char )( '\n', ctx->arg ); - } -} - -static void _Gcov_Base64_encode( int c, void *arg ) -{ - Gcov_Base64_context *ctx; - size_t index; - - ctx = arg; - index = ctx->index; - ctx->buf[ index ] = (char) c; - - if ( index == RTEMS_ARRAY_SIZE( ctx->buf ) - 1 ) { - index = 0; - _IO_Base64( - _Gcov_Base64_put_char, - ctx, - ctx->buf, - sizeof( ctx->buf ), - NULL, - INT_MAX - ); - } else { - ++index; - } - - ctx->index = index; -} - -void _Gcov_Dump_info_base64( IO_Put_char put_char, void *arg ) -{ - Gcov_Base64_context ctx; - - memset( &ctx, 0, sizeof( ctx ) ); - ctx.put_char = put_char; - ctx.arg = arg; - _Gcov_Dump_info( _Gcov_Base64_encode, &ctx ); - _IO_Base64( _Gcov_Base64_put_char, &ctx, ctx.buf, ctx.index, NULL, INT_MAX ); -} diff --git a/cpukit/score/src/gcovinfoset.c b/cpukit/score/src/gcovinfoset.c deleted file mode 100644 index cb22e8252b..0000000000 --- a/cpukit/score/src/gcovinfoset.c +++ /dev/null @@ -1,43 +0,0 @@ -/* SPDX-License-Identifier: BSD-2-Clause */ - -/** - * @file - * - * @ingroup RTEMSScoreIO - * - * @brief This source file contains the definition of the gcov information - * linker set. - */ - -/* - * Copyright (C) 2021, 2022 embedded brains GmbH & Co. KG - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -RTEMS_LINKER_ROSET( gcov_info, const struct gcov_info * ); diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml index 411058ff8e..ff4ac8e944 100644 --- a/spec/build/cpukit/librtemscpu.yml +++ b/spec/build/cpukit/librtemscpu.yml @@ -345,7 +345,6 @@ install: - cpukit/include/rtems/score/coresemimpl.h - cpukit/include/rtems/score/exception.h - cpukit/include/rtems/score/freechain.h - - cpukit/include/rtems/score/gcov.h - cpukit/include/rtems/score/hash.h - cpukit/include/rtems/score/heap.h - cpukit/include/rtems/score/heapimpl.h @@ -1412,9 +1411,6 @@ source: - cpukit/score/src/debugunreachable.c - cpukit/score/src/freechain.c - cpukit/score/src/futex.c -- cpukit/score/src/gcovdumpinfobase64.c -- cpukit/score/src/gcovdumpinfo.c -- cpukit/score/src/gcovinfoset.c - cpukit/score/src/hash.c - cpukit/score/src/heap.c - cpukit/score/src/heapallocate.c diff --git a/spec/build/cpukit/librtemstest.yml b/spec/build/cpukit/librtemstest.yml index 4794312fa4..19b1066b27 100644 --- a/spec/build/cpukit/librtemstest.yml +++ b/spec/build/cpukit/librtemstest.yml @@ -12,10 +12,14 @@ install: source: - cpukit/include/rtems/test.h - cpukit/include/rtems/test-info.h + - cpukit/include/rtems/test-gcov.h - cpukit/include/rtems/test-scheduler.h install-path: ${BSP_LIBDIR} links: [] source: +- cpukit/libtest/gcovdumpinfobase64.c +- cpukit/libtest/gcovdumpinfo.c +- cpukit/libtest/gcovinfoset.c - cpukit/libtest/t-test-busy-tick.c - cpukit/libtest/t-test-busy.c - cpukit/libtest/t-test-checks-eno.c -- cgit v1.2.3