rejoice! tasks suck no more

diff --git a/initrd/init b/initrd/init
index 1837b27d3f7223eef9091b43a2f2c51ecb469c4c..81965119d334c110630247f6fdc28e07a500734a 100644 (file)
--- a/initrd/init
+++ b/initrd/init
@@ -20,3 +20,4 @@ do
 while (y < 270)
 
 line 80 250 380 90 511
+

diff --git a/initrd/test.txt b/initrd/test.txt
deleted file mode 100644 (file)
index af5626b..0000000
--- a/initrd/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello, world!

diff --git a/initrd/two.bin b/initrd/two.bin
deleted file mode 100644 (file)
index b3f1928..0000000
--- a/initrd/two.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-print "yay"
-
-yesyesye

diff --git a/libinterp.a b/libinterp.a
index 39214904585d534566cba3f5055f5dbf689d8a17..f15e95662444a589f3b20489ba5c765306e620ff 100644 (file)
Binary files a/libinterp.a and b/libinterp.a differ

diff --git a/src/heap.c b/src/heap.c
index 2157aadf4c2affef4e5a58f672583a99c5c4c56c..5d32a14bf2f41f9917f72a09dfa97494e8856725 100644 (file)
--- a/src/heap.c
+++ b/src/heap.c
@@ -1,4 +1,5 @@
-#include "heap.h"
+#include <heap.h>
+#include <task.h>
 
 #define HEAP_ALIGN 16
 
@@ -20,6 +21,9 @@ void heap_init(void *buf)
 
 void *malloc(uint32_t size)
 {
+       task_hold(1);
+       if (size < 16)
+               size = 16;
        alloc_t *node = &root;
        while (node->next & 1 || node->size < size) {
                if ((node->next & ~(1)) == 0) {
@@ -34,6 +38,7 @@ void *malloc(uint32_t size)
        }
 
        node->next |= 1;
+       task_hold(0);
 
        return (void *)((uint32_t)node + sizeof(alloc_t));
 }
@@ -53,4 +58,3 @@ void free(void *buf)
        alloc_t *alloc = (alloc_t *)((uint32_t)buf - sizeof(alloc_t));
        alloc->next &= ~(1);
 }
-

diff --git a/src/main.c b/src/main.c
index c70d24b22fca93e05adfdcb933fb6646a823e4eb..0245801176dca916d44d80e9967ec5acd8c6bda2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -9,6 +9,7 @@
 #include <initrd.h>\r
 #include <serial.h>\r
 #include <parser.h>\r
+#include <builtins.h>\r
 #include <stack.h>\r
 #include <string.h>\r
 \r
@@ -100,6 +101,32 @@ int script_ppos(interpreter *it)
        return 0;\r
 }\r
 \r
+int script_color(interpreter *it)\r
+{\r
+       uint16_t c = dsp_color(igetarg_integer(it, 0), igetarg_integer(it, 1),\r
+               igetarg_integer(it, 2));\r
+       variable v;\r
+       v.valtype = INTEGER;\r
+       v.value = c;\r
+       v.svalue = 0;\r
+       isetstr(&v);\r
+       iret(it, &v);\r
+       return 0;\r
+}\r
+\r
+int script_rand(interpreter *it)\r
+{\r
+       static uint32_t next = 1;\r
+       next = (next * 182 + 1829) % igetarg_integer(it, 0);\r
+       variable v;\r
+       v.valtype = INTEGER;\r
+       v.value = next;\r
+       v.svalue = 0;\r
+       isetstr(&v);\r
+       iret(it, &v);\r
+       return 0;\r
+}\r
+\r
 void task_interpreter(void)\r
 {\r
        interpreter it;\r
@@ -110,6 +137,8 @@ void task_interpreter(void)
        inew_cfunc(&it, "rect", script_rect);\r
        inew_cfunc(&it, "ppos", script_ppos);\r
        inew_cfunc(&it, "line", script_line);\r
+       inew_cfunc(&it, "color", script_color);\r
+       inew_cfunc(&it, "rand", script_rand);\r
 \r
        /*int ret = 0;\r
        char *linebuf = malloc(100), c[2] = {0, 0};\r
@@ -134,8 +163,10 @@ void task_interpreter(void)
        }*/\r
 \r
        char *s = initrd_getfile("init");\r
-       if (s == 0)\r
+       if (s == 0) {\r
+               dsp_puts("init not found");\r
                goto end;\r
+       }\r
 \r
        char *linebuf = (char *)malloc(120);\r
        uint32_t i = 0, prev = 0, lc;\r
@@ -150,7 +181,9 @@ void task_interpreter(void)
                }\r
                strncpy(linebuf, s + prev, lc + 1);\r
                linebuf[lc] = '\0';\r
+               //task_hold(1);\r
                ret = idoline(&it, linebuf);\r
+               //task_hold(0);\r
                if (ret < 0)\r
                        break;\r
                prev = ++i;\r
