X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_task.h;h=03b629693c0e44baa9ba61a24caa39edc6d61ff4;hp=ffeb7313ba423af2c55cd052c6728ef4d48eb896;hb=a2df970fca0e719e4b32e1642803590ff7bbd1ee;hpb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830

diff --git a/src/kernel/ao_task.h b/src/kernel/ao_task.h
index ffeb7313..03b62969 100644
--- a/src/kernel/ao_task.h
+++ b/src/kernel/ao_task.h
@@ -26,32 +26,35 @@
 #define HAS_TASK_INFO 1
 #endif
 
-/* arm stacks must be 32-bit aligned */
+/* arm stacks must be 64-bit aligned */
+#ifndef AO_STACK_ALIGNMENT
 #ifdef __arm__
-#define AO_STACK_ALIGNMENT __attribute__ ((aligned(4)))
-#endif
-#ifdef SDCC
+#define AO_STACK_ALIGNMENT __attribute__ ((aligned(8)))
+#else
 #define AO_STACK_ALIGNMENT
 #endif
-#ifdef __AVR__
-#define AO_STACK_ALIGNMENT
 #endif
 
 /* An AltOS task */
 struct ao_task {
-	void *wchan;		/* current wait channel (NULL if running) */
+	void *wchan;			/* current wait channel (NULL if running) */
 	uint16_t alarm;			/* abort ao_sleep time */
-	ao_arch_task_members		/* any architecture-specific fields */
-	uint8_t task_id;		/* unique id */
+	uint16_t task_id;		/* unique id */
+	/* Saved stack pointer */
+	union {
+		uint32_t	*sp32;
+		uint8_t		*sp8;
+	};
 	const char *name;		/* task name */
-#ifdef NEWLIB
-	int __errno;			/* storage for errno in newlib libc */
-#endif
 #if HAS_TASK_QUEUE
 	struct ao_list	queue;
 	struct ao_list	alarm_queue;
 #endif
-	uint8_t stack[AO_STACK_SIZE] AO_STACK_ALIGNMENT;	/* saved stack */
+	/* Provide both 32-bit and 8-bit stacks */
+	union {
+		uint32_t stack32[AO_STACK_SIZE>>2];
+		uint8_t stack8[AO_STACK_SIZE];
+	} AO_STACK_ALIGNMENT;
 #if HAS_SAMPLE_PROFILE
 	uint32_t ticks;
 	uint32_t yields;
@@ -134,7 +137,7 @@ ao_task_info(void);
 
 /* Start the scheduler. This will not return */
 void
-ao_start_scheduler(void);
+ao_start_scheduler(void) __attribute__((noreturn));
 
 #if HAS_TASK_QUEUE
 void