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

nios2: Add TLS support

Browse Source 
Update #4214.
This commit is contained in:
Sebastian Huber
2021-01-08 09:04:22 +01:00
parent e324f8270f
commit c968b27fbd
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cpukit/score/cpu/nios2/nios2-context-initialize.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011 embedded brains GmbH * Copyright (c) 2011, 2021 embedded brains GmbH
* *
* Copyright (c) 2006 Kolja Waschk (rtemsdev/ixo.de) * Copyright (c) 2006 Kolja Waschk (rtemsdev/ixo.de)
* *
@@ -20,6 +20,7 @@
#include <rtems/score/cpu.h> #include <rtems/score/cpu.h>
#include <rtems/score/nios2-utility.h> #include <rtems/score/nios2-utility.h>
#include <rtems/score/interr.h> #include <rtems/score/interr.h>
#include <rtems/score/tls.h>
void _CPU_Context_Initialize( void _CPU_Context_Initialize(
Context_Control *context, Context_Control *context,
@@ -44,9 +45,12 @@ void _CPU_Context_Initialize(
if ( mpu_config != NULL ) { if ( mpu_config != NULL ) {
Nios2_MPU_Region_descriptor desc = { Nios2_MPU_Region_descriptor desc = {
.index = mpu_config->data_index_for_stack_protection, .index = mpu_config->data_index_for_stack_protection,
/* FIXME: Brocken stack allocator */ .base = stack_area_begin,
.base = (void *) ((int) stack_area_begin & ~((1 << mpu_config->data_region_size_log2) - 1)), .end = (const void *) RTEMS_ALIGN_UP(
.end = (char *) stack_area_begin + stack_area_size, (uintptr_t) stack_area_begin + stack_area_size +
_TLS_Get_allocation_size(),
1U << mpu_config->data_region_size_log2
),
.perm = NIOS2_MPU_DATA_PERM_SVR_READWRITE_USER_NONE, .perm = NIOS2_MPU_DATA_PERM_SVR_READWRITE_USER_NONE,
.data = true, .data = true,
.cacheable = mpu_config->enable_data_cache_for_stack, .cacheable = mpu_config->enable_data_cache_for_stack,
@@ -65,4 +69,11 @@ void _CPU_Context_Initialize(
_Terminate( INTERNAL_ERROR_CORE, 0xdeadbeef ); _Terminate( INTERNAL_ERROR_CORE, 0xdeadbeef );
} }
} }
if ( tls_area != NULL ) {
context->r23 = (uintptr_t) tls_area +
_TLS_Get_thread_control_block_area_size( (uintptr_t) _TLS_Alignment ) +
0x7000;
_TLS_TCB_before_TLS_block_initialize( tls_area );
}
} }