fix rv32 compile errors

3 files changed, 45 insertions, 35 deletions

diff --git a/arch/riscv64/kernel/head.S b/arch/riscv64/kernel/head.S
index b8ad295..d2a1927 100644
--- a/arch/riscv64/kernel/head.S
+++ b/arch/riscv64/kernel/head.S
@@ -1,26 +1,34 @@
 #include <csr.h>
 
+#if __riscv_xlen == 64
+#define sr sd
+#define lr ld
+#else
+#define sr sw
+#define lr lw
+#endif
+
 .section .text
 .global handle_irq
 handle_irq:
 	addi    sp,sp,-144
-	sd      ra,136(sp)
-	sd      t0,128(sp)
-	sd      t1,120(sp)
-	sd      t2,112(sp)
-	sd      s0,104(sp)
-	sd      a0,96(sp)
-	sd      a1,88(sp)
-	sd      a2,80(sp)
-	sd      a3,72(sp)
-	sd      a4,64(sp)
-	sd      a5,56(sp)
-	sd      a6,48(sp)
-	sd      a7,40(sp)
-	sd      t3,32(sp)
-	sd      t4,24(sp)
-	sd      t5,16(sp)
-	sd      t6,8(sp)
+	sr      ra,136(sp)
+	sr      t0,128(sp)
+	sr      t1,120(sp)
+	sr      t2,112(sp)
+	sr      s0,104(sp)
+	sr      a0,96(sp)
+	sr      a1,88(sp)
+	sr      a2,80(sp)
+	sr      a3,72(sp)
+	sr      a4,64(sp)
+	sr      a5,56(sp)
+	sr      a6,48(sp)
+	sr      a7,40(sp)
+	sr      t3,32(sp)
+	sr      t4,24(sp)
+	sr      t5,16(sp)
+	sr      t6,8(sp)
 	addi    s0,sp,144
 	/* load supervisor cause */
 	csrr s4, CSR_SCAUSE
@@ -40,25 +48,25 @@ handle_syscall:
 	j	restore_noreturn
 
 restore_all:
-	ld      a0,96(sp)
+	lr      a0,96(sp)
 
 restore_noreturn:
-	ld      ra,136(sp)
-	ld      t0,128(sp)
-	ld      t1,120(sp)
-	ld      t2,112(sp)
-	ld      s0,104(sp)
-	ld      a1,88(sp)
-	ld      a2,80(sp)
-	ld      a3,72(sp)
-	ld      a4,64(sp)
-	ld      a5,56(sp)
-	ld      a6,48(sp)
-	ld      a7,40(sp)
-	ld      t3,32(sp)
-	ld      t4,24(sp)
-	ld      t5,16(sp)
-	ld      t6,8(sp)
+	lr      ra,136(sp)
+	lr      t0,128(sp)
+	lr      t1,120(sp)
+	lr      t2,112(sp)
+	lr      s0,104(sp)
+	lr      a1,88(sp)
+	lr      a2,80(sp)
+	lr      a3,72(sp)
+	lr      a4,64(sp)
+	lr      a5,56(sp)
+	lr      a6,48(sp)
+	lr      a7,40(sp)
+	lr      t3,32(sp)
+	lr      t4,24(sp)
+	lr      t5,16(sp)
+	lr      t6,8(sp)
 	addi    sp,sp,144
 	/* assume supervisor for now */
 	sret
diff --git a/arch/riscv64/kernel/timer.c b/arch/riscv64/kernel/timer.c
index b6d828e..02f080c 100644
--- a/arch/riscv64/kernel/timer.c
+++ b/arch/riscv64/kernel/timer.c
@@ -1,4 +1,5 @@
 #include <arch/timer.h>
+#include <sbi.h>
 
 ticks_t stat_timer(const void *fdt)
 {
@@ -9,6 +10,7 @@ ticks_t stat_timer(const void *fdt)
 void set_timer(ticks_t ticks)
 {
 	/* TODO */
+	sbi_set_timer(ticks);
 }
 
 ticks_t current_ticks()
diff --git a/arch/riscv64/source.mk b/arch/riscv64/source.mk
index ce229a4..fec5f80 100644
--- a/arch/riscv64/source.mk
+++ b/arch/riscv64/source.mk
@@ -4,7 +4,7 @@ INIT_SOURCES	+= arch/riscv64/init/*.[cS]
 
 CLEANUP_CMD	:= ./arch/riscv64/conf/rmimage.sh
 
-ARCH_CFLAGS	:= -mcmodel=medany -fno-strict-aliasing
+ARCH_CFLAGS	:= -mcmodel=medany
 ARCH_LDFLAGS	:=
 
 # llvm compilation doesn't seem to work, either bfd reads the object files wrong