Support SBRK

entities/osv.rwx.entities.yml

@@ -0,0 +1,6 @@
+-
+    name: dover.Kernel.Code.ApplyTag.sbrk_zero
+    elf_name: sbrk_zero
+    kind: symbol
+    tag_all: true
+    optional: true

osv/heap.dpl

@@ -151,6 +151,8 @@ require:
     init SOC.Memory.BRAM_CTRL_0              {}
     init SOC.Memory.DMA_0                    {}
     init SOC.Memory.QSPI_1                   {}
+
+    init SOC.MAILBOX                         {}
 
     init dover.Kernel.Code.ApplyTag.ucHeap              {RawHeap}
     init dover.Kernel.Code.ApplyTag.dover_ptr_zero      {ModColor}

osv/none.dpl

@@ -59,6 +59,8 @@ require:
    init SOC.IO.GPIO_1                       {}
    init SOC.IO.Ethernet_0                   {}
 
+   init SOC.MAILBOX                         {}
+
    init SOC.Memory.BRAM_CTRL_0              {}
    init SOC.Memory.DMA_0                    {}
    init SOC.Memory.QSPI_1                   {}

osv/rwx.dpl

@@ -39,14 +39,21 @@ import:
 metadata:
 	Rd,
 	Wr,
-	Ex
+	Ex,
+  sbrk
 
 
 policy:
   rwxPol =
-      loadGrp(mem == [-Rd] -> fail "read violation")
+      // Initialize or delete tags for memory when sbrk allocates or deallocates it
+      storeGrp(code == [+Ex], val == [+sbrk], env == _, mem == [-Rd, -Wr] -> mem = mem[+Rd, +Wr], env = env)
+    ^ loadGrp(code == [+Ex], env == _, mem == [+Rd, +sbrk] -> res = {sbrk}, env = env)
+    ^ storeGrp(code == [+Ex], val == [+sbrk], env == _, mem == [+Rd, +Wr] -> mem = {})
+
+    ^ loadGrp(mem == [-Rd] -> fail "read violation")
     ^ storeGrp(mem == [-Wr] -> fail "write violation")
     ^ allGrp(code == [-Ex] -> fail "execute violation")
+
     ^ loadGrp  (code == [+Ex], env == _, mem == [+Rd] -> res = {}, env = env)
     ^ storeGrp (code == [+Ex], env == _, mem == [+Wr] -> mem = mem, env = env)
     ^ allGrp(code == [+Ex], env == _ -> env = env)
@@ -83,6 +90,8 @@ require:
     init SOC.IO.GPIO_1                       {Rd, Wr}
     init SOC.IO.Ethernet_0                   {Rd, Wr}
 
+    init SOC.IO.MAILBOX                         {Rd, Wr}
+
     init SOC.Memory.BRAM_CTRL_0              {Rd, Wr}
     init SOC.Memory.DMA_0                    {Rd, Wr}
     init SOC.Memory.QSPI_1                   {Rd}
@@ -91,4 +100,6 @@ require:
     init elf.Section.SHF_EXECINSTR     {Ex}
     init elf.Section.SHF_WRITE         {Rd, Wr}
 
+    init dover.Kernel.Code.ApplyTag.sbrk_zero {Rd, sbrk}
+
 

policy_tests/tests/mailbox.c

@@ -0,0 +1,34 @@
+#include <stdint.h>
+#include <stdio.h>
+
+#include "test_status.h"
+#include "test.h"
+
+int test_main(void)
+{
+	test_positive();
+
+	uint32_t* const PEX_MB = (uint32_t*)0x70000080U;
+	uint32_t* const AP_MB = (uint32_t*)0x70000090U;
+	uint32_t* const MB_IRQ = (uint32_t*)0x700000a0U;
+	printf("Initial PEX mailbox value: %x\n", *PEX_MB);
+	uint32_t pex = *PEX_MB;
+	*AP_MB = 0x10101010;
+	*MB_IRQ = 1;
+	while (1) {
+		if (pex != *PEX_MB) {
+			pex = *PEX_MB;
+			if (pex < 0xFFFFFFFFU) {
+				printf("Recieved %x from PEX.  Sending %x\n", pex, pex + 0x10101010);
+				*AP_MB = pex + 0x10101010;
+				*MB_IRQ = 1;
+			} else {
+				printf("Received %x from PEX.\n", pex);
+				break;
+			}
+		}
+	}
+
+	test_pass();
+	return test_done();
+}

policy_tests/tests/sbrk.c

@@ -0,0 +1,15 @@
+#include <unistd.h>
+
+#include "test_status.h"
+#include "test.h"
+
+int test_main(void)
+{
+	test_positive();
+
+    volatile uint64_t* brk = sbrk(sizeof(uint64_t));
+    *brk = 0;
+
+	test_pass();
+	return test_done();
+}