2 files changed, 11 insertions, 79 deletions

diff --git a/firmware/target/arm/pp/thread-pp.c b/firmware/target/arm/pp/thread-pp.c
index ed4bdbeac1..b2e7fb018d 100644
--- a/firmware/target/arm/pp/thread-pp.c
+++ b/firmware/target/arm/pp/thread-pp.c
@@ -45,7 +45,7 @@ extern uintptr_t cpu_idlestackbegin[];
 extern uintptr_t cpu_idlestackend[];
 extern uintptr_t cop_idlestackbegin[];
 extern uintptr_t cop_idlestackend[];
-static uintptr_t * const idle_stacks[NUM_CORES] =
+uintptr_t * const idle_stacks[NUM_CORES] =
 {
     [CPU] = cpu_idlestackbegin,
     [COP] = cop_idlestackbegin
@@ -92,9 +92,7 @@ static inline void NORETURN_ATTR __attribute__((always_inline))
 {
     asm volatile (
         "cmp    %1, #0               \n" /* CPU? */
-        "ldrne  r0, =commit_dcache   \n" /* No? write back data */
-        "movne  lr, pc               \n"
-        "bxne   r0                   \n"
+        "blne   commit_dcache        \n"
         "mov    r0, %0               \n" /* copy thread parameter */
         "mov    sp, %2               \n" /* switch to idle stack  */
         "bl     thread_final_exit_do \n" /* finish removal        */
@@ -163,9 +161,7 @@ static void __attribute__((naked))
         "ldr    sp, [r0, #32]            \n" /* Reload original sp from context structure */
         "mov    r1, #0                   \n" /* Clear start address */
         "str    r1, [r0, #40]            \n"
-        "ldr    r0, =commit_discard_idcache \n" /* Invalidate new core's cache */
-        "mov    lr, pc                   \n"
-        "bx     r0                       \n"
+        "bl     commit_discard_idcache   \n" /* Invalidate new core's cache */
         "ldmfd  sp!, { r4-r11, pc }      \n" /* Restore non-volatile context to new core and return */
         : : "i"(IDLE_STACK_WORDS)
     );
diff --git a/firmware/target/hosted/sdl/thread-sdl.c b/firmware/target/hosted/sdl/thread-sdl.c
index e117a4e3b6..fda877e0f5 100644
--- a/firmware/target/hosted/sdl/thread-sdl.c
+++ b/firmware/target/hosted/sdl/thread-sdl.c
@@ -28,10 +28,7 @@
 #include <setjmp.h>
 #include "system-sdl.h"
 #include "thread-sdl.h"
-#include "system.h"
-#include "kernel.h"
-#include "thread.h"
-#include "debug.h"
+#include "../kernel-internal.h"
 #include "core_alloc.h"
 
 /* Define this as 1 to show informational messages that are not errors. */
@@ -165,6 +162,7 @@ static struct thread_entry * find_empty_thread_slot(void)
 /* Initialize SDL threading */
 void init_threads(void)
 {
+    static uintptr_t main_stack[] = { DEADBEEF, 0 };
     struct thread_entry *thread;
     int n;
 
@@ -187,8 +185,8 @@ void init_threads(void)
        then create the SDL thread - it is possible to have a quick, early
        shutdown try to access the structure. */
     thread = &threads[0];
-    thread->stack = (uintptr_t *)"       ";
-    thread->stack_size = 8;
+    thread->stack = main_stack;
+    thread->stack_size = sizeof (main_stack);
     thread->name = "main";
     thread->state = STATE_RUNNING;
     thread->context.s = SDL_CreateSemaphore(0);
@@ -439,23 +437,6 @@ unsigned int wakeup_thread_(struct thread_entry **list)
     return THREAD_NONE;
 }
 
-unsigned int thread_queue_wake(struct thread_entry **list)
-{
-    unsigned int result = THREAD_NONE;
-
-    for (;;)
-    {
-        unsigned int rc = wakeup_thread_(list);
-
-        if (rc == THREAD_NONE)
-            break;
-
-        result |= rc;
-    }
-
-    return result;
-}
-
 void thread_thaw(unsigned int thread_id)
 {
     struct thread_entry *thread = thread_id_entry(thread_id);
@@ -542,6 +523,10 @@ unsigned int create_thread(void (*function)(void),
         return 0;
     }
 
+    unsigned int stack_words = stack_size / sizeof (uintptr_t);
+    for (unsigned int i = stack_words; i-- > 0;)
+        ((uintptr_t *)stack)[i] = DEADBEEF;
+
     thread->stack = stack;
     thread->stack_size = stack_size;
     thread->name = name;
@@ -557,11 +542,7 @@ unsigned int create_thread(void (*function)(void),
     return thread->id;
 }
 
-#ifndef ALLOW_REMOVE_THREAD
 static void remove_thread(unsigned int thread_id)
-#else
-void remove_thread(unsigned int thread_id)
-#endif
 {
     struct thread_entry *current = cores[CURRENT_CORE].running;
     struct thread_entry *thread = thread_id_entry(thread_id);
@@ -657,41 +638,6 @@ void thread_wait(unsigned int thread_id)
     }
 }
 
-int thread_stack_usage(const struct thread_entry *thread)
-{
-    return 50;
-    (void)thread;
-}
-
-/* Return name if one or ID if none */
-void thread_get_name(char *buffer, int size,
-                     struct thread_entry *thread)
-{
-    if (size <= 0)
-        return;
-
-    *buffer = '\0';
-
-    if (thread)
-    {
-        /* Display thread name if one or ID if none */
-        bool named = thread->name && *thread->name;
-        const char *fmt = named ? "%s" : "%04lX";
-        intptr_t name = named ?
-            (intptr_t)thread->name : (intptr_t)thread->id;
-        snprintf(buffer, size, fmt, name);
-    }
-}
-
-/* Unless otherwise defined, do nothing */
-#ifndef YIELD_KERNEL_HOOK
-#define YIELD_KERNEL_HOOK() false
-#endif
-#ifndef SLEEP_KERNEL_HOOK
-#define SLEEP_KERNEL_HOOK(ticks) false
-#endif
-
-
 /*---------------------------------------------------------------------------
  * Suspends a thread's execution for at least the specified number of ticks.
  *
@@ -707,11 +653,6 @@ void thread_get_name(char *buffer, int size,
  */
 unsigned sleep(unsigned ticks)
 {
-    /* In certain situations, certain bootloaders in particular, a normal
-     * threading call is inappropriate. */
-    if (SLEEP_KERNEL_HOOK(ticks))
-        return 0; /* Handled */
-
     disable_irq();
     sleep_thread(ticks);
     switch_thread();
@@ -725,10 +666,5 @@ unsigned sleep(unsigned ticks)
  */
 void yield(void)
 {
-    /* In certain situations, certain bootloaders in particular, a normal
-     * threading call is inappropriate. */
-    if (YIELD_KERNEL_HOOK())
-        return; /* handled */
-
     switch_thread();
 }