From a45fee1f7e01de627aca0b33684b8c872330faed Mon Sep 17 00:00:00 2001 From: Eyck-Alexander Jentzsch Date: Mon, 15 Apr 2024 12:16:29 +0200 Subject: [PATCH] removes tgc-vp in favor of ehrenberg/tgc_vp --- env/tgc-vp/.gitignore | 1 - env/tgc-vp/init.c | 116 ---------------------------- env/tgc-vp/link.lds | 174 ------------------------------------------ env/tgc-vp/platform.h | 127 ------------------------------ env/tgc_vp | 1 + libwrap/sys/puts.c | 22 +++--- libwrap/sys/read.c | 87 ++++++++++----------- libwrap/sys/write.c | 53 +++++++------ 8 files changed, 82 insertions(+), 499 deletions(-) delete mode 100644 env/tgc-vp/.gitignore delete mode 100644 env/tgc-vp/init.c delete mode 100644 env/tgc-vp/link.lds delete mode 100644 env/tgc-vp/platform.h create mode 120000 env/tgc_vp diff --git a/env/tgc-vp/.gitignore b/env/tgc-vp/.gitignore deleted file mode 100644 index cc5bb74..0000000 --- a/env/tgc-vp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.o diff --git a/env/tgc-vp/init.c b/env/tgc-vp/init.c deleted file mode 100644 index 690f754..0000000 --- a/env/tgc-vp/init.c +++ /dev/null @@ -1,116 +0,0 @@ -#include -#include -#include - -#include "platform.h" -#include "encoding.h" - -extern int main(int argc, char** argv); -extern void trap_entry(); - -static unsigned long mtime_lo(void) -{ - unsigned long ret; - __asm volatile("rdtime %0":"=r"(ret)); - return ret; -} - - -#if __riscv_xlen==32 - -static uint32_t mtime_hi(void) -{ - unsigned long ret; - __asm volatile("rdtimeh %0":"=r"(ret)); - return ret; -} - -uint64_t get_timer_value() -{ - while (1) { - uint32_t hi = mtime_hi(); - uint32_t lo = mtime_lo(); - if (hi == mtime_hi()) - return ((uint64_t)hi << 32) | lo; - } -} - -#elif __riscv_xlen==64 - -uint64_t get_timer_value() -{ - return mtime_lo(); -} - -#endif - -unsigned long get_timer_freq() -{ - return 32768; -} - -unsigned long get_cpu_freq() -{ - return 10000000; -} - -void init_pll(void){ - -} - -static void uart_init(size_t baud_rate) -{ - GPIO_REG(GPIO_IOF_SEL) &= ~IOF0_UART0_MASK; - GPIO_REG(GPIO_IOF_EN) |= IOF0_UART0_MASK; - UART0_REG(UART_REG_DIV) = get_cpu_freq() / baud_rate - 1; - UART0_REG(UART_REG_TXCTRL) |= UART_TXEN; -} - -#ifdef USE_PLIC -extern void handle_m_ext_interrupt(); -#endif - -#ifdef USE_M_TIME -extern void handle_m_time_interrupt(); -#endif - -uintptr_t handle_trap(uintptr_t mcause, uintptr_t epc) -{ - if (0){ -#ifdef USE_PLIC - // External Machine-Level interrupt from PLIC - } else if ((mcause & MCAUSE_INT) && ((mcause & MCAUSE_CAUSE) == IRQ_M_EXT)) { - handle_m_ext_interrupt(); -#endif -#ifdef USE_M_TIME - // External Machine-Level interrupt from PLIC - } else if ((mcause & MCAUSE_INT) && ((mcause & MCAUSE_CAUSE) == IRQ_M_TIMER)){ - handle_m_time_interrupt(); -#endif - } - else { - write(1, "trap\n", 5); - _exit(1 + mcause); - } - return epc; -} - -void _init() -{ - -#ifndef NO_INIT - init_pll(); - uart_init(115200); - printf("core freq at %d Hz\n", get_cpu_freq()); - write_csr(mtvec, &trap_entry); - if (read_csr(misa) & (1 << ('F' - 'A'))) { // if F extension is present - write_csr(mstatus, MSTATUS_FS); // allow FPU instructions without trapping - write_csr(fcsr, 0); // initialize rounding mode, undefined at reset - } -#endif - -} - -void _fini() -{ -} diff --git a/env/tgc-vp/link.lds b/env/tgc-vp/link.lds deleted file mode 100644 index 3561a66..0000000 --- a/env/tgc-vp/link.lds +++ /dev/null @@ -1,174 +0,0 @@ -OUTPUT_ARCH( "riscv" ) - -ENTRY( _start ) - -MEMORY -{ - flash (rxai!w) : ORIGIN = 0x20000000, LENGTH = 512M - ram (wxa!ri) : ORIGIN = 0x80000000, LENGTH = 128K -} - -PHDRS -{ - flash PT_LOAD; - ram_init PT_LOAD; - ram PT_NULL; -} - -SECTIONS -{ - __stack_size = DEFINED(__stack_size) ? __stack_size : 2K; - - .init ORIGIN(flash) : - { - KEEP (*(SORT_NONE(.init))) - } >flash AT>flash :flash - - .text : - { - *(.text.unlikely .text.unlikely.*) - *(.text.startup .text.startup.*) - *(.text .text.*) - *(.gnu.linkonce.t.*) - } >flash AT>flash :flash - - .fini : - { - KEEP (*(SORT_NONE(.fini))) - } >flash AT>flash :flash - - PROVIDE (__etext = .); - PROVIDE (_etext = .); - PROVIDE (etext = .); - - .rodata : - { - *(.rdata) - *(.rodata .rodata.*) - *(.gnu.linkonce.r.*) - } >flash AT>flash :flash - - . = ALIGN(4); - - .preinit_array : - { - PROVIDE_HIDDEN (__preinit_array_start = .); - KEEP (*(.preinit_array)) - PROVIDE_HIDDEN (__preinit_array_end = .); - } >flash AT>flash :flash - - .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 - - .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 - - .ctors : - { - /* gcc uses crtbegin.o to find the start of - the constructors, so we make sure it is - first. Because this is a wildcard, it - doesn't matter if the user does not - actually link against crtbegin.o; the - linker won't look for a file to match a - wildcard. The wildcard also means that it - doesn't matter which directory crtbegin.o - is in. */ - KEEP (*crtbegin.o(.ctors)) - KEEP (*crtbegin?.o(.ctors)) - /* We don't want to include the .ctor section from - the crtend.o file until after the sorted ctors. - The .ctor section from the crtend file contains the - end of ctors marker and it must be last */ - KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - } >flash AT>flash :flash - - .dtors : - { - KEEP (*crtbegin.o(.dtors)) - KEEP (*crtbegin?.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - } >flash AT>flash :flash - - .lalign : - { - . = ALIGN(4); - PROVIDE( _data_lma = . ); - } >flash AT>flash :flash - - .dalign : - { - . = ALIGN(4); - PROVIDE( _data = . ); - } >ram AT>flash :ram_init - - .data : - { - __DATA_BEGIN__ = .; - *(.data .data.*) - *(.gnu.linkonce.d.*) - } >ram AT>flash :ram_init - - .srodata : - { - PROVIDE( _gp = . + 0x800 ); - *(.srodata.cst16) - *(.srodata.cst8) - *(.srodata.cst4) - *(.srodata.cst2) - *(.srodata .srodata.*) - } >ram AT>flash :ram_init - - .sdata : - { - __SDATA_BEGIN__ = .; - *(.sdata .sdata.*) - *(.gnu.linkonce.s.*) - } >ram AT>flash :ram_init - - . = ALIGN(4); - PROVIDE( _edata = . ); - PROVIDE( edata = . ); - - PROVIDE( _fbss = . ); - PROVIDE( __bss_start = . ); - .bss : - { - *(.sbss*) - *(.gnu.linkonce.sb.*) - *(.bss .bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - . = ALIGN(4); - } >ram AT>ram :ram - - . = ALIGN(8); - __BSS_END__ = .; - __global_pointer$ = MIN(__SDATA_BEGIN__ + 0x800, MAX(__DATA_BEGIN__ + 0x800, __BSS_END__ - 0x800)); - PROVIDE( _end = . ); - PROVIDE( end = . ); - - .stack ORIGIN(ram) + LENGTH(ram) - __stack_size : - { - PROVIDE( _heap_end = . ); - . = __stack_size; - PROVIDE( _sp = . ); - } >ram AT>ram :ram - - PROVIDE( tohost = 0xfffffff0 ); - PROVIDE( fromhost = 0xfffffff8 ); -} diff --git a/env/tgc-vp/platform.h b/env/tgc-vp/platform.h deleted file mode 100644 index 9c6caa7..0000000 --- a/env/tgc-vp/platform.h +++ /dev/null @@ -1,127 +0,0 @@ -// See LICENSE for license details. - -#ifndef _ISS_PLATFORM_H -#define _ISS_PLATFORM_H - -// Some things missing from the official encoding.h -#define MCAUSE_INT 0x80000000 -#define MCAUSE_CAUSE 0x7FFFFFFF - -#include "bits.h" -#include "tgc-vp/devices/aon.h" -#include "tgc-vp/devices/clint.h" -#include "tgc-vp/devices/gpio.h" -#include "tgc-vp/devices/otp.h" -#include "tgc-vp/devices/plic.h" -#include "tgc-vp/devices/prci.h" -#include "tgc-vp/devices/pwm.h" -#include "tgc-vp/devices/spi.h" -#include "tgc-vp/devices/uart.h" - -/**************************************************************************** - * Platform definitions - *****************************************************************************/ - -// Memory map -#define MASKROM_BASE_ADDR _AC(0x00001000,UL) -#define TRAPVEC_TABLE_BASE_ADDR _AC(0x00001010,UL) -#define OTP_MMAP_ADDR _AC(0x00020000,UL) -#define CLINT_BASE_ADDR _AC(0x02000000,UL) -#define PLIC_BASE_ADDR _AC(0x0C000000,UL) -#define AON_BASE_ADDR _AC(0x10000000,UL) -#define PRCI_BASE_ADDR _AC(0x10008000,UL) -#define OTP_BASE_ADDR _AC(0x10010000,UL) -#define GPIO_BASE_ADDR _AC(0x10012000,UL) -#define UART0_BASE_ADDR _AC(0x10013000,UL) -#define SPI0_BASE_ADDR _AC(0x10014000,UL) -#define PWM0_BASE_ADDR _AC(0x10015000,UL) -#define UART1_BASE_ADDR _AC(0x10023000,UL) -#define SPI1_BASE_ADDR _AC(0x10024000,UL) -#define PWM1_BASE_ADDR _AC(0x10025000,UL) -#define SPI2_BASE_ADDR _AC(0x10034000,UL) -#define PWM2_BASE_ADDR _AC(0x10035000,UL) -#define SPI0_MMAP_ADDR _AC(0x20000000,UL) -#define MEM_BASE_ADDR _AC(0x80000000,UL) - -// IOF masks -#define IOF0_SPI1_MASK _AC(0x000007FC,UL) -#define SPI11_NUM_SS (4) -#define IOF_SPI1_SS0 (2u) -#define IOF_SPI1_SS1 (8u) -#define IOF_SPI1_SS2 (9u) -#define IOF_SPI1_SS3 (10u) -#define IOF_SPI1_MOSI (3u) -#define IOF_SPI1_MISO (4u) -#define IOF_SPI1_SCK (5u) -#define IOF_SPI1_DQ0 (3u) -#define IOF_SPI1_DQ1 (4u) -#define IOF_SPI1_DQ2 (6u) -#define IOF_SPI1_DQ3 (7u) - -#define IOF0_SPI2_MASK _AC(0xFC000000,UL) -#define SPI2_NUM_SS (1) -#define IOF_SPI2_SS0 (26u) -#define IOF_SPI2_MOSI (27u) -#define IOF_SPI2_MISO (28u) -#define IOF_SPI2_SCK (29u) -#define IOF_SPI2_DQ0 (27u) -#define IOF_SPI2_DQ1 (28u) -#define IOF_SPI2_DQ2 (30u) -#define IOF_SPI2_DQ3 (31u) - -//#define IOF0_I2C_MASK _AC(0x00003000,UL) - -#define IOF0_UART0_MASK _AC(0x00030000, UL) -#define IOF_UART0_RX (16u) -#define IOF_UART0_TX (17u) - -#define IOF0_UART1_MASK _AC(0x03000000, UL) -#define IOF_UART1_RX (24u) -#define IOF_UART1_TX (25u) - -#define IOF1_PWM0_MASK _AC(0x0000000F, UL) -#define IOF1_PWM1_MASK _AC(0x00780000, UL) -#define IOF1_PWM2_MASK _AC(0x00003C00, UL) - -// Interrupt numbers -#define INT_RESERVED 0 -#define INT_WDOGCMP 1 -#define INT_RTCCMP 2 -#define INT_UART0_BASE 3 -#define INT_UART1_BASE 4 -#define INT_SPI0_BASE 5 -#define INT_SPI1_BASE 6 -#define INT_SPI2_BASE 7 -#define INT_GPIO_BASE 8 -#define INT_PWM0_BASE 40 -#define INT_PWM1_BASE 44 -#define INT_PWM2_BASE 48 - -// Helper functions -#define _REG32(p, i) (*(volatile uint32_t *) ((p) + (i))) -#define _REG32P(p, i) ((volatile uint32_t *) ((p) + (i))) -#define AON_REG(offset) _REG32(AON_BASE_ADDR, offset) -#define CLINT_REG(offset) _REG32(CLINT_BASE_ADDR, offset) -#define GPIO_REG(offset) _REG32(GPIO_BASE_ADDR, offset) -#define OTP_REG(offset) _REG32(OTP_BASE_ADDR, offset) -#define PLIC_REG(offset) _REG32(PLIC_BASE_ADDR, offset) -#define PRCI_REG(offset) _REG32(PRCI_BASE_ADDR, offset) -#define PWM0_REG(offset) _REG32(PWM0_BASE_ADDR, offset) -#define PWM1_REG(offset) _REG32(PWM1_BASE_ADDR, offset) -#define PWM2_REG(offset) _REG32(PWM2_BASE_ADDR, offset) -#define SPI0_REG(offset) _REG32(SPI0_BASE_ADDR, offset) -#define SPI1_REG(offset) _REG32(SPI1_BASE_ADDR, offset) -#define SPI2_REG(offset) _REG32(SPI2_BASE_ADDR, offset) -#define UART0_REG(offset) _REG32(UART0_BASE_ADDR, offset) -#define UART1_REG(offset) _REG32(UART1_BASE_ADDR, offset) - -// Misc - -#include - -void init_pll(void); -unsigned long get_cpu_freq(void); -unsigned long get_timer_freq(void); -uint64_t get_timer_value(void); - -#endif /* _ISS_PLATFORM_H */ diff --git a/env/tgc_vp b/env/tgc_vp new file mode 120000 index 0000000..4f09dcb --- /dev/null +++ b/env/tgc_vp @@ -0,0 +1 @@ +ehrenberg/ \ No newline at end of file diff --git a/libwrap/sys/puts.c b/libwrap/sys/puts.c index 4bd9baa..29d128f 100644 --- a/libwrap/sys/puts.c +++ b/libwrap/sys/puts.c @@ -1,30 +1,32 @@ /* See LICENSE of license details. */ -#include #include -#include +#include #include +#include #include "platform.h" #include "stub.h" #include "weak_under_alias.h" -int __wrap_puts(const char *s) -{ +int __wrap_puts(const char *s) { while (*s != '\0') { -#if defined(BOARD_ehrenberg) - while (get_uart_rx_tx_reg_tx_free(uart)==0) ; +#if defined(BOARD_ehrenberg) || defined(BOARD_tgc_vp) + while (get_uart_rx_tx_reg_tx_free(uart) == 0) + ; uart_write(uart, *s); #elif defined(BOARD_iss) - *((uint32_t*) 0xFFFF0000) = *s; + *((uint32_t *)0xFFFF0000) = *s; #elif defined(BOARD_TGCP) - //TODO: implement + // TODO: implement #else - while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ; + while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) + ; UART0_REG(UART_REG_TXFIFO) = *s; if (*s == '\n') { - while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ; + while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) + ; UART0_REG(UART_REG_TXFIFO) = '\r'; } #endif diff --git a/libwrap/sys/read.c b/libwrap/sys/read.c index 5468dd3..f526217 100644 --- a/libwrap/sys/read.c +++ b/libwrap/sys/read.c @@ -1,59 +1,54 @@ /* See LICENSE of license details. */ -#include -#include -#include -#include -#if defined(BOARD_ehrenberg) -#include "platform.h" -#endif #include "platform.h" #include "stub.h" #include "weak_under_alias.h" +#include +#include +#include +#include -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(BOARD_hifive1) - volatile uint32_t * uart_rx = (uint32_t *)(UART0_CTRL_ADDR + UART_REG_RXFIFO); - volatile uint8_t * uart_rx_cnt = (uint8_t *)(UART0_CTRL_ADDR + UART_REG_RXCTRL + 2); + volatile uint32_t *uart_rx = (uint32_t *)(UART0_CTRL_ADDR + UART_REG_RXFIFO); + volatile uint8_t *uart_rx_cnt = + (uint8_t *)(UART0_CTRL_ADDR + UART_REG_RXCTRL + 2); #elif defined(BOARD_iss) - volatile uint32_t * uart_rx = (uint32_t*)0xFFFF0000; + volatile uint32_t *uart_rx = (uint32_t *)0xFFFF0000; #elif defined(BOARD_TGCP) - //TODO: implement -#elif !defined(BOARD_ehrenberg) - volatile uint32_t * uart_rx = (uint32_t *)(UART0_BASE_ADDR + UART_REG_RXFIFO); - volatile uint8_t * uart_rx_cnt = (uint8_t *)(UART0_BASE_ADDR + UART_REG_RXCTRL + 2); + // TODO: implement +#elif !defined(BOARD_ehrenberg) && !defined(BOARD_tgc_vp) + volatile uint32_t *uart_rx = (uint32_t *)(UART0_BASE_ADDR + UART_REG_RXFIFO); + volatile uint8_t *uart_rx_cnt = + (uint8_t *)(UART0_BASE_ADDR + UART_REG_RXCTRL + 2); #endif - ssize_t result = 0; - if (isatty(fd)) { -#if defined(BOARD_ehrenberg) - for (current = (uint8_t *)ptr; - (current < ((uint8_t *)ptr) + len) && (get_uart_rx_tx_reg_rx_avail(uart) > 0); - current ++) { - *current = uart_read(uart); - result++; - } -#elif defined(BOARD_iss) - for (current = (uint8_t *)ptr; - (current < ((uint8_t *)ptr) + len); - current ++) { - *current = *uart_rx; - result++; - } -#elif defined(BOARD_TGCP) - //TODO: implement -#else - for (current = (uint8_t *)ptr; - (current < ((uint8_t *)ptr) + len) && (*uart_rx_cnt > 0); - current ++) { - *current = *uart_rx; - result++; - } -#endif - return result; + ssize_t result = 0; + if (isatty(fd)) { +#if defined(BOARD_ehrenberg) || defined(BOARD_tgc_vp) + for (current = (uint8_t *)ptr; (current < ((uint8_t *)ptr) + len) && + (get_uart_rx_tx_reg_rx_avail(uart) > 0); + current++) { + *current = uart_read(uart); + result++; } - return _stub(EBADF); +#elif defined(BOARD_iss) + for (current = (uint8_t *)ptr; (current < ((uint8_t *)ptr) + len); + current++) { + *current = *uart_rx; + result++; + } +#elif defined(BOARD_TGCP) + // TODO: implement +#else + for (current = (uint8_t *)ptr; + (current < ((uint8_t *)ptr) + len) && (*uart_rx_cnt > 0); current++) { + *current = *uart_rx; + result++; + } +#endif + return result; + } + return _stub(EBADF); } weak_under_alias(read); - diff --git a/libwrap/sys/write.c b/libwrap/sys/write.c index a2be4aa..e647d96 100644 --- a/libwrap/sys/write.c +++ b/libwrap/sys/write.c @@ -1,42 +1,45 @@ /* See LICENSE of license details. */ -#include #include -#include +#include #include +#include #include "platform.h" #include "stub.h" #include "weak_under_alias.h" -ssize_t __wrap_write(int fd, const void* ptr, size_t len) -{ - const uint8_t * current = (const uint8_t *)ptr; - if (isatty(fd)) { - for (size_t jj = 0; jj < len; jj++) { -#if defined(BOARD_ehrenberg) - while (get_uart_rx_tx_reg_tx_free(uart)==0) ; - uart_write(uart, current[jj]); - if (current[jj] == '\n') { - while (get_uart_rx_tx_reg_tx_free(uart)==0) ; - uart_write(uart, '\r'); - } +ssize_t __wrap_write(int fd, const void *ptr, size_t len) { + const uint8_t *current = (const uint8_t *)ptr; + if (isatty(fd)) { + for (size_t jj = 0; jj < len; jj++) { +#if defined(BOARD_ehrenberg) || defined(BOARD_tgc_vp) + while (get_uart_rx_tx_reg_tx_free(uart) == 0) + ; + uart_write(uart, current[jj]); + if (current[jj] == '\n') { + while (get_uart_rx_tx_reg_tx_free(uart) == 0) + ; + uart_write(uart, '\r'); + } #elif defined(BOARD_iss) - *((uint32_t*) 0xFFFF0000) = current[jj]; + *((uint32_t *)0xFFFF0000) = current[jj]; #elif defined(BOARD_TGCP) - //TODO: implement + // TODO: implement #else - while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ; - UART0_REG(UART_REG_TXFIFO) = current[jj]; + while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) + ; + UART0_REG(UART_REG_TXFIFO) = current[jj]; - if (current[jj] == '\n') { - while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ; - UART0_REG(UART_REG_TXFIFO) = '\r'; - } + if (current[jj] == '\n') { + while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) + ; + UART0_REG(UART_REG_TXFIFO) = '\r'; + } #endif - } - return len; } + return len; + } - return _stub(EBADF); + return _stub(EBADF); } weak_under_alias(write);