fixes wrong trap handler pre- and postamble

CMakeLists.txt

@@ -4,6 +4,7 @@ include(CheckLinkerFlag)
 project(mnrs-bsp LANGUAGES ASM C)
 set(LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/env/${BOARD}/link.lds"
     CACHE FILEPATH "Linker script to use for BSP linking")
+get_filename_component(LINKER_SCRIPT_DIR "${LINKER_SCRIPT}" DIRECTORY)
 set(BSP_STARTUP "${CMAKE_CURRENT_SOURCE_DIR}/env/start.S"
     CACHE FILEPATH "Path to the BSP startup assembly file")
 set(BSP_TRAP_HANDLER "${CMAKE_CURRENT_SOURCE_DIR}/env/entry.S"
@@ -38,7 +39,7 @@ check_linker_flag(C "LINKER:--no-warn-rwx-segments" HAS_NO_WARN_RWX_SEGMENTS)
 if(HAS_NO_WARN_RWX_SEGMENTS)
     target_link_options(bsp INTERFACE LINKER:--no-warn-rwx-segments)
 endif()
-target_link_options(bsp INTERFACE LINKER: -nostartfiles -T ${LINKER_SCRIPT})
+target_link_options(bsp INTERFACE LINKER: -nostartfiles -T ${LINKER_SCRIPT} -L${LINKER_SCRIPT_DIR})
 
 if(SEMIHOSTING)
     target_include_directories(bsp INTERFACE include)

env/entry.S

@@ -13,9 +13,6 @@ trap_entry:
   addi sp, sp, -32*REGBYTES
 
   sw  x1,  1*REGBYTES(sp)
-  sw  x2,  2*REGBYTES(sp)
-  sw  x3,  3*REGBYTES(sp)
-  sw  x4,  4*REGBYTES(sp)
   sw  x5,  5*REGBYTES(sp)
   sw  x6,  6*REGBYTES(sp)
   sw  x7,  7*REGBYTES(sp)
@@ -53,9 +50,6 @@ trap_entry:
 
 
   lw  x1,  1*REGBYTES(sp)
-  lw  x2,  2*REGBYTES(sp)
-  lw  x3,  3*REGBYTES(sp)
-  lw  x4,  4*REGBYTES(sp)
   lw  x5,  5*REGBYTES(sp)
   lw  x6,  6*REGBYTES(sp)
   lw  x7,  7*REGBYTES(sp)

env/riscv_vp/memory_map.ld

@@ -1,7 +1,7 @@
 MEMORY
 {
   ram   (wxa!ri) : ORIGIN = 0x00000000, LENGTH = 128K
-  rom   (rxai!w) : ORIGIN = 0x1000E000, LENGTH = 2k
+  rom   (rxai!w) : ORIGIN = 0x10080000, LENGTH = 8k
   flash (rxai!w) : ORIGIN = 0x20000000, LENGTH = 16M
   dram  (wxa!ri) : ORIGIN = 0x40000000, LENGTH = 2048M
 }

env/riscv_vp/platform.h

@@ -21,10 +21,11 @@
 #include "minres/devices/qspi.h"
 #include "minres/devices/timer.h"
 #include "minres/devices/uart.h"
+#include <riscv/riscv_csr.h>
 
 #define PERIPH(TYPE, ADDR) ((volatile TYPE*)(ADDR))
 // values from memory_map.ld
-#define XIP_START_LOC 0x30000000
+#define XIP_START_LOC 0x20000000
 #define RAM_START_LOC 0x00000000
 #define APB_BASE 0x10000000
 

include/minres/devices/aclint.h

@@ -1,27 +1,36 @@
 #ifndef _DEVICES_ACLINT_H
 #define _DEVICES_ACLINT_H
 
-#include <stdint.h>
 #include "gen/aclint.h"
+#include <stdint.h>
 
-
-static void set_aclint_mtime(volatile aclint_t* reg, uint64_t value){
+static void set_aclint_mtime(volatile aclint_t* reg, uint64_t value) {
     set_aclint_mtime_hi(reg, (uint32_t)(value >> 32));
     set_aclint_mtime_lo(reg, (uint32_t)value);
 }
 
-static uint64_t get_aclint_mtime(volatile aclint_t* reg){
-    uint64_t value = ((uint64_t)get_aclint_mtime_hi(reg) << 32) | (uint64_t)get_aclint_mtime_lo(reg);
-    return value;
+static uint64_t get_aclint_mtime(volatile aclint_t* reg) {
+    // #if ( __riscv_xlen == 64)
+    //     volatile uint64_t *mtime = (volatile uint64_t *)(RISCV_MTIME_ADDR);
+    //     return *mtime;
+    // #else
+    uint32_t mtimeh_val;
+    uint32_t mtimel_val;
+    do {
+        mtimeh_val = get_aclint_mtime_hi(reg);
+        mtimel_val = get_aclint_mtime_lo(reg);
+    } while(mtimeh_val != get_aclint_mtime_hi(reg));
+    return (uint64_t)((((uint64_t)mtimeh_val) << 32) | mtimel_val);
+    // #endif
 }
 
-static void set_aclint_mtimecmp(volatile aclint_t* reg, uint64_t value){
+static void set_aclint_mtimecmp(volatile aclint_t* reg, uint64_t value) {
     set_aclint_mtimecmp0lo(reg, (uint32_t)0xFFFFFFFF);
     set_aclint_mtimecmp0hi(reg, (uint32_t)(value >> 32));
     set_aclint_mtimecmp0lo(reg, (uint32_t)value);
 }
 
-static uint64_t get_aclint_mtimecmp(volatile aclint_t* reg){
+static uint64_t get_aclint_mtimecmp(volatile aclint_t* reg) {
     uint64_t value = ((uint64_t)get_aclint_mtimecmp0hi(reg) << 32) | (uint64_t)get_aclint_mtimecmp0lo(reg);
     return value;
 }

libwrap/sys/puts.c

@@ -5,9 +5,11 @@
 extern ssize_t _bsp_write(int, const void*, size_t);
 
 int __wrap_puts(const char* s) {    
-    const char* str = s;
-    while(*str)
-        str++;
-    return _bsp_write(STDOUT_FILENO, s, str - s);
+     if(!s) return -1;
+     const char* str = s;
+     while(*str) 
+          ++str;
+     *(char*)str='\n';
+     return _bsp_write(STDOUT_FILENO, s, (str - s)+1);   
 }
-weak_under_alias(puts);
+    weak_under_alias(puts);