X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_task.c;h=4593bd790c4717586d258489749212d5cf4a5aae;hb=28c3923b6180e24a77aecc7162bb2852cec7d770;hp=41520476fb6d806f722dfe57339db076ef3b5078;hpb=e9fab7dc99a0e7c22b511c5919adf7df85213252;p=fw%2Faltos

diff --git a/src/core/ao_task.c b/src/core/ao_task.c
index 41520476..4593bd79 100644
--- a/src/core/ao_task.c
+++ b/src/core/ao_task.c
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "ao.h"
+#include <ao.h>
 
 #define AO_NO_TASK_INDEX	0xff
 
@@ -24,6 +24,24 @@ __data uint8_t ao_num_tasks;
 __data uint8_t ao_cur_task_index;
 __xdata struct ao_task *__data ao_cur_task;
 
+#ifdef ao_arch_task_globals
+ao_arch_task_globals
+#endif
+
+#define AO_CHECK_STACK	0
+
+#if AO_CHECK_STACK
+static uint8_t	in_yield;
+
+static inline void ao_check_stack(void) {
+	uint8_t	q;
+	if (!in_yield && ao_cur_task && &q < &ao_cur_task->stack[0])
+		ao_panic(AO_PANIC_STACK);
+}
+#else
+#define ao_check_stack()
+#endif
+
 void
 ao_add_task(__xdata struct ao_task * task, void (*start)(void), __code char *name) __reentrant
 {
@@ -53,111 +71,58 @@ ao_add_task(__xdata struct ao_task * task, void (*start)(void), __code char *nam
 void
 ao_yield(void) ao_arch_naked_define
 {
-	ao_arch_save_context();
+	ao_arch_save_regs();
 
 	if (ao_cur_task_index == AO_NO_TASK_INDEX)
 		ao_cur_task_index = ao_num_tasks-1;
 	else
 	{
-		uint8_t stack_len;
-		__data uint8_t *stack_ptr;
-		__xdata uint8_t *save_ptr;
-		/* Save the current stack */
-		stack_len = SP - (AO_STACK_START - 1);
-		ao_cur_task->stack_count = stack_len;
-		stack_ptr = (uint8_t __data *) AO_STACK_START;
-		save_ptr = (uint8_t __xdata *) ao_cur_task->stack;
-		do
-			*save_ptr++ = *stack_ptr++;
-		while (--stack_len);
+		ao_arch_save_stack();
 	}
 
-	/* Empty the stack; might as well let interrupts have the whole thing */
-	SP = AO_STACK_START - 1;
+	ao_arch_isr_stack();
 
+#if AO_CHECK_STACK
+	in_yield = 1;
+#endif
 	/* Find a task to run. If there isn't any runnable task,
 	 * this loop will run forever, which is just fine
 	 */
 	{
-		__pdata uint8_t	ao_next_task_index = ao_cur_task_index;
+		__pdata uint8_t	ao_last_task_index = ao_cur_task_index;
 		for (;;) {
-			++ao_next_task_index;
-			if (ao_next_task_index == ao_num_tasks)
-				ao_next_task_index = 0;
+			++ao_cur_task_index;
+			if (ao_cur_task_index == ao_num_tasks)
+				ao_cur_task_index = 0;
+
+			ao_cur_task = ao_tasks[ao_cur_task_index];
 
-			ao_cur_task = ao_tasks[ao_next_task_index];
-			if (ao_cur_task->wchan == NULL) {
-				ao_cur_task_index = ao_next_task_index;
+			/* Check for ready task */
+			if (ao_cur_task->wchan == NULL)
 				break;
-			}
 
 			/* Check if the alarm is set for a time which has passed */
 			if (ao_cur_task->alarm &&
-			    (int16_t) (ao_time() - ao_cur_task->alarm) >= 0) {
-				ao_cur_task_index = ao_next_task_index;
+			    (int16_t) (ao_time() - ao_cur_task->alarm) >= 0)
 				break;
-			}
 
 			/* Enter lower power mode when there isn't anything to do */
-			if (ao_next_task_index == ao_cur_task_index)
-				PCON = PCON_IDLE;
+			if (ao_cur_task_index == ao_last_task_index)
+				ao_arch_cpu_idle();
 		}
 	}
-
-	{
-		uint8_t stack_len;
-		__data uint8_t *stack_ptr;
-		__xdata uint8_t *save_ptr;
-
-		/* Restore the old stack */
-		stack_len = ao_cur_task->stack_count;
-		SP = AO_STACK_START - 1 + stack_len;
-
-		stack_ptr = (uint8_t __data *) AO_STACK_START;
-		save_ptr = (uint8_t __xdata *) ao_cur_task->stack;
-		do
-			*stack_ptr++ = *save_ptr++;
-		while (--stack_len);
-	}
-
-	_asm
-		pop		_bp
-		pop		PSW
-		pop		ar1
-		pop		ar0
-		pop		ar7
-		pop		ar6
-		pop		ar5
-		pop		ar4
-		pop		ar3
-		pop		ar2
-		pop		b
-		pop		DPH
-		pop		DPL
-		/* The next byte of the stack is the IE register.  Only the global
-		enable bit forms part of the task context.  Pop off the IE then set
-		the global enable bit to match that of the stored IE register. */
-		pop		ACC
-		JB		ACC.7,0098$
-		CLR		_EA
-		LJMP	0099$
-	0098$:
-		SETB		_EA
-	0099$:
-		/* Finally pop off the ACC, which was the first register saved. */
-		pop		ACC
-		ret
-	_endasm;
+#if AO_CHECK_STACK
+	cli();
+	in_yield = 0;
+#endif
+	ao_arch_restore_stack();
 }
 
 uint8_t
 ao_sleep(__xdata void *wchan)
 {
-	__critical {
-		ao_cur_task->wchan = wchan;
-	}
+	ao_cur_task->wchan = wchan;
 	ao_yield();
-	ao_cur_task->alarm = 0;
 	if (ao_cur_task->wchan) {
 		ao_cur_task->wchan = NULL;
 		return 1;
@@ -170,6 +135,7 @@ ao_wakeup(__xdata void *wchan)
 {
 	uint8_t	i;
 
+	ao_check_stack();
 	for (i = 0; i < ao_num_tasks; i++)
 		if (ao_tasks[i]->wchan == wchan)
 			ao_tasks[i]->wchan = NULL;
@@ -186,31 +152,36 @@ ao_alarm(uint16_t delay)
 }
 
 void
-ao_exit(void) __critical
+ao_clear_alarm(void)
 {
-	uint8_t	i;
-	ao_num_tasks--;
-	for (i = ao_cur_task_index; i < ao_num_tasks; i++)
-		ao_tasks[i] = ao_tasks[i+1];
-	ao_cur_task_index = AO_NO_TASK_INDEX;
-	ao_yield();
+	ao_cur_task->alarm = 0;
+}
+
+void
+ao_exit(void)
+{
+	ao_arch_critical(
+		uint8_t	i;
+		ao_num_tasks--;
+		for (i = ao_cur_task_index; i < ao_num_tasks; i++)
+			ao_tasks[i] = ao_tasks[i+1];
+		ao_cur_task_index = AO_NO_TASK_INDEX;
+		ao_yield();
+		);
 	/* we'll never get back here */
 }
 
 void
 ao_task_info(void)
 {
-	uint8_t	i;
-	uint8_t pc_loc;
+	uint8_t		i;
 	__xdata struct ao_task *task;
 
 	for (i = 0; i < ao_num_tasks; i++) {
 		task = ao_tasks[i];
-		pc_loc = task->stack_count - 17;
-		printf("%12s: wchan %04x pc %04x\n",
+		printf("%12s: wchan %04x\n",
 		       task->name,
-		       (int16_t) task->wchan,
-		       (task->stack[pc_loc]) | (task->stack[pc_loc+1] << 8));
+		       (int) task->wchan);
 	}
 }