MERGECOMMIT: pkg/femto-container: initial import of package

Makefile.include

@@ -662,6 +662,7 @@ endif
 # variables defined in `riotboot.mk` for `FLASHFILE` before it is evaluated.
 # It should be included after defining 'BINFILE' for 'riotboot.bin' handling.
 include $(RIOTMAKE)/boot/riotboot.mk
+include $(RIOTMAKE)/f12r.inc.mk
 
 # include suit targets
 ifneq (,$(filter suit, $(USEMODULE)))

makefiles/f12r.inc.mk

@@ -0,0 +1,20 @@
+.PHONY: f12r/%
+
+f12r/%: $$(if $$(filter f123/clean,$$@),,pkg-prepare)
+	$(Q)for app in $(F12R_DIRS); do \
+    /usr/bin/env -i RIOTBASE=$(RIOTBASE) \
+    	Q=$(Q) QQ=$(QQ) "$(MAKE)" --no-print-directory -C $${app} $*; \
+    done;
+
+clean: f12r/clean
+
+# Make the F12R_BLOBS depend on the APPS
+$(F12R_BLOBS): $(F12R_DIRS)
+# Make sure they are all built
+$(F12R_DIRS): f12r/all
+
+# Make sure the BLOBS are built
+BUILDDEPS += $(F12R_BLOBS)
+# Add the femto-container blobs to BLOBS
+BLOBS += $(F12R_BLOBS)
+

pkg/femto-container/Kconfig

@@ -0,0 +1,11 @@
+# Copyright (c) 2021 HAW Hamburg
+#
+# This file is subject to the terms and conditions of the GNU Lesser
+# General Public License v2.1. See the file LICENSE in the top level
+# directory for more details.
+#
+
+config PACKAGE_NANOCBOR
+    bool "NANOCBOR encoder and decoder library package"
+    depends on TEST_KCONFIG
+    depends on HAS_ARCH_32BIT

pkg/femto-container/Makefile

@@ -0,0 +1,9 @@
+PKG_NAME    = femto-container
+PKG_URL     = https://github.com/future-proof-iot/Femto-Container
+PKG_VERSION = 6987a20c1b3e3e5721a15a102e40d941c6bd1d81
+PKG_LICENSE = apache
+
+include $(RIOTBASE)/pkg/pkg.mk
+
+all:
+	$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(PKG_DIR)/Makefile.femto MODULE=$(PKG_NAME)

pkg/femto-container/Makefile.dep

@@ -0,0 +1 @@
+#USEMODULE += femto-container_contrib

pkg/femto-container/Makefile.femto

@@ -0,0 +1,9 @@
+EXTRA_CFLAGS += -Wno-format-nonliteral -Wno-override-init -Wno-pedantic -foptimize-sibling-calls
+CFLAGS += $(EXTRA_CFLAGS)
+NO_AUTO_SRC := 1
+SRC += bpf.c
+SRC += verify.c
+SRC += jumptable.c
+
+include $(RIOTBASE)/Makefile.base
+

pkg/femto-container/Makefile.include

@@ -0,0 +1,3 @@
+INCLUDES += -I$(RIOTPKG)/femto-container/include
+INCLUDES += -I$(PKGDIRBASE)/femto-container/include
+#DIRS += $(RIOTPKG)/femto-container/contrib

pkg/femto-container/contrib/Makefile

@@ -0,0 +1,2 @@
+MODULE := femto-container_contrib
+include $(RIOTBASE)/Makefile.base

pkg/femto-container/contrib/call.c

