diff options
| author | Urey <[email protected]> | 2017-09-06 11:16:51 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-06 11:16:51 +0800 |
| commit | ad1d3375f222c5746514ab16003dc18c0df83dad (patch) | |
| tree | 4572af3fcf6b592a714e2ec76b25dae27a1ecea6 /libcpu | |
| parent | 94746d8e5f69b26535f75b730e7540caf42863fa (diff) | |
| parent | bc225a5ef05a9b14dd72286402093cbb7dba8305 (diff) | |
Merge pull request #1 from RT-Thread/master
同步 rt-thread master
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/arm/cortex-m0/context_gcc.S | 3 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m3/context_gcc.S | 4 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m3/context_iar.S | 4 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m3/context_rvds.S | 1 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m3/cpuport.c | 11 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m4/context_gcc.S | 4 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m4/context_iar.S | 4 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m4/context_rvds.S | 1 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m4/cpuport.c | 9 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m7/context_gcc.S | 4 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m7/context_iar.S | 4 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m7/context_rvds.S | 1 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m7/cpuport.c | 9 | ||||
| -rw-r--r-- | libcpu/mips/loongson_1c/cpuport.c | 36 | ||||
| -rw-r--r-- | libcpu/risc-v/e310/start_gcc.S | 128 |
15 files changed, 142 insertions, 81 deletions
diff --git a/libcpu/arm/cortex-m0/context_gcc.S b/libcpu/arm/cortex-m0/context_gcc.S index 3186a5ae9f..227a9aac2d 100644 --- a/libcpu/arm/cortex-m0/context_gcc.S +++ b/libcpu/arm/cortex-m0/context_gcc.S @@ -181,7 +181,8 @@ rt_hw_context_switch_to: NOP MSR MSP, R0 - CPSIE I /* enable interrupts at processor level */ + /* enable interrupts at processor level */ + CPSIE I /* never reach here! */ diff --git a/libcpu/arm/cortex-m3/context_gcc.S b/libcpu/arm/cortex-m3/context_gcc.S index ca961bbd87..5181cb2712 100644 --- a/libcpu/arm/cortex-m3/context_gcc.S +++ b/libcpu/arm/cortex-m3/context_gcc.S @@ -162,7 +162,9 @@ rt_hw_context_switch_to: NOP MSR msp, r0 - CPSIE I /* enable interrupts at processor level */ + /* enable interrupts at processor level */ + CPSIE F + CPSIE I /* never reach here! */ diff --git a/libcpu/arm/cortex-m3/context_iar.S b/libcpu/arm/cortex-m3/context_iar.S index ad9fa0dd0f..95dee8062d 100644 --- a/libcpu/arm/cortex-m3/context_iar.S +++ b/libcpu/arm/cortex-m3/context_iar.S @@ -161,7 +161,9 @@ rt_hw_context_switch_to: NOP MSR msp, r0 - CPSIE I ; enable interrupts at processor level + ; enable interrupts at processor level + CPSIE F + CPSIE I ; never reach here! diff --git a/libcpu/arm/cortex-m3/context_rvds.S b/libcpu/arm/cortex-m3/context_rvds.S index ebfd5c8da8..a4191203be 100644 --- a/libcpu/arm/cortex-m3/context_rvds.S +++ b/libcpu/arm/cortex-m3/context_rvds.S @@ -168,6 +168,7 @@ rt_hw_context_switch_to PROC MSR msp, r0 ; enable interrupts at processor level + CPSIE F CPSIE I ; never reach here! diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c index f938bab800..10989ffc5b 100644 --- a/libcpu/arm/cortex-m3/cpuport.c +++ b/libcpu/arm/cortex-m3/cpuport.c @@ -368,11 +368,12 @@ __asm int __rt_ffs(int value) { CMP r0, #0x00 BEQ exit + RBIT r0, r0 CLZ r0, r0 ADDS r0, r0, #0x01 - exit +exit BX lr } #elif defined(__IAR_SYSTEMS_ICC__) @@ -380,9 +381,11 @@ int __rt_ffs(int value) { if (value == 0) return value; - __ASM("RBIT r0, r0"); - __ASM("CLZ r0, r0"); - __ASM("ADDS r0, r0, #0x01"); + asm("RBIT %0, %1" : "=r"(value) : "r"(value)); + asm("CLZ %0, %1" : "=r"(value) : "r"(value)); + asm("ADDS %0, %1, #0x01" : "=r"(value) : "r"(value)); + + return value; } #elif defined(__GNUC__) int __rt_ffs(int value) diff --git a/libcpu/arm/cortex-m4/context_gcc.S b/libcpu/arm/cortex-m4/context_gcc.S index 908a44f847..af6c9934d4 100644 --- a/libcpu/arm/cortex-m4/context_gcc.S +++ b/libcpu/arm/cortex-m4/context_gcc.S @@ -203,7 +203,9 @@ rt_hw_context_switch_to: NOP MSR msp, r0 - CPSIE I /* enable interrupts at processor level */ + /* enable interrupts at processor level */ + CPSIE F + CPSIE I /* never reach here! */ diff --git a/libcpu/arm/cortex-m4/context_iar.S b/libcpu/arm/cortex-m4/context_iar.S index 8761a97052..4cc9539112 100644 --- a/libcpu/arm/cortex-m4/context_iar.S +++ b/libcpu/arm/cortex-m4/context_iar.S @@ -207,7 +207,9 @@ rt_hw_context_switch_to: NOP MSR msp, r0 - CPSIE I ; enable interrupts at processor level + ; enable interrupts at processor level + CPSIE F + CPSIE I ; never reach here! diff --git a/libcpu/arm/cortex-m4/context_rvds.S b/libcpu/arm/cortex-m4/context_rvds.S index fa7a1c90f8..ea894ed000 100644 --- a/libcpu/arm/cortex-m4/context_rvds.S +++ b/libcpu/arm/cortex-m4/context_rvds.S @@ -208,6 +208,7 @@ rt_hw_context_switch_to PROC MSR msp, r0 ; enable interrupts at processor level + CPSIE F CPSIE I ; never reach here! diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c index 47d8473997..e74c337c60 100644 --- a/libcpu/arm/cortex-m4/cpuport.c +++ b/libcpu/arm/cortex-m4/cpuport.c @@ -238,6 +238,7 @@ __asm int __rt_ffs(int value) { CMP r0, #0x00 BEQ exit + RBIT r0, r0 CLZ r0, r0 ADDS r0, r0, #0x01 @@ -250,9 +251,11 @@ int __rt_ffs(int value) { if (value == 0) return value; - __ASM("RBIT r0, r0"); - __ASM("CLZ r0, r0"); - __ASM("ADDS r0, r0, #0x01"); + asm("RBIT %0, %1" : "=r"(value) : "r"(value)); + asm("CLZ %0, %1" : "=r"(value) : "r"(value)); + asm("ADDS %0, %1, #0x01" : "=r"(value) : "r"(value)); + + return value; } #elif defined(__GNUC__) int __rt_ffs(int value) diff --git a/libcpu/arm/cortex-m7/context_gcc.S b/libcpu/arm/cortex-m7/context_gcc.S index 908a44f847..af6c9934d4 100644 --- a/libcpu/arm/cortex-m7/context_gcc.S +++ b/libcpu/arm/cortex-m7/context_gcc.S @@ -203,7 +203,9 @@ rt_hw_context_switch_to: NOP MSR msp, r0 - CPSIE I /* enable interrupts at processor level */ + /* enable interrupts at processor level */ + CPSIE F + CPSIE I /* never reach here! */ diff --git a/libcpu/arm/cortex-m7/context_iar.S b/libcpu/arm/cortex-m7/context_iar.S index 8761a97052..4cc9539112 100644 --- a/libcpu/arm/cortex-m7/context_iar.S +++ b/libcpu/arm/cortex-m7/context_iar.S @@ -207,7 +207,9 @@ rt_hw_context_switch_to: NOP MSR msp, r0 - CPSIE I ; enable interrupts at processor level + ; enable interrupts at processor level + CPSIE F + CPSIE I ; never reach here! diff --git a/libcpu/arm/cortex-m7/context_rvds.S b/libcpu/arm/cortex-m7/context_rvds.S index 53a3756783..38410c8a3b 100644 --- a/libcpu/arm/cortex-m7/context_rvds.S +++ b/libcpu/arm/cortex-m7/context_rvds.S @@ -208,6 +208,7 @@ rt_hw_context_switch_to PROC MSR msp, r0 ; enable interrupts at processor level + CPSIE F CPSIE I ; never reach here! diff --git a/libcpu/arm/cortex-m7/cpuport.c b/libcpu/arm/cortex-m7/cpuport.c index 47d8473997..e74c337c60 100644 --- a/libcpu/arm/cortex-m7/cpuport.c +++ b/libcpu/arm/cortex-m7/cpuport.c @@ -238,6 +238,7 @@ __asm int __rt_ffs(int value) { CMP r0, #0x00 BEQ exit + RBIT r0, r0 CLZ r0, r0 ADDS r0, r0, #0x01 @@ -250,9 +251,11 @@ int __rt_ffs(int value) { if (value == 0) return value; - __ASM("RBIT r0, r0"); - __ASM("CLZ r0, r0"); - __ASM("ADDS r0, r0, #0x01"); + asm("RBIT %0, %1" : "=r"(value) : "r"(value)); + asm("CLZ %0, %1" : "=r"(value) : "r"(value)); + asm("ADDS %0, %1, #0x01" : "=r"(value) : "r"(value)); + + return value; } #elif defined(__GNUC__) int __rt_ffs(int value) diff --git a/libcpu/mips/loongson_1c/cpuport.c b/libcpu/mips/loongson_1c/cpuport.c index 6cdae024c4..f4914dfec4 100644 --- a/libcpu/mips/loongson_1c/cpuport.c +++ b/libcpu/mips/loongson_1c/cpuport.c @@ -121,5 +121,41 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *stack_ad return (rt_uint8_t *)stk; } +#define cache_op(op,addr) \ + __asm__ __volatile__( \ + " .set push \n" \ + " .set noreorder \n" \ + " .set mips3\n\t \n" \ + " cache %0, %1 \n" \ + " .set pop \n" \ + : \ + : "i" (op), "R" (*(unsigned char *)(addr))) + +#if defined(CONFIG_CPU_LOONGSON2) +#define Hit_Invalidate_I 0x00 +#else +#define Hit_Invalidate_I 0x10 +#endif +#define Hit_Invalidate_D 0x11 +#define CONFIG_SYS_CACHELINE_SIZE 32 +#define Hit_Writeback_Inv_D 0x15 + + +void flush_cache(unsigned long start_addr, unsigned long size) +{ + unsigned long lsize = CONFIG_SYS_CACHELINE_SIZE; + unsigned long addr = start_addr & ~(lsize - 1); + unsigned long aend = (start_addr + size - 1) & ~(lsize - 1); + + while (1) { + cache_op(Hit_Writeback_Inv_D, addr); + cache_op(Hit_Invalidate_I, addr); + if (addr == aend) + break; + addr += lsize; + } +} + + /*@}*/ diff --git a/libcpu/risc-v/e310/start_gcc.S b/libcpu/risc-v/e310/start_gcc.S index 8ed2a03d37..5f1b087b78 100644 --- a/libcpu/risc-v/e310/start_gcc.S +++ b/libcpu/risc-v/e310/start_gcc.S @@ -21,7 +21,7 @@ ; * Date Author Notes ; * 2017-07-16 zhangjun for hifive1 ; */ -#include <sifive/smp.h> +#include "sifive/smp.h" #define CLINT_CTRL_ADDR 0x02000000 .section .init @@ -29,116 +29,116 @@ .type _start,@function _start: - .cfi_startproc - .cfi_undefined ra + .cfi_startproc + .cfi_undefined ra .option push .option norelax - la gp, __global_pointer$ + la gp, __global_pointer$ .option pop - la sp, _sp + la sp, _sp /* *disable all interrupt at startup */ - csrrc a5, mstatus, 0xb + csrrc a5, mstatus, 0xb #if defined(ENABLE_SMP) - smp_pause(t0, t1) + smp_pause(t0, t1) #endif - /* Load data section */ - la a0, _data_lma - la a1, _data - la a2, _edata - bgeu a1, a2, 2f + /* Load data section */ + la a0, _data_lma + la a1, _data + la a2, _edata + bgeu a1, a2, 2f 1: - lw t0, (a0) - sw t0, (a1) - addi a0, a0, 4 - addi a1, a1, 4 - bltu a1, a2, 1b + lw t0, (a0) + sw t0, (a1) + addi a0, a0, 4 + addi a1, a1, 4 + bltu a1, a2, 1b 2: - /* Clear bss section */ - la a0, __bss_start - la a1, _end - bgeu a0, a1, 2f + /* Clear bss section */ + la a0, __bss_start + la a1, _end + bgeu a0, a1, 2f 1: - sw zero, (a0) - addi a0, a0, 4 - bltu a0, a1, 1b + sw zero, (a0) + addi a0, a0, 4 + bltu a0, a1, 1b 2: - /* Call global constructors */ - la a0, __libc_fini_array - call atexit - call __libc_init_array - /*call _init directly in rt-thread*/ + /* Call global constructors */ + la a0, __libc_fini_array + call atexit + call __libc_init_array + /*call _init directly in rt-thread*/ call _init #ifndef __riscv_float_abi_soft - /* Enable FPU */ - li t0, MSTATUS_FS - csrs mstatus, t0 - csrr t1, mstatus - and t1, t1, t0 - beqz t1, 1f - fssr x0 + /* Enable FPU */ + li t0, MSTATUS_FS + csrs mstatus, t0 + csrr t1, mstatus + and t1, t1, t0 + beqz t1, 1f + fssr x0 1: #endif #if defined(ENABLE_SMP) - smp_resume(t0, t1) + smp_resume(t0, t1) - csrr a0, mhartid - bnez a0, 2f + csrr a0, mhartid + bnez a0, 2f #endif - auipc ra, 0 - addi sp, sp, -16 + auipc ra, 0 + addi sp, sp, -16 #if __riscv_xlen == 32 - sw ra, 8(sp) + sw ra, 8(sp) #else - sd ra, 8(sp) + sd ra, 8(sp) #endif - /* argc = argv = 0 */ - li a0, 0 - li a1, 0 - call main - tail exit + /* argc = argv = 0 */ + li a0, 0 + li a1, 0 + call main + tail exit 1: - j 1b + j 1b #if defined(ENABLE_SMP) 2: - la t0, trap_entry - csrw mtvec, t0 + la t0, trap_entry + csrw mtvec, t0 - csrr a0, mhartid - la t1, _sp - slli t0, a0, 10 - sub sp, t1, t0 + csrr a0, mhartid + la t1, _sp + slli t0, a0, 10 + sub sp, t1, t0 - auipc ra, 0 - addi sp, sp, -16 + auipc ra, 0 + addi sp, sp, -16 #if __riscv_xlen == 32 - sw ra, 8(sp) + sw ra, 8(sp) #else - sd ra, 8(sp) + sd ra, 8(sp) #endif - call secondary_main - tail exit + call secondary_main + tail exit 1: - j 1b + j 1b #endif - .cfi_endproc + .cfi_endproc #include "encoding.h" #include "sifive/bits.h" - .section .text.entry + .section .text.entry .align 2 .global trap_entry trap_entry: |
