config: Add CONFIGURE_DIRTY_MEMORY

Replace the BSP_DIRTY_MEMORY BSP option with a CONFIGURE_DIRTY_MEMORY
configuration option.

Update #3843.
This commit is contained in:
Sebastian Huber
2020-02-04 15:26:31 +01:00
parent 8ecbc3826e
commit 2d07ce6d21
7 changed files with 55 additions and 23 deletions

View File

@@ -24,19 +24,6 @@
*/
const char *bsp_boot_cmdline;
#if BSP_DIRTY_MEMORY == 1
static void bsp_dirty_memory(void)
{
_Memory_Fill( _Memory_Get(), 0xcf );
}
RTEMS_SYSINIT_ITEM(
bsp_dirty_memory,
RTEMS_SYSINIT_DIRTY_MEMORY,
RTEMS_SYSINIT_ORDER_MIDDLE
);
#endif
RTEMS_SYSINIT_ITEM(
bsp_start,
RTEMS_SYSINIT_BSP_START,

View File

@@ -1,17 +1,9 @@
dnl
dnl BSP_BOOTCARD_OPTIONS - some autoconf voodoo to provide each BSPs'
dnl configure script with the standard options supported by boot_card()
dnl and other required parts of the BSP Framework. Currently, this is
dnl
dnl - Can optionally dirty memory at boot time.
dnl and other required parts of the BSP Framework.
dnl
dnl To be used in bsp-configure scripts
AC_DEFUN([RTEMS_BSP_BOOTCARD_OPTIONS],[
RTEMS_BSPOPTS_SET([BSP_DIRTY_MEMORY],[*],[0])
RTEMS_BSPOPTS_HELP([BSP_DIRTY_MEMORY],
[If defined, then the BSP Framework will put a non-zero pattern into
the RTEMS Workspace and C program heap. This should assist in finding
code that assumes memory starts set to zero.])
])
AC_DEFUN([RTEMS_BSP_BOOTCARD_OPTIONS],[])

View File

@@ -853,6 +853,7 @@ librtemscpu_a_SOURCES += score/src/heapiterate.c
librtemscpu_a_SOURCES += score/src/heapgreedy.c
librtemscpu_a_SOURCES += score/src/heapnoextend.c
librtemscpu_a_SOURCES += score/src/memoryallocate.c
librtemscpu_a_SOURCES += score/src/memorydirtyfreeareas.c
librtemscpu_a_SOURCES += score/src/memoryfill.c
librtemscpu_a_SOURCES += score/src/memoryzerobeforeuse.c
librtemscpu_a_SOURCES += score/src/memoryzerofreeareas.c

View File

@@ -2802,6 +2802,14 @@ struct _reent *__getreent(void)
#endif
};
#ifdef CONFIGURE_DIRTY_MEMORY
RTEMS_SYSINIT_ITEM(
_Memory_Dirty_free_areas,
RTEMS_SYSINIT_DIRTY_MEMORY,
RTEMS_SYSINIT_ORDER_MIDDLE
);
#endif
#ifdef CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY
const bool _Memory_Zero_before_use = true;

View File

@@ -344,6 +344,11 @@ extern const bool _Memory_Zero_before_use;
*/
void _Memory_Zero_free_areas( void );
/**
* @brief Dirty all free memory areas of the system.
*/
void _Memory_Dirty_free_areas( void );
/** @} */
#ifdef __cplusplus

View File

@@ -0,0 +1,37 @@
/*
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2020 embedded brains GmbH
*
* 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.
*/
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <rtems/score/memory.h>
void _Memory_Dirty_free_areas( void )
{
_Memory_Fill( _Memory_Get(), 0xcf );
}

View File

@@ -83,6 +83,8 @@ rtems_initialization_tasks_table Initialization_tasks[1] =
#define CONFIGURE_INIT_TASK_TABLE_SIZE 0
#define CONFIGURE_INIT_TASK_STACK_SIZE 0
#define CONFIGURE_DIRTY_MEMORY
/*
* Ensure we test the case where memory is zero.
*/