Multi-Arch Support: We support IA-32, RISCV-32, and RISCV-64

arch/bochs.mk

@@ -18,12 +18,63 @@ ${BUILD_DIR}/%/system.elf: ${BUILD_DIR}/%/system.o ${BUILD_DIR}/startup.o
 ${BUILD_DIR}/%/system.iso: ${BUILD_DIR}/%/system.elf
 	rm -rf $(shell dirname $<)/grub
 	mkdir -p $(shell dirname $<)/grub/boot/grub
-	cp grub.cfg $(shell dirname $<)/grub/boot/grub
+	cp arch/bochs/grub.cfg $(shell dirname $<)/grub/boot/grub
 	cp $< $(shell dirname $<)/grub/boot/system.elf
 	grub-mkrescue -o $@ $(shell dirname $<)/grub
 
+BOCHS_RUNNER_ARGS = \
+	-V arch/bochs/vgabios.bin                      \
+	-b arch/bochs/BIOS-bochs-latest                \
+
+${BUILD_DIR}/%/trace.pb: ${BUILD_DIR}/%/system.iso
+	${BOCHS_RUNNER} ${BOCHS_RUNNER_ARGS} -1        \
+	-f ${FAIL_TRACE}                               \
+	-e $(shell dirname $<)/system.elf              \
+	-i $(shell dirname $<)/system.iso              \
+	-- \
+	-Wf,--state-file=$(shell dirname $<)/state     \
+	-Wf,--trace-file=$(shell dirname $<)/trace.pb  \
+	-Wf,--start-symbol=start_trace                 \
+	-Wf,--end-symbol=stop_trace                    \
+	-Wf,--check-bounds
+
+
+client-%:
+	${BOCHS_RUNNER} ${BOCHS_RUNNER_ARGS}            \
+	-f ${FAIL_INJECT}                               \
+	-e ${BUILD_DIR}/$(subst client-,,$@)/system.elf \
+	-i ${BUILD_DIR}/$(subst client-,,$@)/system.iso \
+	-j $(shell getconf _NPROCESSORS_ONLN) \
+	-- \
+	-Wf,--state-dir=${BUILD_DIR}/$(subst client-,,$@)/state \
+	-Wf,--trap                    \
+	-Wf,--timeout=10              \
+	-Wf,--ok-marker=ok_marker     \
+	-Wf,--fail-marker=fail_marker \
+	-Wf,--catch-write-textsegment \
+	-Wf,--catch-outerspace        \
+	2>/dev/null | grep -B 2 -A 8 'INJECT'
+
+inject-%:
+	${BOCHS_RUNNER} ${BOCHS_RUNNER_ARGS} -1         \
+	-f ${FAIL_INJECT}                               \
+	-e ${BUILD_DIR}/$(subst inject-,,$@)/system.elf \
+	-i ${BUILD_DIR}/$(subst inject-,,$@)/system.iso \
+	-j 1 -- \
+	-Wf,--state-dir=${BUILD_DIR}/$(subst inject-,,$@)/state \
+	-Wf,--trap                    \
+	-Wf,--timeout=10              \
+	-Wf,--ok-marker=ok_marker     \
+	-Wf,--fail-marker=fail_marker \
+	-Wf,--catch-write-textsegment \
+	-Wf,--catch-outerspace
+
 define arch-make-targets
+
 build-$1: ${BUILD_DIR}/$1/system.iso
+
+trace-$1: ${BUILD_DIR}/$1/trace.pb
+
 endef
 
 

arch/bochs/grub.cfg

@@ -0,0 +1,7 @@
+set timeout=0
+set default=0
+
+menuentry "CoRedOS" {
+	multiboot /boot/system.elf
+	boot
+}

arch/riscv-common.mk

@@ -15,18 +15,51 @@ ${BUILD_DIR}/%/system.elf:  ${BUILD_DIR}/startup.o ${BUILD_DIR}/%/system.o
 	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $^
 
 
-define arch-make-targets
-build-$1: ${BUILD_DIR}/$1/system.elf
-
-trace-$1: ${BUILD_DIR}/$1/system.elf
+${BUILD_DIR}/%/trace.pb: ${BUILD_DIR}/%/system.elf
 	${FAIL_TRACE} \
-	-Wf,--elf-file      -Wf,$$<             \
+	-Wf,--elf-file      -Wf,$<             \
 	-Wf,--start-symbol  -Wf,start_trace 	\
 	-Wf,--end-symbol    -Wf,stop_trace  	\
 	-Wf,--check-bounds                      \
-	-Wf,--state-file=$$(dir $$<)/state      \
-	-Wf,--trace-file=$$(dir $$<)/trace.pb   \
-	$$<
+	-Wf,--state-file=$(dir $<)/state      \
+	-Wf,--trace-file=$(dir $<)/trace.pb   \
+	-V $<
+
+client-%:
+	${BOCHS_RUNNER} --mode sail                     \
+	-f ${FAIL_INJECT}                               \
+	-e ${BUILD_DIR}/$(subst client-,,$@)/system.elf \
+	-j $(shell getconf _NPROCESSORS_ONLN) \
+	-- \
+	-Wf,--state-dir=${BUILD_DIR}/$(subst client-,,$@)/state \
+	-Wf,--trap                    \
+	-Wf,--timeout=100000          \
+	-Wf,--ok-marker=ok_marker     \
+	-Wf,--fail-marker=fail_marker \
+	-Wf,--catch-write-textsegment \
+	-Wf,--catch-outerspace        \
+	-V 2>/dev/null | grep -B 2 -A 8 'INJECT'
+
+inject-%:
+	${BOCHS_RUNNER} --mode sail  -1  -j 1           \
+	-f ${FAIL_INJECT}                               \
+	-e ${BUILD_DIR}/$(subst inject-,,$@)/system.elf \
+	-- \
+	-Wf,--state-dir=${BUILD_DIR}/$(subst inject-,,$@)/state \
+	-Wf,--trap                    \
+	-Wf,--timeout=100000          \
+	-Wf,--ok-marker=ok_marker     \
+	-Wf,--fail-marker=fail_marker \
+	-Wf,--catch-write-textsegment \
+	-Wf,--catch-outerspace -V
+
+
+
+define arch-make-targets
+build-$1: ${BUILD_DIR}/$1/system.elf
+
+trace-$1: ${BUILD_DIR}/$1/trace.pb
+
 
 endef
 

arch/riscv/lib.c

@@ -1,3 +1,3 @@
 #include "arch/riscv/bootcode/boot.h"
 
-
+#define asm __asm__

arch/riscv32.mk

@@ -1,4 +1,4 @@
-FAIL_DOWNLOAD_URL = ${FAIL_DOWNLOAD_BASE}?job=build-riscv-generic-tools%3A+%5Briscv64%5D
+FAIL_DOWNLOAD_URL = ${FAIL_DOWNLOAD_BASE}?job=build-riscv-generic-tools%3A+%5Briscv32%5D
 
 include arch/riscv-common.mk
 

arch/riscv64.mk

@@ -0,0 +1,5 @@
+FAIL_DOWNLOAD_URL = ${FAIL_DOWNLOAD_BASE}?job=build-riscv-generic-tools%3A+%5Briscv64%5D
+
+include arch/riscv-common.mk
+
+CFLAGS += -march=rv64im -target riscv64-unknown-freebsd