arm/linux: dtest and CI segfault

Author: mkobetic

.github/workflows/arm-linux-build.yaml

@@ -33,20 +33,20 @@ jobs:
           make segments
           make sections
 
-      # - name: Cache and Install QEMU USER ARM
-      #   uses: awalsh128/cache-apt-pkgs-action@latest
-      #   with:
-      #     packages: qemu-user-static
-      #     version: 1 # Change this to manually bust the cache
+      - name: Cache and Install QEMU USER ARM
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: qemu-user-static
+          version: 1 # Change this to manually bust the cache
 
-      # - name: QEMU Core Tests
-      #   run: cd arm/mcu/linux && TIMEOUT=5s make tests
+      - name: QEMU Core Tests
+        run: cd arm/mcu/linux && TIMEOUT=5s make tests
 
       - name: Build Linux/RaspPi (WANT_ITC)
-        run: cd arm/mcu/linux && WANT_ITC=1 make all
+        run: cd arm/mcu/linux && WANT_IGNORECASE=1 WANT_ITC=1 make all
 
-      # - name: QEMU Core Tests (WANT_ITC)
-      #   run: cd arm/mcu/linux && TIMEOUT=5s make tests
+      - name: QEMU Core Tests (WANT_ITC)
+        run: cd arm/mcu/linux && TIMEOUT=5s make tests
 
       - name: Update Refcards
         if: github.ref == 'refs/heads/main'

core/amforth32.ld

@@ -1,15 +1,28 @@
 /* SPDX-License-Identifier: GPL-3.0-only */
 
-/* C stack size */
-__stack_size = 2048;
-PROVIDE( _stack_size = __stack_size );
-
 /* Memory region info */
 PROVIDE( flash.start = ORIGIN(FLASH) );
 PROVIDE( flash.size = LENGTH(FLASH) );
 PROVIDE( ram.start = ORIGIN(RAM) );
 PROVIDE( ram.size = LENGTH(RAM) );
 
+/*
+	Defining our own PHDRS to control the segment permissions and
+	section allocations explicitly. When running amforth on top of
+	linux kernel, the loader often ignores section attributes and
+	looks at the segment headers only.
+*/
+
+PHDRS
+{
+    text    	PT_LOAD FLAGS(5);   /* r-x */
+    data    	PT_LOAD FLAGS(6);   /* rw- */
+    forth   	PT_LOAD FLAGS(7);   /* rwx */
+    forth_ram   PT_LOAD FLAGS(7);   /* rwx */
+	stack 		PT_LOAD FLAGS(6);	/* rw- */
+	forth_pv 	PT_LOAD FLAGS(6);	/* rw- */
+}
+
 SECTIONS
 {
 
@@ -21,15 +34,15 @@ SECTIONS
 		KEEP(*(SORT_NONE(.init)))
 		. = ALIGN(4);
 		_einit = .;
-	} >FLASH AT>FLASH
+	} >FLASH AT>FLASH :text
 
 	/* Hardware interrupt table */
 
 	.vector :
 	{
 		*(.vector);
 		. = ALIGN(64);
-	} >FLASH AT>FLASH
+	} >FLASH AT>FLASH :text
 
 	/* C code sections */
 
@@ -44,13 +57,13 @@ SECTIONS
 		*(.rodata*)
 		*(.gnu.linkonce.t.*)
 		. = ALIGN(4);
-	} >FLASH AT>FLASH 
+	} >FLASH AT>FLASH :text
 
 	.fini :
 	{
 		KEEP(*(SORT_NONE(.fini)))
 		. = ALIGN(4);
-	} >FLASH AT>FLASH
+	} >FLASH AT>FLASH :text
 
 	PROVIDE( _etext = . );
 	PROVIDE( _eitcm = . );	
@@ -60,23 +73,23 @@ SECTIONS
 	  PROVIDE_HIDDEN (__preinit_array_start = .);
 	  KEEP (*(.preinit_array))
 	  PROVIDE_HIDDEN (__preinit_array_end = .);
