Fix FPU initialization code

[riscv-tests.git] / benchmarks / common / syscalls.c

diff --git a/benchmarks/common/syscalls.c b/benchmarks/common/syscalls.c
index ea264ba60ad36d5ea719dbcd82280c5ae73ea9f6..4940aa24b9f31b02d0f81cea38ccd6be948525d1 100644 (file)
--- a/benchmarks/common/syscalls.c
+++ b/benchmarks/common/syscalls.c
@@ -8,13 +8,13 @@
 #include "util.h"
 
 #define SYS_write 64
-#define SYS_exit 93
-#define SYS_stats 1234
+
+#undef strcmp
 
 extern volatile uint64_t tohost;
 extern volatile uint64_t fromhost;
 
-static long handle_frontend_syscall(long which, long arg0, long arg1, long arg2)
+static uintptr_t syscall(uintptr_t which, uint64_t arg0, uint64_t arg1, uint64_t arg2)
 {
   volatile uint64_t magic_mem[8] __attribute__((aligned(64)));
   magic_mem[0] = which;
@@ -33,15 +33,15 @@ static long handle_frontend_syscall(long which, long arg0, long arg1, long arg2)
 }
 
 #define NUM_COUNTERS 2
-static long counters[NUM_COUNTERS];
+static uintptr_t counters[NUM_COUNTERS];
 static char* counter_names[NUM_COUNTERS];
 
-static int handle_stats(int enable)
+void setStats(int enable)
 {
   int i = 0;
 #define READ_CTR(name) do { \
     while (i >= NUM_COUNTERS) ; \
-    long csr = read_csr(name); \
+    uintptr_t csr = read_csr(name); \
     if (!enable) { csr -= counters[i]; counter_names[i] = #name; } \
     counters[i++] = csr; \
   } while (0)
@@ -50,53 +50,27 @@ static int handle_stats(int enable)
   READ_CTR(minstret);
 
 #undef READ_CTR
-  return 0;
 }
 
-void __attribute__((noreturn)) tohost_exit(long code)
+void __attribute__((noreturn)) tohost_exit(uintptr_t code)
 {
   tohost = (code << 1) | 1;
   while (1);
 }
 
-long handle_trap(long cause, long epc, long regs[32])
+uintptr_t __attribute__((weak)) handle_trap(uintptr_t cause, uintptr_t epc, uintptr_t regs[32])
 {
-  if (cause != CAUSE_MACHINE_ECALL)
-    tohost_exit(1337);
-  else if (regs[17] == SYS_exit)
-    tohost_exit(regs[10]);
-  else if (regs[17] == SYS_stats)
-    regs[10] = handle_stats(regs[10]);
-  else
-    regs[10] = handle_frontend_syscall(regs[17], regs[10], regs[11], regs[12]);
-
-  return epc + ((*(unsigned short*)epc & 3) == 3 ? 4 : 2);
-}
-
-static long syscall(long num, long arg0, long arg1, long arg2)
-{
-  register long a7 asm("a7") = num;
-  register long a0 asm("a0") = arg0;
-  register long a1 asm("a1") = arg1;
-  register long a2 asm("a2") = arg2;
-  asm volatile ("scall" : "+r"(a0) : "r"(a1), "r"(a2), "r"(a7));
-  return a0;
+  tohost_exit(1337);
 }
 
 void exit(int code)
 {
-  syscall(SYS_exit, code, 0, 0);
-  while (1);
-}
-
-void setStats(int enable)
-{
-  syscall(SYS_stats, enable, 0, 0);
+  tohost_exit(code);
 }
 
 void printstr(const char* s)
 {
-  syscall(SYS_write, 1, (long)s, strlen(s));
+  syscall(SYS_write, 1, (uintptr_t)s, strlen(s));
 }
 
 void __attribute__((weak)) thread_entry(int cid, int nc)
@@ -153,7 +127,7 @@ int putchar(int ch)
 
   if (ch == '\n' || buflen == sizeof(buf))
   {
-    syscall(SYS_write, 1, (long)buf, buflen);
+    syscall(SYS_write, 1, (uintptr_t)buf, buflen);
     buflen = 0;
   }