ports/cheriot-rtos: Bugfixes and scrapped C++ closures.

Signed-off-by: Duncan Lowther <[email protected]>

Author: djlowther

lib/berkeley-db-1.xx

@@ -6,8 +6,6 @@
 #include "mp_entry.h"
 #include "mphalport.h"
 
-#include <stdio.h>
-
 void __cheri_compartment("main") entry(void) {
     *MMIO_CAPABILITY(uint32_t, gpio) = 0xaa;
     printf("Test\n");
@@ -41,6 +39,26 @@ void __cheri_compartment("main") entry(void) {
 	        printf("File-mode string execution exited with a failure\n");
 		return;
 	    }
+	case 'E':
+	    if(!ctx.exec_str_file("def foo(a,b):\n print(a)\n return [a , b]\n\ndef bar(a,b):\n for x in a:\n  print(x,b)\n\nprint('created functions `foo` and `bar`')\n")) {
+		std::optional<SObj> ret = ctx.exec_func<SObj>("foo", "baz", 7);
+		if(ret) {
+	            printf("Call to python `foo('baz', 7)` returned SOobj <%x>\n", (ptraddr_t)*ret);
+		    if(ctx.exec_func<void>("bar", *ret, "quux")) {
+		        printf("Call to python `bar(foo('baz',7), 'quux')` succeeded.\n");
+		    } else {
+		        printf("Call to python `bar(foo('baz',7), 'quux')` failed.\n");
+		    }
+		    ctx.free_obj_handle(*ret);
+		    continue;
+		} else {
+		    printf("Call to python `foo('bar', 7)` failed.\n");
+		    return;
+		}
+	    } else {
+	        printf("File-mode string execution exited with a failure\n");
+		return;
+	    }
 	case 'q':
 	    printf("Exiting\n");
 	    return;

lib/mbedtls

@@ -67,6 +67,7 @@ int __cheri_compartment("mp_vm") mp_exec_str_file(SObj ctx, const char *src) {
 }
 
 int __cheri_compartment("mp_vm") mp_free_obj_handle(SObj ctx, SObj obj) {
+    MP_STATE_THREAD_HACK_INIT(token_obj_unseal(mp_ctx_key, ctx))
     obj_export_handle_t * handle = token_obj_unseal(MP_STATE_VM(obj_key), obj);
     if(!handle) return -1;
     if(handle->next) handle->next->prevnext = handle->prevnext;
@@ -101,7 +102,7 @@ static int mp_obj_to_cobj(void * ret, char type, mp_obj_t in) {
 	    obj->obj = in;
             obj->next = MP_STATE_VM(obj_export_head);
 	    obj->prevnext = &MP_STATE_VM(obj_export_head);
-	    MP_STATE_VM(obj_export_head)->prevnext = &obj->next;
+	    if(MP_STATE_VM(obj_export_head)) MP_STATE_VM(obj_export_head)->prevnext = &obj->next;
 	    MP_STATE_VM(obj_export_head) = obj;
 	    return 0;
 	}
@@ -160,13 +161,13 @@ int __cheri_compartment("mp_vm") mp_exec_func_v(SObj ctx, const char * func, voi
 		break;
             }
             case 'C': { /* Cross-compartment callback */
-	        const mp_callback_t cba = va_arg(ap, mp_callback_t);
-		mp_obj_ext_callback_t * cb = m_new_obj_var(mp_obj_ext_callback_t, sig, char, cba.n_args + 1);
+	        const mp_callback_t* cba = va_arg(ap, mp_callback_t*);
+		mp_obj_ext_callback_t * cb = m_new_obj_var(mp_obj_ext_callback_t, sig, char, cba->n_args + 1);
 	        cb->base.type = &mp_type_ext_callback;
-                cb->func = cba.func;
-		cb->data = cba.data;
-		cb->n_args = cba.n_args;
-		memcpy(&cb->sig, cba.sig, cba.n_args + 1);
+                cb->func = cba->func;
+		cb->data = cba->data;
+		cb->n_args = cba->n_args;
+		memcpy(&cb->sig, cba->sig, cba->n_args + 1);
 	        args[i] = MP_OBJ_FROM_PTR(cb);
 		break;
             }
@@ -246,7 +247,9 @@ SObj __cheri_compartment("mp_vm") mp_vminit(size_t heapsize) {
 	token_obj_destroy(MALLOC_CAPABILITY, mp_ctx_key, vm_handle);
 	return INVALID_SOBJ;
     }
+    SKey okey = token_key_new();
     MP_STATE_THREAD_HACK_INIT(ctx)
+    MP_STATE_VM(obj_key) = okey; 
     #if MICROPY_ENABLE_GC
     gc_init(heap, heap + heapsize);
     printf("GC initialised\n");

lib/micropython-lib

@@ -43,10 +43,11 @@ typedef struct {
     mp_cb_arg_t __cheri_callback (*func)(void * data, mp_cb_arg_t * args);
     void * data;
     int n_args;
-    char * sig;
+    const char * sig;
 } mp_callback_t;
 
 #ifdef __cplusplus
+
 class MicropythonContext {
   private:
     SObj ctx;
@@ -64,8 +65,9 @@ class MicropythonContext {
     static constexpr char sig_chr(const char * s) { return 's'; }
     static constexpr char sig_chr(SObj o)         { return 'O'; }
     static constexpr char sig_chr(void * p)       { return 'P'; }
-    static constexpr char sig_chr(mp_callback_t p){ return 'C'; }
     template<typename T> static constexpr char sig_chr_ty = sig_chr(static_cast<T>(0));
+    template<> static constexpr char sig_chr_ty<mp_callback_t*> = 'C';
+    template<> static constexpr char sig_chr_ty<const mp_callback_t*> = 'C';
     template<typename T> static constexpr char sig_chr_exact = 0;
     template<> static constexpr char sig_chr_exact<int> = 'i';
     template<> static constexpr char sig_chr_exact<unsigned> = 'I'; 
@@ -75,17 +77,6 @@ class MicropythonContext {
     template<> static constexpr char sig_chr_exact<SObj> = 'O';
     template<> static constexpr char sig_chr_exact<mp_callback_t> = 'C';
     template<typename T> static constexpr char sig_chr_exact<T*> = 'P';
-    template<typename R, typename... Ts>
-    static inline mp_cb_arg_t cb_wrapper_aux(std::function<R(Ts...)> * func, mp_cb_arg_t * empty, Ts... cargs) {
-        return (*func)(cargs...);
-    }
-    template<typename R, typename... Ts, typename T, typename... Us>
-    static inline mp_cb_arg_t cb_wrapper_aux(std::function<R(Ts..., T, Us...)> * func, mp_cb_arg_t * pyargs, Ts... cargs) {
-        return cb_wrapper_aux(func, pyargs + 1, cargs..., argconv<T>(pyargs[0]));
-    }
-    template<typename R, typename... Ts> static mp_cb_arg_t __cheri_callback cb_wrapper(std::function<R(Ts...)> * func, mp_cb_arg_t * args) {
-        return cb_wrapper_aux<R, Ts...>(func, args);
-    }
   public:
     [[nodiscard]] MicropythonContext(MicropythonContext&& src) : ctx(src.ctx) { src.ctx = INVALID_SOBJ; }
     [[nodiscard]] static std::optional<MicropythonContext> create(size_t heapsize) {
@@ -116,10 +107,6 @@ class MicropythonContext {
         return !err;
     }
     int free_obj_handle(SObj obj) { return mp_free_obj_handle(ctx, obj); }
-    template<typename R, typename... Ts> [[nodiscard]] static mp_callback_t leaf_callback(std::function<R(Ts...)> &func) {
-	constexpr const char sig[sizeof...(Ts) + 1] = { sig_chr_exact<R>, sig_chr_exact<Ts>... };
-        return { .func = &cb_wrapper<R, Ts...> , .data = &func , .n_args = sizeof...(Ts), .sig = sig };
-    }
 };
 
 #endif