From e2e40cc17e393a5731ec8abdaae622e123f67d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Wed, 12 Oct 2016 00:18:00 +0200 Subject: riscv: Clean up {qemu,spike}_util MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit spike_util.h: - (LOG_)REGBYTES and STORE are already defined in arch/riscv/include/bits.h. - TOHOST_CMD, FROMHOST_* are helper macros for the deprecated Host-Target Interface (HTIF). qemu_util.c: - mcall_query_memory now uses mprv_write_ulong instead of first translating the address and then accessing it normally. Thus, translate_address isn't used anymore. - Several functions used the deprecated HTIF CSRs mtohost/mfromhost. They have mostly been replaced by stub implementations. - htif_interrupt and testPrint were unused and have been deleted. spike_util.c: - translate_address and testPrint were unused and have been deleted. After this commit, spike_util.c and qemu_util.c are exactly the same and can be moved to a common location. Change-Id: I1789bad8bbab964c3f2f0480de8d97588c68ceaf Signed-off-by: Jonathan Neuschäfer Reviewed-on: https://review.coreboot.org/16985 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/arch/riscv/include/spike_util.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/arch/riscv') diff --git a/src/arch/riscv/include/spike_util.h b/src/arch/riscv/include/spike_util.h index d57627361a..175ee6ce2f 100644 --- a/src/arch/riscv/include/spike_util.h +++ b/src/arch/riscv/include/spike_util.h @@ -16,25 +16,13 @@ #ifndef _SPIKE_UTIL_H #define _SPIKE_UTIL_H -#include -//#include -//#include #include #include +#include -#define LOG_REGBYTES 3 -#define REGBYTES (1 << LOG_REGBYTES) -#define STORE sd #define HLS_SIZE 64 #define MENTRY_FRAME_SIZE HLS_SIZE -#define TOHOST_CMD(dev, cmd, payload) \ - (((uint64_t)(dev) << 56) | ((uint64_t)(cmd) << 48) | (uint64_t)(payload)) - -#define FROMHOST_DEV(fromhost_value) ((uint64_t)(fromhost_value) >> 56) -#define FROMHOST_CMD(fromhost_value) ((uint64_t)(fromhost_value) << 8 >> 56) -#define FROMHOST_DATA(fromhost_value) ((uint64_t)(fromhost_value) << 16 >> 16) - typedef struct { unsigned long base; unsigned long size; @@ -69,12 +57,8 @@ typedef struct { #define MACHINE_STACK_SIZE RISCV_PGSIZE -uintptr_t translate_address(uintptr_t vAddr); uintptr_t mcall_query_memory(uintptr_t id, memory_block_info *p); -uintptr_t mcall_hart_id(void); -uintptr_t htif_interrupt(uintptr_t mcause, uintptr_t* regs); uintptr_t mcall_console_putchar(uint8_t ch); -void testPrint(void); uintptr_t mcall_dev_req(sbi_device_message *m); uintptr_t mcall_dev_resp(void); uintptr_t mcall_set_timer(unsigned long long when); -- cgit v1.2.3