@@ -0,0 +1,245 @@
+/*
+ * Copyright (C) 2020 Inria
+ * Copyright (C) 2020 Koen Zandberg <koen@bergzand.net>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "femtocontainer/femtocontainer.h"
+#include "shared.h"
+#include "xtimer.h"
+
+#ifdef MODULE_GCOAP
+#include "net/gcoap.h"
+#include "net/nanocoap.h"
+#endif
+#include "saul.h"
+#include "saul_reg.h"
+#include "fmt.h"
+
+#ifdef MODULE_ZTIMER
+#include "ztimer.h"
+#endif
+
+uint32_t bpf_vm_memcpy(bpf_t *bpf, uint32_t dest_p, uint32_t src_p, uint32_t size, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a4;
+    (void)a5;
+
+    void *dest = (void *)(uintptr_t)dest_p;
+    const void *src = (const void *)(uintptr_t)src_p;
+
+    return (uintptr_t) memcpy(dest, src, size);
+}
+
+#ifdef MODULE_XTIMER
+uint32_t bpf_vm_now_ms(bpf_t *bpf, uint32_t a1, uint32_t a2, uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a1;
+    (void)a2;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+    return xtimer_now_usec64()/US_PER_MS;
+}
+#endif
+
+#ifdef MODULE_SAUL_REG
+uint32_t bpf_vm_saul_reg_find_nth(bpf_t *bpf, uint32_t nth, uint32_t a2, uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a2;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+    int pos = (int)nth;
+    saul_reg_t *reg = saul_reg_find_nth(pos);
+    return (uint32_t)(intptr_t)reg;
+}
+
+uint32_t bpf_vm_saul_reg_find_type(bpf_t *bpf, uint32_t type, uint32_t a2, uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a2;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+
+    saul_reg_t *reg = saul_reg_find_type(type);
+    return (uint32_t)(intptr_t)reg;
+}
+
+uint32_t bpf_vm_saul_reg_read(bpf_t *bpf, uint32_t dev_p, uint32_t data_p, uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+
+    saul_reg_t *dev = (saul_reg_t*)(intptr_t)dev_p;
+    phydat_t *data = (phydat_t*)(intptr_t)data_p;
+
+    int res = saul_reg_read(dev, data);
+    return (uint32_t)res;
+}
+#endif
+
+#ifdef MODULE_GCOAP
+uint32_t bpf_vm_gcoap_resp_init(bpf_t *bpf, uint32_t coap_ctx_p, uint32_t resp_code_u, uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+
+    bpf_coap_ctx_t *coap_ctx = (bpf_coap_ctx_t *)(intptr_t)coap_ctx_p;
+    unsigned resp_code = (unsigned)resp_code_u;
+
+    gcoap_resp_init(coap_ctx->pkt, coap_ctx->buf, coap_ctx->buf_len, resp_code);
+    return 0;
+}
+
+uint32_t bpf_vm_coap_add_format(bpf_t *bpf, uint32_t coap_ctx_p, uint32_t format, uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+
+    bpf_coap_ctx_t *coap_ctx = (bpf_coap_ctx_t *)(intptr_t)coap_ctx_p;
+    ssize_t res = coap_opt_add_format(coap_ctx->pkt, format);
+    return (uint32_t)res;
+}
+
+uint32_t bpf_vm_coap_opt_finish(bpf_t *bpf, uint32_t coap_ctx_p, uint32_t flags_u, uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+
+    bpf_coap_ctx_t *coap_ctx = (bpf_coap_ctx_t *)(intptr_t)coap_ctx_p;
+    uint16_t flags = (uint16_t)flags_u;
+
+    ssize_t res = coap_opt_finish(coap_ctx->pkt, flags);
+    return (uint32_t)res;
+}
+
+uint32_t bpf_vm_coap_get_pdu(bpf_t *bpf, uint32_t coap_ctx_p, uint32_t a2, uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a2;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+
+    bpf_coap_ctx_t *coap_ctx = (bpf_coap_ctx_t *)(intptr_t)coap_ctx_p;
+    return (uint32_t)(intptr_t)((coap_pkt_t*)coap_ctx->pkt)->payload;
+}
+#endif
+
+#ifdef MODULE_FMT
+uint32_t bpf_vm_fmt_s16_dfp(bpf_t *bpf, uint32_t out_p, uint32_t val, uint32_t fp_digits, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a4;
+    (void)a5;
+
+    char *out = (char*)(intptr_t)out_p;
+    size_t res = fmt_s16_dfp(out, (int16_t)val, (int)fp_digits);
+    return (uint32_t)res;
+}
+
+uint32_t bpf_vm_fmt_u32_dec(bpf_t *bpf, uint32_t out_p, uint32_t val, uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+
+    char *out = (char*)(intptr_t)out_p;
+    size_t res = fmt_u32_dec(out, (uint32_t)val);
+    return (uint32_t)res;
+}
+#endif
+
+#ifdef MODULE_ZTIMER
+uint32_t bpf_vm_ztimer_now(bpf_t *bpf, uint32_t a1, uint32_t a2,
+                           uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a1;
+    (void)a2;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+    return ztimer_now(ZTIMER_USEC);
+}
+uint32_t bpf_vm_ztimer_periodic_wakeup(bpf_t *bpf, uint32_t last_wakeup_p,
+                                       uint32_t period,
+                                       uint32_t a3, uint32_t a4, uint32_t a5)
+{
+    (void)bpf;
+    (void)a3;
+    (void)a4;
+    (void)a5;
+
+    uint32_t *last = (uint32_t*)(intptr_t)last_wakeup_p;
+
+    ztimer_periodic_wakeup(ZTIMER_USEC, last, period);
+    return 0;
+}
+#endif
+
+
+bpf_call_t bpf_get_external_call(uint32_t num)
+{
+    switch(num) {
+#ifdef MODULE_XTIMER
+        case BPF_FUNC_BPF_NOW_MS:
+            return &bpf_vm_now_ms;
+#endif
+#ifdef MODULE_SAUL_REG
+        case BPF_FUNC_BPF_SAUL_REG_FIND_NTH:
+            return &bpf_vm_saul_reg_find_nth;
+        case BPF_FUNC_BPF_SAUL_REG_FIND_TYPE:
+            return &bpf_vm_saul_reg_find_type;
+        case BPF_FUNC_BPF_SAUL_REG_READ:
+            return &bpf_vm_saul_reg_read;
+#endif
+#ifdef MODULE_GCOAP
+        case BPF_FUNC_BPF_GCOAP_RESP_INIT:
+            return &bpf_vm_gcoap_resp_init;
+        case BPF_FUNC_BPF_COAP_OPT_FINISH:
+            return &bpf_vm_coap_opt_finish;
+        case BPF_FUNC_BPF_COAP_ADD_FORMAT:
+            return &bpf_vm_coap_add_format;
+        case BPF_FUNC_BPF_COAP_GET_PDU:
+            return &bpf_vm_coap_get_pdu;
+#endif
+#ifdef MODULE_FMT
+        case BPF_FUNC_BPF_FMT_S16_DFP:
+            return &bpf_vm_fmt_s16_dfp;
+        case BPF_FUNC_BPF_FMT_U32_DEC:
+            return &bpf_vm_fmt_u32_dec;
+#endif
+#ifdef MODULE_ZTIMER
+        case BPF_FUNC_BPF_ZTIMER_NOW:
+            return &bpf_vm_ztimer_now;
+        case BPF_FUNC_BPF_ZTIMER_PERIODIC_WAKEUP:
+            return &bpf_vm_ztimer_periodic_wakeup;
+#endif
+        default:
+            return NULL;
+    }
+}