organize risc-v code for spike and bumblebee

arch/risc-v/bumblebee/gcc/riscv_port.h

@@ -0,0 +1,29 @@
+/*----------------------------------------------------------------------------
+ * Tencent is pleased to support the open source community by making TencentOS
+ * available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * If you have downloaded a copy of the TencentOS binary from Tencent, please
+ * note that the TencentOS binary is licensed under the BSD 3-Clause License.
+ *
+ * If you have downloaded a copy of the TencentOS source code from Tencent,
+ * please note that TencentOS source code is licensed under the BSD 3-Clause
+ * License, except for the third-party components listed below which are
+ * subject to different license terms. Your integration of TencentOS into your
+ * own projects may require compliance with the BSD 3-Clause License, as well
+ * as the other licenses applicable to the third-party components included
+ * within TencentOS.
+ *---------------------------------------------------------------------------*/
+
+#ifndef _RISCV_PORT_H_
+#define _RISCV_PORT_H_
+
+
+#define CLINT_CTRL_ADDR 0xD1000000
+#define CLINT_MSIP      0x0FFC
+#define CLINT_MTIMECMP  0x0008
+#define CLINT_MTIME     0x0000
+
+void riscv_cpu_init();
+
+#endif // _RISCV_PORT_H_

arch/risc-v/bumblebee/gcc/riscv_port_c.c

@@ -0,0 +1,5 @@
+#include "gd32vf103.h"
+
+void riscv_cpu_init() {
+    eclic_irq_enable(CLIC_INT_TMR, 0, 0);
+}

arch/risc-v/common/tos_cpu.c

@@ -1,6 +1,6 @@
 #include <tos.h>
 #include <riscv_encoding.h>
-
+#include <riscv_port.h>
 
 __KERNEL__ void cpu_systick_init(k_cycle_t cycle_per_tick)
 {
@@ -11,6 +11,8 @@ __KERNEL__ void cpu_systick_init(k_cycle_t cycle_per_tick)
 __KERNEL__ void cpu_init(void) {
     k_cpu_cycle_per_tick = TOS_CFG_CPU_CLOCK / k_cpu_tick_per_second;
     cpu_systick_init(k_cpu_cycle_per_tick);
+
+    riscv_cpu_init();
 }
 
 __API__ cpu_cpsr_t tos_cpu_cpsr_save(void)
@@ -99,7 +101,7 @@ __KERNEL__ k_stack_t *cpu_task_stk_init(void *entry,
         #undef _V
     }
 
-    cpu_data_t gp;
+    cpu_data_t gp = regs->gp;
     asm("mv %0, gp"::"r"(gp));
 
     regs->gp        = (cpu_data_t)gp;                           // gp: global pointer

arch/risc-v/rv32i/gcc/port_c.c

@@ -1,18 +1,8 @@
 #include "riscv_encoding.h"
+#include "riscv_port.h"
 #include <tos.h>
 
-#if 0
-#define CLINT_CTRL_ADDR 0x2000000
-#define CLINT_MSIP      0x0000
-#define CLINT_MTIMECMP  0x4000
-#define CLINT_MTIME     0xBFF8
-#else
-#include "gd32vf103.h"
-#define CLINT_CTRL_ADDR 0xD1000000
-#define CLINT_MSIP      0x0FFC
-#define CLINT_MTIMECMP  0x0008
-#define CLINT_MTIME     0x0000
-#endif
+//#include "gd32vf103.h"
 
 __PORT__ void port_systick_config(uint32_t cycle_per_tick)
 {
@@ -43,8 +33,6 @@ __PORT__ void port_systick_config(uint32_t cycle_per_tick)
     *(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIMECMP + 0) = 0xFFFFFFFF;
     *(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIMECMP + 4) = 0xFFFFFFFF & (mtimecmp >> 32);
     *(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIMECMP + 0) = 0xFFFFFFFF & (mtimecmp >>  0);
-
-
 }
 
 __PORT__ void port_systick_priority_set(uint32_t prio)

arch/risc-v/spike/gcc/riscv_port.h

@@ -0,0 +1,28 @@
+/*----------------------------------------------------------------------------
+ * Tencent is pleased to support the open source community by making TencentOS
+ * available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * If you have downloaded a copy of the TencentOS binary from Tencent, please
+ * note that the TencentOS binary is licensed under the BSD 3-Clause License.
+ *
+ * If you have downloaded a copy of the TencentOS source code from Tencent,
+ * please note that TencentOS source code is licensed under the BSD 3-Clause
+ * License, except for the third-party components listed below which are
+ * subject to different license terms. Your integration of TencentOS into your
+ * own projects may require compliance with the BSD 3-Clause License, as well
+ * as the other licenses applicable to the third-party components included
+ * within TencentOS.
+ *---------------------------------------------------------------------------*/
+
+#ifndef _RISCV_PORT_H_
+#define _RISCV_PORT_H_
+
+#define CLINT_CTRL_ADDR 0x2000000
+#define CLINT_MSIP      0x0000
+#define CLINT_MTIMECMP  0x4000
+#define CLINT_MTIME     0xBFF8
+
+void riscv_cpu_init();
+
+#endif // _RISCV_PORT_H_

arch/risc-v/spike/gcc/riscv_port_c.c

@@ -0,0 +1,3 @@
+void riscv_cpu_init() {
+    // DO NOTHING
+}