1 files changed, 16 insertions, 22 deletions
diff --git a/coroutine/arm32/Context.h b/coroutine/arm32/Context.h
index 8105bd2cff..27f97908bc 100644
--- a/coroutine/arm32/Context.h
+++ b/coroutine/arm32/Context.h
@@ -10,34 +10,32 @@
 #include <assert.h>
 #include <string.h>
 
-#if __cplusplus
-extern "C" {
-#endif
-
 #define COROUTINE __attribute__((noreturn)) void
 
 enum {COROUTINE_REGISTERS = 8};
 
-typedef struct
+struct coroutine_context
 {
     void **stack_pointer;
-} coroutine_context;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
 
-typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self);
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
 
 static inline void coroutine_initialize(
-    coroutine_context *context,
+    struct coroutine_context *context,
     coroutine_start start,
-    void *stack_pointer,
-    size_t stack_size
+    void *stack,
+    size_t size
 ) {
-    context->stack_pointer = (void**)stack_pointer;
+    assert(start && stack && size >= 1024);
 
-    if (!start) {
-        assert(!context->stack_pointer);
-        /* We are main coroutine for this thread */
-        return;
-    }
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
 
     *--context->stack_pointer = (void*)start;
 
@@ -45,12 +43,8 @@ static inline void coroutine_initialize(
     memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
 }
 
-coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target);
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
 
-static inline void coroutine_destroy(coroutine_context * context)
+static inline void coroutine_destroy(struct coroutine_context * context)
 {
 }
-
-#if __cplusplus
-}
-#endif