-	} >FLASH AT>FLASH 
+	} >FLASH AT>FLASH :text
 
 	.init_array     :
 	{
 	  PROVIDE_HIDDEN (__init_array_start = .);
 	  KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
 	  KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
 	  PROVIDE_HIDDEN (__init_array_end = .);
-	} >FLASH AT>FLASH 
+	} >FLASH AT>FLASH :text
 
 	.fini_array     :
 	{
 	  PROVIDE_HIDDEN (__fini_array_start = .);
 	  KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
 	  KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
 	  PROVIDE_HIDDEN (__fini_array_end = .);
-	} >FLASH AT>FLASH 
+	} >FLASH AT>FLASH :text
 
 	.ctors          :
 	{
@@ -98,7 +111,7 @@ SECTIONS
 	  KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
 	  KEEP (*(SORT(.ctors.*)))
 	  KEEP (*(.ctors))
-	} >FLASH AT>FLASH 
+	} >FLASH AT>FLASH :text
 
 	.dtors          :
 	{
@@ -107,7 +120,7 @@ SECTIONS
 	  KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
 	  KEEP (*(SORT(.dtors.*)))
 	  KEEP (*(.dtors))
-	} >FLASH AT>FLASH 
+	} >FLASH AT>FLASH :text
 
 	/*
 		This is the main AmForth flash section housing all the predefined words.
@@ -119,7 +132,7 @@ SECTIONS
 		*(amforth)
 		*amforth.o(.text .text.*)
 
-	} >FLASH AT>FLASH
+	} >FLASH AT>FLASH :forth
 
 	/*
 		RAM resident code, i.e. code that must run from RAM.
@@ -132,7 +145,7 @@ SECTIONS
 		PROVIDE(RAM_lower_res = . );
 		*(amres)
 		PROVIDE(RAM_upper_res = . );
-	} >RAM AT>FLASH
+	} >RAM AT>FLASH :text
 
 	PROVIDE(RAM_size_res = RAM_upper_res - RAM_lower_res) ;
 	PROVIDE(RAM_stuf_res = SIZEOF(amramres)) ;
@@ -143,14 +156,14 @@ SECTIONS
 		userdict represents the free space used for new words created at runtime in flash (and therefore persistent).
 		It generally occupies the rest of the FLASH memory region. (Tracked by dp.flash)
 	*/
-	userdict :
+	userdict (NOLOAD) :
 	{
 		. = ALIGN(flash_page) ; 
         /* . = ALIGN(MAX(flash_cell,cellsize)) ;  ->page_end zero filled - not erasesd? */
 		PROVIDE( dp0.flash = . );
 		PROVIDE( flash.high = . );
 		PROVIDE( flash.max = ORIGIN(FLASH) + LENGTH(FLASH));
-	} >FLASH AT>FLASH
+	} >FLASH AT>FLASH :forth
 
 	ASSERT(FSH_upper_res <= dp0.flash ,"*ERROR* userdict overlaps amramres")
 
@@ -169,7 +182,7 @@ SECTIONS
 		FILL(0xDEADBEEF); /* fill value MUST match first_boot_marker */
 		. = . + flash_page - 1;
 		BYTE(0); /* seems to be needed to actually get a write */
-	} >FLASH AT>FLASH
+	} >FLASH AT>FLASH :forth
 
 	ASSERT(FSH_upper_res <= first_boot , "*ERROR* first_boot overlaps amramres")
 
@@ -180,11 +193,11 @@ SECTIONS
 		and amforth will segfault if that memory is accessed.
 	*/
 	unused_flash = ORIGIN(FLASH) + LENGTH(FLASH) - ADDR(first_boot) - flash_page - csec_size ;
-	userdict2 :
+	userdict2 (NOLOAD) :
 	{
 		/* actually allocate the rest of unused FLASH */
 		. += unused_flash ;
-	} >FLASH AT>FLASH
+	} >FLASH AT>FLASH :forth
 
 	/* C data sections */
 
@@ -195,13 +208,13 @@ SECTIONS
 	{
 		. = ALIGN(4);
 		PROVIDE(_data_vma = .);
-	} >RAM AT>FLASH	
+	} >RAM AT>FLASH	:data
 
 	.dlalign :
 	{
 		. = ALIGN(4); 
 		PROVIDE(_data_lma = .);
-	} >FLASH AT>FLASH
+	} >FLASH AT>FLASH :data
 
 	.data :
 	{
@@ -221,7 +234,7 @@ SECTIONS
     	*(.srodata .srodata.*)
     	. = ALIGN(4);
 		PROVIDE( _edata = .);
-	} >RAM AT>FLASH
+	} >RAM AT>FLASH :data
 
 	.bss :
 	{
@@ -235,7 +248,7 @@ SECTIONS
 		. = ALIGN(4);
 		PROVIDE( _ebss = .);
         PROVIDE( ram_ripe = .); /* QEMU */
-	} >RAM AT>FLASH
+	} >RAM AT>FLASH :data
 
 	PROVIDE( _end = _ebss);
 	PROVIDE( end = . );    
@@ -245,28 +258,31 @@ SECTIONS
 	/* The RAM side of amramres section is first */
 
 	/* amramlo contains RAM allocations of all the pre-compiled words */
