Start using pdata area for less-frequently used data

[fw/altos] / ao_task.c

diff --git a/ao_task.c b/ao_task.c
index f79d6e1f184aa530917f59050856a00256b61860..043b3df2d8c9032c044561447b475b33c494ea38 100644 (file)
--- a/ao_task.c
+++ b/ao_task.c
@@ -25,13 +25,14 @@ __data uint8_t ao_cur_task_index;
 __xdata struct ao_task *__data ao_cur_task;
 
 void
-ao_add_task(__xdata struct ao_task * task, void (*start)(void))
+ao_add_task(__xdata struct ao_task * task, void (*start)(void), __code char *name)
 {
        uint8_t __xdata *stack;
        if (ao_num_tasks == AO_NUM_TASKS)
                ao_panic(AO_PANIC_NO_TASK);
        ao_tasks[ao_num_tasks++] = task;
        task->task_id = ao_num_tasks;
+       task->name = name;
        /*
         * Construct a stack frame so that it will 'return'
         * to the start of the task
@@ -65,9 +66,6 @@ ao_add_task(__xdata struct ao_task * task, void (*start)(void))
 void
 ao_yield(void) _naked
 {
-       static uint8_t __data stack_len;
-       static __data uint8_t * __data stack_ptr;
-       static __xdata uint8_t * __data save_ptr;
 
        /* Save current context */
        _asm
@@ -97,13 +95,17 @@ ao_yield(void) _naked
        
        if (ao_cur_task_index != AO_NO_TASK_INDEX)
        {
+               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;
-               while (stack_len--)
+               do
                        *save_ptr++ = *stack_ptr++;
+               while (--stack_len);
        }
        
        /* Empty the stack; might as well let interrupts have the whole thing */
@@ -121,14 +123,21 @@ ao_yield(void) _naked
                        break;
        }
 
-       /* Restore the old stack */
-       stack_len = ao_cur_task->stack_count;
-       SP = AO_STACK_START - 1 + stack_len;
+       {
+               uint8_t stack_len;
+               __data uint8_t *stack_ptr;
+               __xdata uint8_t *save_ptr;
 
-       stack_ptr = (uint8_t __data *) AO_STACK_START;
-       save_ptr = (uint8_t __xdata *) ao_cur_task->stack;
-       while (stack_len--)
-               *stack_ptr++ = *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
@@ -180,9 +189,23 @@ ao_wakeup(__xdata void *wchan)
 }
 
 void
-ao_start_scheduler(void)
+ao_task_info(void)
 {
+       uint8_t i;
+       uint8_t pc_loc;
 
+       for (i = 0; i < ao_num_tasks; i++) {
+               pc_loc = ao_tasks[i]->stack_count - 17;
+               printf("%-8s: wchan %04x pc %04x\n",
+                      ao_tasks[i]->name,
+                      (int16_t) ao_tasks[i]->wchan,
+                      (ao_tasks[i]->stack[pc_loc]) | (ao_tasks[i]->stack[pc_loc+1] << 8));
+       }
+}
+
+void
+ao_start_scheduler(void)
+{
        ao_cur_task_index = AO_NO_TASK_INDEX;
        ao_cur_task = NULL;
        ao_yield();