From 95d0c98cac5000da7f4f1fdd52299224b2f94235 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 24 Feb 2014 10:13:32 +0100 Subject: score: Fix thread TLS area initialization Do not use _TLS_Size here since this will lead GCC to assume that this symbol is not 0 and the later > 0 test will be optimized away. --- cpukit/score/src/threadinitialize.c | 21 ++++++++----- testsuites/sptests/Makefile.am | 1 + testsuites/sptests/configure.ac | 1 + testsuites/sptests/sptls01/init.c | 55 ++++++++++++++++++-------------- testsuites/sptests/sptls01/sptls01.doc | 2 ++ testsuites/sptests/sptls03/Makefile.am | 19 ++++++++++++ testsuites/sptests/sptls03/init.c | 57 ++++++++++++++++++++++++++++++++++ testsuites/sptests/sptls03/sptls03.doc | 14 +++++++++ testsuites/sptests/sptls03/sptls03.scn | 2 ++ 9 files changed, 140 insertions(+), 32 deletions(-) create mode 100644 testsuites/sptests/sptls03/Makefile.am create mode 100644 testsuites/sptests/sptls03/init.c create mode 100644 testsuites/sptests/sptls03/sptls03.doc create mode 100644 testsuites/sptests/sptls03/sptls03.scn diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c index bc2600afcb..94ff8650c2 100644 --- a/cpukit/score/src/threadinitialize.c +++ b/cpukit/score/src/threadinitialize.c @@ -40,16 +40,21 @@ bool _Thread_Initialize( Objects_Name name ) { - size_t actual_stack_size = 0; - void *stack = NULL; + size_t actual_stack_size = 0; + void *stack = NULL; #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE ) - void *fp_area; + void *fp_area; #endif - void *sched = NULL; - void *extensions_area; - bool extension_status; - int i; - uintptr_t tls_size = (uintptr_t) _TLS_Size; + void *sched = NULL; + void *extensions_area; + bool extension_status; + int i; + + /* + * Do not use _TLS_Size here since this will lead GCC to assume that this + * symbol is not 0 and the later > 0 test will be optimized away. + */ + uintptr_t tls_size = (uintptr_t) _TLS_BSS_end - (uintptr_t) _TLS_Data_begin; #if defined( RTEMS_SMP ) if ( rtems_configuration_is_smp_enabled() && !is_preemptible ) { diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index 83aefc6727..c9f0182606 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -30,6 +30,7 @@ SUBDIRS = \ spsimplesched03 spnsext01 spedfsched01 spedfsched02 spedfsched03 \ spcbssched01 spcbssched02 spcbssched03 spqreslib sptimespec01 \ spregion_err01 sppartition_err01 +SUBDIRS += sptls03 SUBDIRS += spcpucounter01 if HAS_CPLUSPLUS SUBDIRS += sptls02 diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 79c15c4c8b..1ef58cc071 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -36,6 +36,7 @@ AM_CONDITIONAL(HAS_CPUSET,test x"${ac_cv_header_sys_cpuset_h}" = x"yes") # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile +sptls03/Makefile spcpucounter01/Makefile sptls02/Makefile sptls01/Makefile diff --git a/testsuites/sptests/sptls01/init.c b/testsuites/sptests/sptls01/init.c index 76bd671dff..9433c2082e 100644 --- a/testsuites/sptests/sptls01/init.c +++ b/testsuites/sptests/sptls01/init.c @@ -24,6 +24,10 @@ static rtems_id master_task; static __thread volatile char tls_item = 123; +static volatile int read_write_small = 0xdeadbeef; + +static const volatile int read_only_small = 0x601dc0fe; + static void check_tls_item(int expected) { printf("TLS item = %i\n", tls_item); @@ -36,41 +40,44 @@ static void task(rtems_task_argument arg) check_tls_item(123); - sc = rtems_event_transient_send(master_task); - rtems_test_assert(sc == RTEMS_SUCCESSFUL); + sc = rtems_event_transient_send(master_task); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); - sc = rtems_task_suspend(RTEMS_SELF); - rtems_test_assert(sc == RTEMS_SUCCESSFUL); + sc = rtems_task_suspend(RTEMS_SELF); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); } static void test(void) { - rtems_id id; - rtems_status_code sc; + rtems_id id; + rtems_status_code sc; + + master_task = rtems_task_self(); - master_task = rtems_task_self(); + rtems_test_assert(read_write_small == 0xdeadbeef); + rtems_test_assert(read_only_small == 0x601dc0fe); check_tls_item(123); tls_item = 5; sc = rtems_task_create( - rtems_build_name('T', 'A', 'S', 'K'), - RTEMS_MINIMUM_PRIORITY, - RTEMS_MINIMUM_STACK_SIZE, - RTEMS_DEFAULT_MODES, - RTEMS_DEFAULT_ATTRIBUTES, - &id - ); - rtems_test_assert(sc == RTEMS_SUCCESSFUL); - - sc = rtems_task_start(id, task, 0); - rtems_test_assert(sc == RTEMS_SUCCESSFUL); - - sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT); - rtems_test_assert(sc == RTEMS_SUCCESSFUL); - - sc = rtems_task_delete(id); - rtems_test_assert(sc == RTEMS_SUCCESSFUL); + rtems_build_name('T', 'A', 'S', 'K'), + RTEMS_MINIMUM_PRIORITY, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &id + ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_start(id, task, 0); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_delete(id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); check_tls_item(5); } diff --git a/testsuites/sptests/sptls01/sptls01.doc b/testsuites/sptests/sptls01/sptls01.doc index a6cc38b81c..04aab16997 100644 --- a/testsuites/sptests/sptls01/sptls01.doc +++ b/testsuites/sptests/sptls01/sptls01.doc @@ -9,3 +9,5 @@ directives: concepts: - Ensure that thread-local storage (TLS) works minimum alignment requirements. + - Ensure that the small-data variables are accessible. On some architectures + like PowerPC the TLS ABI conflicts with other variants. diff --git a/testsuites/sptests/sptls03/Makefile.am b/testsuites/sptests/sptls03/Makefile.am new file mode 100644 index 0000000000..9d000ce6ae --- /dev/null +++ b/testsuites/sptests/sptls03/Makefile.am @@ -0,0 +1,19 @@ +rtems_tests_PROGRAMS = sptls03 +sptls03_SOURCES = init.c + +dist_rtems_tests_DATA = sptls03.scn sptls03.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(sptls03_OBJECTS) +LINK_LIBS = $(sptls03_LDLIBS) + +sptls03$(EXEEXT): $(sptls03_OBJECTS) $(sptls03_DEPENDENCIES) + @rm -f sptls03$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/sptls03/init.c b/testsuites/sptests/sptls03/init.c new file mode 100644 index 0000000000..65a0393e24 --- /dev/null +++ b/testsuites/sptests/sptls03/init.c @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2014 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif + +#include + +#include "tmacros.h" + +static volatile int read_write_small = 0xdeadbeef; + +static const volatile int read_only_small = 0x601dc0fe; + +static void test(void) +{ + Thread_Control *executing = _Thread_Get_executing(); + + rtems_test_assert(read_write_small == 0xdeadbeef); + rtems_test_assert(read_only_small == 0x601dc0fe); + + rtems_test_assert(executing->Start.tls_area == NULL); +} + +static void Init(rtems_task_argument arg) +{ + puts("\n\n*** TEST SPTLS 3 ***"); + + test(); + + puts("*** END OF TEST SPTLS 3 ***"); + + rtems_test_exit(0); +} + +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 1 + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT + +#include diff --git a/testsuites/sptests/sptls03/sptls03.doc b/testsuites/sptests/sptls03/sptls03.doc new file mode 100644 index 0000000000..2b92bcd091 --- /dev/null +++ b/testsuites/sptests/sptls03/sptls03.doc @@ -0,0 +1,14 @@ +This file describes the directives and concepts tested by this test set. + +test set name: sptls03 + +directives: + + - _Thread_Initialize() + +concepts: + + - Ensure that the thread-local storage (TLS) is not allocated if TLS is not + used. + - Ensure that the small-data variables are accessible. On some architectures + like PowerPC the TLS ABI conflicts with other variants. diff --git a/testsuites/sptests/sptls03/sptls03.scn b/testsuites/sptests/sptls03/sptls03.scn new file mode 100644 index 0000000000..3e01a8f391 --- /dev/null +++ b/testsuites/sptests/sptls03/sptls03.scn @@ -0,0 +1,2 @@ +*** TEST SPTLS 3 *** +*** END OF TEST SPTLS 3 *** -- cgit v1.2.3