-    amramlo :
+    amramlo (NOLOAD) :
     {
         . = ALIGN(256) ;
 
         PROVIDE(RAM_lower_fi = . ) ;
         . = . + 256 ;
         PROVIDE(RAM_upper_fi = . ) ;
 
-    } >RAM
+    } >RAM :forth_ram
 
 	ASSERT(RAM_upper_res <= RAM_lower_fi ,"*ERROR* amramres and amramlo overlap")
 
 	/* 
 		amramhi contains:
 		* RAM pool, where runtime defined flash words allocate RAM (vp)
 		* ram-dictionary where RAM defined words are compiled (dp.ram)
+
+		We want to allocate all remaining RAM between amramlo and .stack for amramhi,
+		thus the stack_start calculation below.
 	*/
 
-	/* calculate size of unallocated RAM, minus some fudge factor (256) for alignments */
-	PROVIDE( unused_ram = LENGTH(RAM) - SIZEOF(amramres) - SIZEOF(amramlo) - rampool_size - __stack_size - 256 ) ;
+    slack = cellsize ;
+	stack_start = ORIGIN(RAM) + LENGTH(RAM) - __stack_size - slack ;
 
-    amramhi :
+    amramhi (NOLOAD) :
     {
         . = ALIGN(4) ;
 
@@ -285,25 +301,24 @@ SECTIONS
 			the kernel won't actually map it into the process' memory space
 			and amforth will segfault if that memory is accessed.
 		*/
-		. += unused_ram ;
+		. = ABSOLUTE(stack_start) - . ;
 
-    } > RAM 
+    } >RAM :forth_ram
 
 	ASSERT(RAM_upper_fi <= vp0 ,"*ERROR* amramlo and amramhi overlap") 
 
 	/* Sections at the high end of RAM */
 
 	/* C stack section */
-    slack = cellsize ;
-	stack_start = ORIGIN(RAM) + LENGTH(RAM) - __stack_size - slack ;
-    .stack stack_start :
+
+    .stack stack_start (NOLOAD) :
     {
         PROVIDE( _heap_end = . );    
         . = ALIGN(4);
         PROVIDE(_susrstack = . );
         . = . + __stack_size;
         PROVIDE( _eusrstack = .);
-    } >RAM
+    } >RAM :stack
 	PROVIDE( dp.ram.max = ADDR(.stack) - slack );
 
 	/* End of RAM sections */
@@ -341,15 +356,15 @@ SECTIONS
 	/* predefined size of pvalue arenas, use whole PVFLASH. */
 	PROVIDE(pvarena.size = LENGTH(PVFLASH) / 2);
 
-	pvarena1 : {
+	pvarena1 (NOLOAD) : {
 		PROVIDE(pvarena1_lower = . );
 		. = . + pvarena.size;
 		PROVIDE(pvarena1_upper = .);
-	} >PVFLASH
+	} >PVFLASH :forth_pv
 
-	pvarena2 : {
+	pvarena2 (NOLOAD) : {
 		PROVIDE(pvarena2_lower = . );
 		. = . + pvarena.size;
 		PROVIDE(pvarena2_upper = .);
-	} >PVFLASH
+	} >PVFLASH :forth_pv
 }

core/config.inc

@@ -27,6 +27,10 @@
 .global rampool_size
 
 
+/* C stack size */
+.equ __stack_size, 2048
+.global __stack_size
+
 /* 
     Flash parameters
 

rv/mcu/hifive1/config.inc

@@ -4,7 +4,12 @@
 .equ datastack_size, 32 * cellsize
 .equ returnstack_size, 32 * cellsize
 
+.equ rampool_size, 1024 * cellsize
+
 /* TODO: this is made up, needs correcting */ 
 .equ flash_page, 1*1024
 .equ flash_cell, 1
 .equ flash_erased, 0xFFFFFFFF /* a word in erased flash */
+
+/* C stack size */
+.equ __stack_size, 0

rv/mcu/qemu/Makefile

@@ -20,13 +20,15 @@ include $(AMFORTH)/rv/dev/Makefile
 .PRECIOUS: amforth.s
 
 #? --- QEM ---
+# QEMU := $(QEMU_RV32) -M virt -bios none -kernel build/amforth.elf
 
 # This is quite different from the -kernel option, which will for the RV 'virt' jump to
 # 0x8000_0000 no matter what ENTRY() has in the linker file. The cpu-num=0 sets the PC
 # to the value indicated by ENTRY(), which is much more suitable our needs. The commented
 # out line gives a hint as to how to set the PC to an absolute address at boot time.
 
-QEMU := $(QEMU_RV32) -M virt -bios none -device loader,file=build/amforth.elf,cpu-num=0
+# QEMU := $(QEMU_RV32) -M virt -bios none -device loader,file=build/amforth.elf,cpu-num=0
+QEMU := $(QEMU_RV32) -M virt -bios none -device loader,file=build/amforth.bin,addr=0x20010000,cpu-num=0
 #        -device loader,addr=0x20000000,cpu-num=0
 
 ## Start AmForth under QEMU with operator uart connected to stdio