@@ -171,7 +204,6 @@ end:
 void kmain(void)\r
 {\r
        asm("cpsie i");\r
-\r
        dsp_init();\r
        dsp_rect(0, 0, LCD_WIDTH, LCD_HEIGHT, dsp_color(0, 0, 0));\r
        dsp_cursoron();\r

diff --git a/src/task.c b/src/task.c
index b290e3c2a8171938dc03f4a007b8cd3bfdb16237..13e4e75655339f30c6f038d19f51373f2bc46120 100644 (file)
--- a/src/task.c
+++ b/src/task.c
@@ -3,77 +3,78 @@
 #include <stm32l476xx.h>
 
 typedef struct {
-       uint32_t *sp;
-       uint8_t use;
+       void *next;
        uint32_t *stack;
-       void (*code)(void);
+       uint32_t *sp;
 } task_t;
 
-#define MAX_TASKS      6
+static task_t *current;
+static uint8_t task_disable = 0;
 
-static task_t tasks[MAX_TASKS];
-static volatile int next_idx = 0;
+void task_hold(uint8_t hold)
+{
+       if (hold != 0)
+               task_disable++;
+       else if (task_disable > 0)
+               task_disable--;
+}
 
-static uint8_t task_enable = 0;
+void task_exit(void)
+{
+       // TODO free stack?
+       // TODO remove from chain
+       // hopefully current is preserved..?
+       while (1); // bye
+}
 
-void task_hold(uint8_t hold)
+task_t *task_create(void (*code)(void), uint32_t stackSize)
 {
-       task_enable = !hold;
+       task_t *t = (task_t *)malloc(sizeof(task_t));
+       t->next = 0;
+       t->stack = (uint32_t *)malloc(stackSize);
+       t->sp = (void *)t->stack + stackSize - 64;//16;
+       t->sp[13] = (uint32_t)task_exit;
+       t->sp[14] = (uint32_t)code;
+       t->sp[15] = 0x01000000;
+       return t;
 }
 
 void task_init(void (*init)(void))
 {
-       for (int i = 0; i < MAX_TASKS; i++)
-               tasks[i].use = 0;
-
-       task_start(init, 4096);
+       current = task_create(init, 4096);
+       current->next = current;
+       // bit 0 - priv, bit 1 - psp/msp
        asm("\
                msr psp, %0; \
                mrs r0, control; \
-               orr r0, r0, #3; \
+               orr r0, r0, #2; \
                msr control, r0; \
                isb; \
-       " :: "r" (tasks[0].sp));
+       " :: "r" (current->sp));
 
-       task_enable = 1;
+       task_disable = 0;
        init();
-}
-
-extern void _exit(int);
-void task_exit(void)
-{
-       // TODO free stack?
-       asm("cpsid i"); // hope to catch next_idx
-       tasks[next_idx].use = 0;
-       asm("cpsie i");
-       while (1); // bye
+       // you dirty dirty dog
+       /*asm("\
+               cpsie i; \
+               mov pc, %0; \
+       " :: "r" (init + 4));*/
 }
 
 void task_start(void (*task)(void), uint16_t stackSize)
 {
-       asm("cpsid i"); // just to be safe
-
-       for (int i = 0; i < MAX_TASKS; i++) {
-               if (tasks[i].use == 0) {
-                       tasks[i].stack = malloc(stackSize);
-                       tasks[i].sp = tasks[i].stack + stackSize - 16;
-                       tasks[i].sp[13] = (uint32_t)task_exit;
-                       tasks[i].sp[14] = (uint32_t)task;
-                       tasks[i].sp[15] = 0x01000000;
-                       tasks[i].use = 1;
-                       tasks[i].code = task;
-                       asm("cpsie i");
-                       return;
-               }
-       }
-
-       // TODO handle error
+       task_hold(1);
+       task_t *t = task_create(task, stackSize);
+       task_t *next = (task_t *)current->next;
+       current->next = t;
+       t->next = next;
+       task_hold(0);
 }
 
 __attribute__ ((naked))
 void PendSV_Handler(void) 
 {
-       if (task_enable == 0)
+       if (task_disable != 0)
                asm("bx lr");
 
        // save state
@@ -84,15 +85,9 @@ void PendSV_Handler(void)
                mrs r0, psp; \
                stmdb r0!, {r4-r11}; \
                mov %0, r0; \
-       " : "=r" (tasks[next_idx].sp));
+       " : "=r" (current->sp));
 
-       // find next task (round-robin style)
-       do {
-               if (++next_idx == MAX_TASKS) {
-                       next_idx = 0;
-                       break; // task 0 better exist
-               }
-       } while (tasks[next_idx].use == 0);
+       current = current->next;
 
        // restore
        asm("\
@@ -101,11 +96,10 @@ void PendSV_Handler(void)
                msr psp, r0; \
                isb; \
                dsb; \
-       " :: "r" (tasks[next_idx].sp));
+       " :: "r" (current->sp));
 
        // end
        asm("\
-               mov r0, #0xFFFFFFFD; \
                cpsie i; \
                bx lr; \
        ");