ports/cheriot-rtos: Most tests now pass (but not in paste mode).

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

Author: djlowther

ports/cheriot-rtos/Makefile

@@ -27,7 +27,7 @@ INC += -I$(BUILD)
 
 INC += $(SYS_INC)
 CFLAGS_CHERIOT_A7 =  -target riscv32-unknown-unknown -mcpu=cheriot -mabi=cheriot -mxcheri-rvc -mrelax -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -fno-exceptions -fno-asynchronous-unwind-tables -fno-c++-static-destructors -fno-rtti 
-CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CHERIOT_A7) $(COPT) -DNO_ALLOCA_H -DCHERIOT_IBEX -DIBEX -DSUNBURST -DSUNBURST_SHADOW_BASE=0x30000000 -DSUNBURST_SHADOW_SIZE=0x4000 -DCPU_TIMER_HZ=33000000 -DTICK_RATE_HZ=100 -DCHERIOT_NO_AMBIENT_MALLOC -DDEVICE_EXISTS_shadow -DDEVICE_EXISTS_clint -DDEVICE_EXISTS_uart -DDEVICE_EXISTS_gpio -DDEVICE_EXISTS_gpio -DDEVICE_EXISTS_plic -DREVOKABLE_MEMORY_START=0x00100080
+CFLAGS += $(INC) -Wall -Werror -std=c2x -nostdlib $(CFLAGS_CHERIOT_A7) $(COPT) -DNO_ALLOCA_H -DCHERIOT_IBEX -DIBEX -DSUNBURST -DSUNBURST_SHADOW_BASE=0x30000000 -DSUNBURST_SHADOW_SIZE=0x4000 -DCPU_TIMER_HZ=33000000 -DTICK_RATE_HZ=100 -DCHERIOT_NO_AMBIENT_MALLOC -DDEVICE_EXISTS_shadow -DDEVICE_EXISTS_clint -DDEVICE_EXISTS_uart -DDEVICE_EXISTS_gpio -DDEVICE_EXISTS_gpio -DDEVICE_EXISTS_plic -DREVOKABLE_MEMORY_START=0x00100080
 LDFLAGS += --script=cheriot-a7-100t.ld --relax
 
 CSUPEROPT = -Os # save some code space
@@ -52,13 +52,13 @@ SRC_C = mp_entry.c \
 
 SRC_CXX =
 
-SRC_QSTR += shared/readline/readline.c shared/runtime/pyexec.c
+SRC_QSTR += shared/readline/readline.c shared/runtime/pyexec.c mp_entry.c
 
 SRC_HAL_C = shared/runtime/stdout_helpers.c
 SRC_HAL_CXX = uart_core.cpp
 
-SRC_MAIN_C = main.c
-SRC_MAIN_CXX = 
+SRC_MAIN_C =
+SRC_MAIN_CXX = main.cpp 
 
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
@@ -68,11 +68,12 @@ OBJ_HAL += $(addprefix $(BUILD)/, $(SRC_HAL_C:.c=.o))
 OBJ_HAL += $(addprefix $(BUILD)/, $(SRC_HAL_CXX:.cpp=.o))
 
 OBJ_MAIN += $(addprefix $(BUILD)/, $(SRC_MAIN_C:.c=.o))
-OBJ_MAIN += $(addprefix $(BUILD)/, $(SRC_MAINL_CXX:.cpp=.o))
+OBJ_MAIN += $(addprefix $(BUILD)/, $(SRC_MAIN_CXX:.cpp=.o))
 
 $(OBJ): CFLAGS += -DMP_VM_COMP -cheri-compartment=mp_vm
 $(OBJ_HAL): CFLAGS += -cheri-compartment=mp_hal
 $(OBJ_MAIN): CFLAGS += -cheri-compartment=main
+$(BUILD)/mp_entry.o: CFLAGS += -UCHERIOT_NO_AMBIENT_MALLOC
 
 all: $(BUILD)/micropython.uf2
 
@@ -81,7 +82,7 @@ all_objects : $(OBJ) $(OBJ_HAL) $(OBJ_MAIN)
 
 $(BUILD)/_frozen_mpy.c: $(TOP)/tests/frozen/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
 	$(ECHO) "MISC freezing bytecode"
-	$(Q)$(TOP)/tools/mpy-tool.py -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=none $< > $@
+	$(Q)$(TOP)/tools/mpy-tool.py -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=mpz $< > $@
 
 $(BUILD)/xmake.lua: xmake.lua.top xmake.lua.bottom 
 	cat xmake.lua.top > $@

