Refine input

Author: ChinYikMing

Makefile

@@ -11,6 +11,12 @@ CFLAGS = -std=gnu99 -O2 -Wall -Wextra
 CFLAGS += -Wno-unused-label
 CFLAGS += -include src/common.h
 
+# In the system test suite, the executable is an ELF file.
+# However, the Linux kernel emulation includes the Image, DT, and
+# root filesystem (rootfs). Therefore, the test suite needs this
+# flag to load the ELF and differentiate it from the kernel emulation.
+USE_ELF ?= 0
+
 ENABLE_SYSTEM ?= 0
 $(call set-feature, SYSTEM)
 

src/main.c

@@ -225,14 +225,14 @@ int main(int argc, char **args)
         .cycle_per_step = CYCLE_PER_STEP,
         .allow_misalign = opt_misaligned,
     };
-#if RV32_HAS(SYSTEM)
-    assert(attr.data.system);
-    attr.data.system->kernel = "build/Image";       /* FIXME: hardcoded */
-    attr.data.system->initrd = "build/rootfs.cpio"; /* FIXME: hardcoded */
-    attr.data.system->dtb = "build/minimal.dtb";    /* FIXME: hardcoded */
-#else
+#if defined(USE_ELF)
     assert(attr.data.user);
     attr.data.user->elf_program = opt_prog_name;
+#elif RV32_HAS(SYSTEM)
+    assert(attr.data.system);
+    attr.data.system->kernel = "build/Image"; /* FIXME: hardcoded */
+    attr.data.system->initrd = "build/rootfs.cpio";/* FIXME: hardcoded */
+    attr.data.system->dtb = "build/minimal.dtb";/* FIXME: hardcoded */
 #endif
 
     /* create the RISC-V runtime */

src/riscv.c

@@ -306,6 +306,10 @@ riscv_t *rv_create(riscv_user_t rv_attr)
 
         elf_delete(elf);
 
+#if RV32_HAS(SYSTEM)
+        /* install the MMU I/O handlers */
+        memcpy(&rv->io, &mmu_io, sizeof(riscv_io_t));
+#else
         /* install the I/O handlers */
         const riscv_io_t io = {
             /* memory read interface */
@@ -327,8 +331,9 @@ riscv_t *rv_create(riscv_user_t rv_attr)
             .on_trap = trap_handler,
         };
         memcpy(&rv->io, &io, sizeof(riscv_io_t));
+#endif /* RV32_HAS(SYSTEM) */
     }
-#if RV32_HAS(SYSTEM)
+#if RV32_HAS(SYSTEM) && !defined(USE_ELF)
     else {
         /* *-----------------------------------------*
          * |              Memory layout              |