From eea21eaca117ecd98afea164e1808d6530ef487f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 13 Dec 2019 06:18:36 +0100 Subject: bsps: Rework work area initialization The work area initialization was done by the BSP through bsp_work_area_initialize(). This approach predated the system initialization through the system initialization linker set. The workspace and C program heap were unconditionally initialized. The aim is to support RTEMS application configurations which do not need the workspace and C program heap. In these configurations, the workspace and C prgram heap should not get initialized. Change all bsp_work_area_initialize() to implement _Memory_Get() instead. Move the dirty memory, sbrk(), per-CPU data, workspace, and malloc() heap initialization into separate system initialization steps. This makes it also easier to test the individual initialization steps. This change adds a dependency to _Heap_Extend() to all BSPs. This dependency will be removed in a follow up change. Update #3838. --- bsps/sparc/shared/start/bspgetworkarea.c | 36 ++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 11 deletions(-) (limited to 'bsps/sparc') diff --git a/bsps/sparc/shared/start/bspgetworkarea.c b/bsps/sparc/shared/start/bspgetworkarea.c index 8e097c8ec9..3fbeb824f2 100644 --- a/bsps/sparc/shared/start/bspgetworkarea.c +++ b/bsps/sparc/shared/start/bspgetworkarea.c @@ -13,19 +13,33 @@ #include #include +#include + /* Tells us where to put the workspace in case remote debugger is present. */ -extern uint32_t rdb_start; +extern uintptr_t rdb_start; -/* - * This method returns the base address and size of the area which - * is to be allocated between the RTEMS Workspace and the C Program - * Heap. - */ -void bsp_work_area_initialize(void) +static Memory_Area _Memory_Areas[ 1 ]; + +static const Memory_Information _Memory_Information = + MEMORY_INFORMATION_INITIALIZER( _Memory_Areas ); + +static void bsp_memory_initialize( void ) { - /* Early dynamic memory allocator is placed just above _end */ - void *work_area_start = (void *)&end; - uintptr_t work_area_size = (uintptr_t)rdb_start - (uintptr_t)work_area_start; + void *begin; + uintptr_t size; - bsp_work_area_initialize_default(work_area_start, work_area_size); + begin = &end; + size = rdb_start - (uintptr_t)begin; + _Memory_Initialize_by_size( &_Memory_Areas[ 0 ], begin, size ); +} + +RTEMS_SYSINIT_ITEM( + bsp_memory_initialize, + RTEMS_SYSINIT_MEMORY, + RTEMS_SYSINIT_ORDER_MIDDLE +); + +const Memory_Information *_Memory_Get( void ) +{ + return &_Memory_Information; } -- cgit v1.2.3