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.
This commit is contained in:
Sebastian Huber
2014-02-24 10:13:32 +01:00
parent 07dc9709a4
commit 95d0c98cac
9 changed files with 137 additions and 29 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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);
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_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_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);
sc = rtems_task_delete(id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
check_tls_item(5);
}

View File

@@ -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.

View File

@@ -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

View File

@@ -0,0 +1,57 @@
/*
* Copyright (c) 2014 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
* 82178 Puchheim
* Germany
* <rtems@embedded-brains.de>
*
* 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 <rtems/score/thread.h>
#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 <rtems/confdefs.h>

View File

@@ -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.

View File

@@ -0,0 +1,2 @@
*** TEST SPTLS 3 ***
*** END OF TEST SPTLS 3 ***