[PATCH] score: Move _Thread_Dispatch()

[Sebastian Huber]

The _Thread_Dispatch() function was customized over time and now the
work is done by _Thread_Do_dispatch() and specialized wrappers.  The
plain _Thread_Dispatch() is now only used in some CPU ports.  Move it to
a separate file to avoid dead code in the general.

Change license to BSD-2-Clause according to file history and
re-licensing agreement.

Update #3053.
---
 cpukit/Makefile.am                     |  1 +
 cpukit/score/src/threaddispatch.c      | 21 +--------
 cpukit/score/src/threadplaindispatch.c | 60 ++++++++++++++++++++++++++
 spec/build/cpukit/librtemscpu.yml      |  1 +
 4 files changed, 63 insertions(+), 20 deletions(-)
 create mode 100644 cpukit/score/src/threadplaindispatch.c

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 1afac8f7dc..93100b5e5a 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -966,6 +966,7 @@ librtemscpu_a_SOURCES += score/src/threadhandler.c
 librtemscpu_a_SOURCES += score/src/threadinitialize.c
 librtemscpu_a_SOURCES += score/src/threadidledefault.c
 librtemscpu_a_SOURCES += score/src/threadloadenv.c
+librtemscpu_a_SOURCES += score/src/threadplaindispatch.c
 librtemscpu_a_SOURCES += score/src/threadrestart.c
 librtemscpu_a_SOURCES += score/src/threadselfid.c
 librtemscpu_a_SOURCES += score/src/threadsetstate.c
diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c
index fd3f4eda4d..1d317ad2b1 100644
--- a/cpukit/score/src/threaddispatch.c
+++ b/cpukit/score/src/threaddispatch.c
@@ -5,7 +5,7 @@
  *
  * @brief This source file contains the definition of ::_Thread_Allocated_fp
  *   and ::_User_extensions_Switches_list and the implementation of
- *   _Thread_Dispatch(), _Thread_Dispatch_direct(), _Thread_Dispatch_enable(),
+ *   _Thread_Dispatch_direct(), _Thread_Dispatch_enable(),
  *   and _Thread_Do_dispatch().
  */
 
@@ -327,25 +327,6 @@ post_switch:
   _Thread_Run_post_switch_actions( executing );
 }
 
-void _Thread_Dispatch( void )
-{
-  ISR_Level        level;
-  Per_CPU_Control *cpu_self;
-
-  _ISR_Local_disable( level );
-
-  cpu_self = _Per_CPU_Get();
-
-  if ( cpu_self->dispatch_necessary ) {
-    _Profiling_Thread_dispatch_disable( cpu_self, 0 );
-    _Assert( cpu_self->thread_dispatch_disable_level == 0 );
-    cpu_self->thread_dispatch_disable_level = 1;
-    _Thread_Do_dispatch( cpu_self, level );
-  } else {
-    _ISR_Local_enable( level );
-  }
-}
-
 void _Thread_Dispatch_direct( Per_CPU_Control *cpu_self )
 {
   ISR_Level level;
diff --git a/cpukit/score/src/threadplaindispatch.c b/cpukit/score/src/threadplaindispatch.c
new file mode 100644
index 0000000000..eeb52ec42d
--- /dev/null
+++ b/cpukit/score/src/threadplaindispatch.c
@@ -0,0 +1,60 @@
+/**
+ * @file
+ *
+ * @ingroup RTEMSScoreThread
+ *
+ * @brief This source file contains the implementation of _Thread_Dispatch().
+ */
+
+/*
+ * Copyright (C) 2015, 2017 embedded brains GmbH (http://www.embedded-brains.de)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/score/threaddispatch.h>
+#include <rtems/score/assert.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/threadimpl.h>
+
+void _Thread_Dispatch( void )
+{
+  ISR_Level        level;
+  Per_CPU_Control *cpu_self;
+
+  _ISR_Local_disable( level );
+
+  cpu_self = _Per_CPU_Get();
+
+  if ( cpu_self->dispatch_necessary ) {
+    _Profiling_Thread_dispatch_disable( cpu_self, 0 );
+    _Assert( cpu_self->thread_dispatch_disable_level == 0 );
+    cpu_self->thread_dispatch_disable_level = 1;
+    _Thread_Do_dispatch( cpu_self, level );
+  } else {
+    _ISR_Local_enable( level );
+  }
+}
diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml
index 48266d408b..c03323379d 100644
--- a/spec/build/cpukit/librtemscpu.yml
+++ b/spec/build/cpukit/librtemscpu.yml
@@ -1543,6 +1543,7 @@ source:
 - cpukit/score/src/threaditerate.c
 - cpukit/score/src/threadloadenv.c
 - cpukit/score/src/threadname.c
+- cpukit/score/src/threadplaindispatch.c
 - cpukit/score/src/threadq.c
 - cpukit/score/src/threadqenqueue.c
 - cpukit/score/src/threadqextractwithproxy.c
-- 
2.31.1