Firmware
/
MNRS-BM-BSP
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update include paths

This commit is contained in:
gabriel 2024-05-31 08:56:21 +02:00
parent ff8b3bb39c
commit 092f0fdfd3
5 changed files with 150 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
libwrap/semihosting/semihosting.c
View File

@ -1,6 +1,6 @@
#include <stdint.h>
#include <stdarg.h>
#include <stddef.h>
#include <stdint.h>
#include <string.h>
#include <sys/types.h>
@ -35,54 +35,56 @@
#define RISCV_SEMIHOSTING_CALL_NUMBER 7
typedef struct {
char* str;
char *str;
int mode;
size_t length;
} OpenVector;
typedef struct {
char* old;
char *old;
int old_len;
char* new;
char *new;
int new_len;
} RenameVector;
typedef struct {
char* path;
char *path;
size_t len;
} RemoveVector;
typedef struct{
typedef struct {
int fd;
off_t pos;
} SeekVector;
static inline int __attribute__ ((always_inline)) call_host(int reason, void* arg) {
static inline int __attribute__((always_inline))
call_host(int reason, void *arg) {
#if 1
// This must always be set back to 0 to cover the case where a host wasn't
// initially present, but only connected while the program was already up and
// running. In that case, trap() suddenly won't be called anymore, so we have to
// clear this variable *before* EBREAK is called.
// running. In that case, trap() suddenly won't be called anymore, so we have
// to clear this variable *before* EBREAK is called.
sh_missing_host = 0;
register int value asm ("a0") = reason;
register void* ptr asm ("a1") = arg;
asm volatile (
register int value asm("a0") = reason;
register void *ptr asm("a1") = arg;
asm volatile(
// Workaround for RISC-V lack of multiple EBREAKs.
" .option push \n"
" .option norvc \n"
// Force 16-byte alignment to make sure that the 3 instruction fall
// within the same virtual page. If you the instruction straddle a page boundary
// the debugger fetching the instructions could lead to a page fault.
// Note: align 4 means, align by 2 to the power of 4!
// within the same virtual page. If you the instruction straddle a page
// boundary the debugger fetching the instructions could lead to a page
// fault. Note: align 4 means, align by 2 to the power of 4!
" .align 4 \n"
" slli x0, x0, 0x1f \n"
" ebreak \n"
" srai x0, x0, 0x07 \n"
" .option pop \n"
: "=r" (value) /* Outputs */
: "0" (value), "r" (ptr), [swi] "i" (RISCV_SEMIHOSTING_CALL_NUMBER) /* Inputs */
: "=r"(value) /* Outputs */
: "0"(value),
"r"(ptr), [swi] "i"(RISCV_SEMIHOSTING_CALL_NUMBER) /* Inputs */
: "memory" /* Clobbers */
);
return value;
@ -91,15 +93,11 @@ static inline int __attribute__ ((always_inline)) call_host(int reason, void* ar
#endif
}
int sh_errno(void) {
return call_host(SEMIHOSTING_SYS_ERRNO, (void*)NULL);
}
int sh_errno(void) { return call_host(SEMIHOSTING_SYS_ERRNO, (void *)NULL); }
int sh_time(void) {
return call_host(SEMIHOSTING_SYS_TIME, (void*)NULL);
}
int sh_time(void) { return call_host(SEMIHOSTING_SYS_TIME, (void *)NULL); }
int sh_remove(char* path) {
int sh_remove(char *path) {
size_t len = strlen(path);
RemoveVector vec = {path, len};
return call_host(SEMIHOSTING_SYS_REMOVE, &vec);
@ -111,7 +109,7 @@ void sh_seek(int file_handle, off_t pos) {
return;
}
void sh_write(char* str, int file_handle) {
void sh_write(char *str, int file_handle) {
size_t length = strlen(str);
OpenVector vec = {str, file_handle, length};
call_host(SEMIHOSTING_SYS_WRITE, &vec);
@ -123,24 +121,20 @@ int sh_close(int file_handle) {
}
void sh_exit(void) {
call_host(SEMIHOSTING_SYS_EXIT, (void*)NULL);
call_host(SEMIHOSTING_SYS_EXIT, (void *)NULL);
return;
}
void sh_exit_extended(void) {
call_host(SEMIHOSTING_SYS_EXIT_EXTENDED, (void*)NULL);
call_host(SEMIHOSTING_SYS_EXIT_EXTENDED, (void *)NULL);
return;
}
int sh_flen(int file_handle) {
return call_host(SEMIHOSTING_SYS_FLEN, file_handle);
}
int sh_iserror(int num) {
return call_host(SEMIHOSTING_SYS_ISERROR, num);
}
int sh_iserror(int num) { return call_host(SEMIHOSTING_SYS_ISERROR, num); }
int sh_istty(int file_handle) {
return call_host(SEMIHOSTING_SYS_ISTTY, file_handle);
@ -152,7 +146,7 @@ int sh_remove(char* path) {
return call_host(SEMIHOSTING_SYS_REMOVE, &vec);
}*/
void sh_rename(char* old, char* new) {
void sh_rename(char *old, char *new) {
int old_len = strlen(old);
int new_len = strlen(new);
RenameVector vec = {old, old_len, new, new_len};
@ -160,42 +154,38 @@ void sh_rename(char* old, char* new) {
return;
}
void sh_write0(const char* buf)
{
void sh_write0(const char *buf) {
// Print zero-terminated string
call_host(SEMIHOSTING_SYS_WRITE0, (void*) buf);
call_host(SEMIHOSTING_SYS_WRITE0, (void *)buf);
}
void sh_writec(char c)
{
void sh_writec(char c) {
// Print single character
call_host(SEMIHOSTING_SYS_WRITEC, (void*)&c);
call_host(SEMIHOSTING_SYS_WRITEC, (void *)&c);
}
char sh_readc(void)
{
char sh_readc(void) {
// Read character from keyboard. (Blocking operation!)
char c = call_host(SEMIHOSTING_SYS_READC, (void*)NULL);
char c = call_host(SEMIHOSTING_SYS_READC, (void *)NULL);
return c;
}
int sh_open(char* str, int mode) {
//mode = 0;
//int length = 44;
int sh_open(char *str, int mode) {
// mode = 0;
// int length = 44;
size_t length = strlen(str);
OpenVector vec = {str, mode, length};
return call_host(SEMIHOSTING_SYS_OPEN, &vec);
}
void sh_read(char* buf, int file_handle, size_t length) {
int sh_read(char *buf, int file_handle, size_t length) {
OpenVector vec = {buf, file_handle, length};
int i = call_host(SEMIHOSTING_SYS_READ, &vec);
return i;
}
int sh_clock(void)
{
int clock = call_host(SEMIHOSTING_SYS_CLOCK, (void*)NULL);
int sh_clock(void) {
int clock = call_host(SEMIHOSTING_SYS_CLOCK, (void *)NULL);
return clock;
}

16
libwrap/semihosting/semihosting.h
View File

@ -1,20 +1,20 @@
#ifndef SEMIHOSTING_H
#define SEMIHOSTING_H
#include <unistd.h>
#include <sys/types.h>
//int32_t trace_write(const char* buf, uint32_t nbyte);
#include <unistd.h>
// int32_t trace_write(const char* buf, uint32_t nbyte);
void sh_seek(int, off_t);
void sh_write0(const char* buf);
void sh_write0(const char *buf);
void sh_writec(char c);
char sh_readc(void);
int sh_clock(void);
void sh_read(char*, int, size_t);
void sh_write(char*, int);
int sh_open(char*, int);
void sh_rename(char*, char*);
int sh_remove(char*);
int sh_read(char *, int, size_t);
void sh_write(char *, int);
int sh_open(char *, int);
void sh_rename(char *, char *);
int sh_remove(char *);
int sh_istty(int);
int sh_iserror(int);
int sh_flen(int);

4
libwrap/sys/puts.c
View File

@ -5,12 +5,10 @@
#include <sys/types.h>
#include <unistd.h>
#include "../../include/tgc-vp/devices/uart.h"
#include "../../env/tgc-vp/platform.h"
#include "platform.h"
#include "semihosting.h"
#include "stub.h"
#include "weak_under_alias.h"
#include "semihosting.h"
int __wrap_puts(const char *s) {
#if defined(SEMIHOSTING)

20
libwrap/sys/read.c
View File

@ -1,24 +1,20 @@
/* See LICENSE of license details. */
#include <stdint.h>
#include <errno.h>
#include <unistd.h>
#include <stdint.h>
#include <sys/types.h>
#if defined(BOARD_ehrenberg)
#include "platform.h"
#endif
#include "../../include/tgc-vp/devices/uart.h"
#include "/scratch/gabriel/repos/Firmwares/bare-metal-bsp/env/tgc-vp/platform.h"
#include <unistd.h>
#include "platform.h"
#include "semihosting.h"
#include "stub.h"
#include "weak_under_alias.h"
#include "semihosting.h"
ssize_t __wrap_read(int fd, void* ptr, size_t len) {
uint8_t * current = (uint8_t *)ptr;
ssize_t __wrap_read(int fd, void *ptr, size_t len) {
uint8_t *current = (uint8_t *)ptr;
#if defined(SEMIHOSTING)
sh_read(current, fd, len);
return;
int i = sh_read(current, fd, len);
return i;
#endif
#if defined(BOARD_hifive1)
volatile uint32_t *uart_rx = (uint32_t *)(UART0_CTRL_ADDR + UART_REG_RXFIFO);

12
libwrap/sys/write.c
View File

@ -5,17 +5,15 @@
#include <sys/types.h>
#include <unistd.h>
#include "../../include/tgc-vp/devices/uart.h"
#include "../../env/tgc-vp/platform.h"
#include "platform.h"
#include "semihosting.h"
#include "stub.h"
#include "weak_under_alias.h"
#include "semihosting.h"
ssize_t __wrap_write(int fd, const void* ptr, size_t len) {
const uint8_t * current = (const uint8_t *)ptr;
ssize_t __wrap_write(int fd, const void *ptr, size_t len) {
const uint8_t *current = (const uint8_t *)ptr;
#if defined(SEMIHOSTING)
if(isatty(fd)) {
if (isatty(fd)) {
for (size_t jj = 0; jj < len; jj++) {
sh_writec(current[jj]);
}
@ -24,7 +22,7 @@ ssize_t __wrap_write(int fd, const void* ptr, size_t len) {
sh_write(current, fd);
return len;
}
//return len;
// return len;
#endif
if (isatty(fd)) {
for (size_t jj = 0; jj < len; jj++) {