ports/cheriot-rtos/main.c renamed to ports/cheriot-rtos/main.cpp

@@ -11,31 +11,54 @@
 void __cheri_compartment("main") entry(void) {
     *MMIO_CAPABILITY(uint32_t, gpio) = 0xaa;
     printf("Test\n");
-    mp_vminit();
+    MicropythonContext ctx = MicropythonContext::create(0xc000).value();
+#ifdef TEST_COMPARMENT_ENTRIES
     while(1) switch(mp_hal_stdin_rx_chr()) {
         #if MICROPY_ENABLE_COMPILER
 	case 'r':
-            if(!mp_friendly_repl()) continue;
+            if(!ctx.friendly_repl()) continue;
 	    printf("REPL exited with a failure\n");
 	    return;
         #endif
 	case 's':
-	    if(!mp_exec_str_single("print('foo', 7*8*9, [ 'bar', 'baz' ])")) continue;
+	    if(!ctx.exec_str_single("print('foo', 7*8*9, [ 'bar', 'baz' ])")) continue;
 	    printf("String execution exited with a failure\n");
 	case 'f':
-	    if(!mp_exec_frozen_module("frozentest.py")) continue;
+	    if(!ctx.exec_frozen_module("frozentest.py")) continue;
 	    printf("Frozen module exited with a failure\n");
 	    return;
-	    break;
-        case 'q':
-	    mp_vmexit();
-	    printf("VM Exited");
+	case 'e':
+	    if(!ctx.exec_str_file("def foo(a,b):\n print(a)\n return b*b\nprint('created function `foo`')")) {
+		std::optional<int> ret = ctx.exec_func<int>("foo", "bar", 7);
+		if(ret) {
+	            printf("Call to python `foo('bar', 7)` returned %d\n", *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;
     }
+#else
+    int ret = 0;
+    do {
+        while(!ret) ret = ctx.var_repl();
+	printf("soft reboot\r\n");
+	ret = ctx.restart();
+    } while(!ret);
+    printf("Restart failed with code %d\n", ret);
+    return;
+#endif
 }
 
 enum ErrorRecoveryBehaviour compartment_error_handler(struct ErrorState *frame, size_t mcause, size_t mtval) {
-    static const char * const cheri_exc_code[32] = { "NONE", "BOUNDS", "TAG", "SEAL" , "04" , "05" , "06", "07",
+    static const char * const cheri_exc_code[32] = { "UNWIND", "BOUNDS", "TAG", "SEAL" , "04" , "05" , "06", "07",
 	                                             "08", "09", "0a", "0b", "0c", "0d", "0e", "0f",
 						     "10", "EXEC", "LOAD", "STORE", "14", "STCAP", "STLOC", "17",
 						     "SYSREG", "19", "1a", "1b", "1c", "1d", "1e", "1f" };
@@ -44,7 +67,7 @@ enum ErrorRecoveryBehaviour compartment_error_handler(struct ErrorState *frame,
 
     if(mcause == 0x1c) {
         printf("CHERI fault (type %s):\n", cheri_exc_code[mtval & 0x1f]);
-        printf("\tat %p\n", frame->pcc);
+        printf("\tat %p in compartment 'main'\n", frame->pcc);
 	if(mtval & 0x400) { // S=1, special register
             switch(mtval >> 5) {
 		case 0x20: printf("\ton PCC\n"); break;
@@ -54,10 +77,13 @@ enum ErrorRecoveryBehaviour compartment_error_handler(struct ErrorState *frame,
                 case 0x3f: printf("\ton MEPCC\n"); break;
 	        default: printf("on unknown special register %ld\n", (mtval >> 5) & 0x1f); 
 	    }
-	} else {
+	} else if(mtval) {
 	    int errreg = mtval >> 5;
-            void * errcap = frame->registers[errreg - 1];
+            void * errcap = errreg ? frame->registers[errreg - 1] : NULL;
             printf("\ton capability %p [base %lx, len %lx, perms %lx] in register c%s\n", errcap, __builtin_cheri_base_get(errcap), __builtin_cheri_length_get(errcap), __builtin_cheri_perms_get(errcap), reg_names[errreg]);
+	} else {
+            printf("\r\n\x04\x04\r\n");
+            return InstallContext;
 	}
     }
     else {