diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-11-09 15:16:03 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-11-10 09:22:18 +0100 |
commit | 58bced64b93ff88d91c719854a36f947d5c28ebb (patch) | |
tree | 62522270f0c050070489882230269f5cfc1a3427 /cpukit/score | |
parent | rtems: Add scheduler processor add/remove (diff) | |
download | rtems-58bced64b93ff88d91c719854a36f947d5c28ebb.tar.bz2 |
score: Move _CPU_Get_current_per_CPU_control()
Move _CPU_Get_current_per_CPU_control() from <rtems/score/cpu.h> to
<rtems/score/cpuimpl.h>.
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/cpu/no_cpu/rtems/score/cpu.h | 18 | ||||
-rw-r--r-- | cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h | 20 | ||||
-rw-r--r-- | cpukit/score/cpu/sparc/rtems/score/cpu.h | 8 | ||||
-rw-r--r-- | cpukit/score/cpu/sparc/rtems/score/cpuimpl.h | 10 |
4 files changed, 28 insertions, 28 deletions
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h index a2ae652f60..7bacd27727 100644 --- a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h +++ b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h @@ -1419,24 +1419,6 @@ CPU_Counter_ticks _CPU_Counter_difference( CPU_Counter_ticks first ); -/** - * @brief Special register pointing to the per-CPU control of the current - * processor. - * - * This is optional. Not every CPU port needs this. It is only an optional - * optimization variant. - */ -register struct Per_CPU_Control *_CPU_Per_CPU_current asm( "rX" ); - -/** - * @brief Optional method to obtain the per-CPU control of the current processor. - * - * This is optional. Not every CPU port needs this. It is only an optional - * optimization variant. In case this macro is undefined, the default - * implementation using the current processor index will be used. - */ -#define _CPU_Get_current_per_CPU_control() ( _CPU_Per_CPU_current ) - #ifdef RTEMS_SMP /** * @brief Performs CPU specific SMP initialization in the context of the boot diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h b/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h index 457ce4c8bb..f1b03435ba 100644 --- a/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h +++ b/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2016 embedded brains GmbH. + * Copyright (c) 2015, 2016 embedded brains GmbH * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -24,6 +24,24 @@ extern "C" { #endif /** + * @brief Special register pointing to the per-CPU control of the current + * processor. + * + * This is optional. Not every CPU port needs this. It is only an optional + * optimization variant. + */ +register struct Per_CPU_Control *_CPU_Per_CPU_current asm( "rX" ); + +/** + * @brief Optional method to obtain the per-CPU control of the current processor. + * + * This is optional. Not every CPU port needs this. It is only an optional + * optimization variant. In case this macro is undefined, the default + * implementation using the current processor index will be used. + */ +#define _CPU_Get_current_per_CPU_control() ( _CPU_Per_CPU_current ) + +/** * @brief Optional method to get the executing thread. * * This is optional. Not every CPU port needs this. It is only an optional diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h index 5823544a80..a97d330665 100644 --- a/cpukit/score/cpu/sparc/rtems/score/cpu.h +++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h @@ -1185,14 +1185,6 @@ void _CPU_Context_restore( Context_Control *new_context ) RTEMS_NO_RETURN; -/** - * @brief The pointer to the current per-CPU control is available via register - * g6. - */ -register struct Per_CPU_Control *_SPARC_Per_CPU_current __asm__( "g6" ); - -#define _CPU_Get_current_per_CPU_control() _SPARC_Per_CPU_current - #if defined(RTEMS_SMP) uint32_t _CPU_SMP_Initialize( void ); diff --git a/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h b/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h index 5373db190c..bb53bf996f 100644 --- a/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h +++ b/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2016 embedded brains GmbH. + * Copyright (c) 2015, 2016 embedded brains GmbH * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -23,6 +23,14 @@ extern "C" { #endif +/** + * @brief The pointer to the current per-CPU control is available via register + * g6. + */ +register struct Per_CPU_Control *_SPARC_Per_CPU_current __asm__( "g6" ); + +#define _CPU_Get_current_per_CPU_control() _SPARC_Per_CPU_current + #define _CPU_Get_thread_executing() ( _SPARC_Per_CPU_current->executing ) #ifdef __cplusplus |