Only relocate test code to RAM if the test actually needs it

Author: object-Object

riscof/mlogv32/env/model_test.h

@@ -23,6 +23,7 @@
   la t0, __sitext; \
   la t1, __stext; \
   la t2, __etext; \
+  beqz t2, mlogv32_text_done; \
 mlogv32_load_text: \
   bgeu t1, t2, mlogv32_text_done; \
   lb t3, 0(t0); \

riscof/mlogv32/env/link.ld riscof/mlogv32/env/reloc.ldriscof/mlogv32/env/link.ld renamed to riscof/mlogv32/env/reloc.ld

@@ -2,9 +2,8 @@ OUTPUT_ARCH( "riscv" )
 ENTRY(rvtest_entry_point)
 
 MEMORY {
-    ROM  (rx)  : ORIGIN = 0x00000000, LENGTH = 0x480000
-    RAM  (rwx) : ORIGIN = 0x80000000, LENGTH = 0x480000
-    MMIO (rw)  : ORIGIN = 0xf0000000, LENGTH = 16
+    ROM (rx)  : ORIGIN = 0x00000000, LENGTH = 0x480000
+    RAM (rwx) : ORIGIN = 0x80000000, LENGTH = 0x480000
 }
 
 SECTIONS

riscof/mlogv32/env/xip.ld

@@ -0,0 +1,41 @@
+OUTPUT_ARCH( "riscv" )
+ENTRY(rvtest_entry_point)
+
+MEMORY {
+    ROM (rx)  : ORIGIN = 0x00000000, LENGTH = 0x480000
+    RAM (rwx) : ORIGIN = 0x80000000, LENGTH = 0x480000
+}
+
+__stext = 0;
+__etext = 0;
+__sitext = 0;
+
+SECTIONS
+{
+    .text : ALIGN(4) {
+        KEEP(*(.text.init.rom));
+        *(.text.init);
+        *(.text);
+        . = ALIGN(4);
+        __etext_rom = .;
+    } > ROM
+
+    .data : ALIGN(4) {
+        __sdata = .;
+        *(.data);
+        *(.data.string);
+        . = ALIGN(4);
+        __edata = .;
+    } > RAM AT > ROM
+
+    __sidata = LOADADDR(.data);
+
+    .bss (NOLOAD) : ALIGN(4) {
+        __sbss = .;
+        *(.bss);
+        . = ALIGN(4);
+        __ebss = .;
+    } > RAM
+
+    _end = .;
+}

riscof/mlogv32/riscof_mlogv32.py

@@ -67,7 +67,7 @@ def initialise(self, suite: str, workdir: str, env: str):
          -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles -g\
          -T "
             + self.pluginpath
-            + "/env/link.ld\
+            + "/env/{linker_script}\
          -I "
             + self.pluginpath
             + "/env/\
@@ -160,6 +160,12 @@ def runTests(self, testlist: dict[str, Any]):
                 # prefix with "-D". The following does precisely that.
                 compile_macros = " -D" + " -D".join(testentry["macros"])
 
+                # use a different linker script for tests that require .text to be writable
+                if testname.endswith("/Zifencei/src/Fencei.S"):
+                    linker_script = "reloc.ld"
+                else:
+                    linker_script = "xip.ld"
+
                 # substitute all variables in the compile command that we created in the initialize
                 # function
                 compile_cmd = self.compile_cmd.format(
@@ -168,6 +174,7 @@ def runTests(self, testlist: dict[str, Any]):
                     test=test,
                     elf=elf,
                     macros=compile_macros,
+                    linker_script=linker_script,
                 )
 
                 objcopy_cmd = self.objcopy_cmd.format(