Skip to content

R
rt-thread

天中雨水 / rt-thread
该项目与 Fork 源项目分叉

Fork自 RT-Thread / rt-thread

通知 2
Star 1
Fork 0
R
rt-thread

体验新版 GitCode，发现更多精彩内容 >>

提交 49fa5c44 编写于 作者: A ardafu
浏览文件
操作

[libcpu][arm926] Optimize code 

1. Combine code for IAR and GCC in file mmu.c and cpuport.c
2. Remove remap code in start_xxx.S. User should config MMU to map vector table to visual address 0x0
上级 66ac2fb9
隐藏空白更改
内联 并排
Showing with 190 addition and 475 deletion
libcpu/arm/arm926/context_gcc.S
浏览文件 @ 49fa5c44
...@@ -49,15 +49,15 @@ rt_hw_interrupt_enable: ...@@ -49,15 +49,15 @@ rt_hw_interrupt_enable:
*/ */
.globl rt_hw_context_switch .globl rt_hw_context_switch
rt_hw_context_switch: rt_hw_context_switch:
stmfd sp!, {lr} @; push pc (lr should be pushed in place of pc) STMFD SP!, {LR} @; push pc (lr should be pushed in place of pc)
stmfd sp!, {r0-r12, lr} @; push lr & register file STMFD SP!, {R0-R12, LR} @; push lr & register file
mrs r4, cpsr MRS R4, CPSR
stmfd sp!, {r4} @; push cpsr STMFD SP!, {R4} @; push cpsr
str sp, [r0] @; store sp in preempted tasks tcb STR SP, [R0] @; store sp in preempted tasks tcb
ldr sp, [r1] @; get new task stack pointer LDR SP, [R1] @; get new task stack pointer
ldmfd sp!, {r4} @; pop new task spsr LDMFD SP!, {R4} @; pop new task spsr
msr spsr_cxsf, r4 MSR SPSR_cxsf, R4
ldmfd sp!, {r0-r12, lr, pc}^ @; pop new task r0-r12, lr & pc LDMFD SP!, {R0-R12, LR, PC}^ @; pop new task r0-r12, lr & pc
/* /*
* void rt_hw_context_switch_to(rt_uint32 to); * void rt_hw_context_switch_to(rt_uint32 to);
...@@ -65,10 +65,10 @@ rt_hw_context_switch: ...@@ -65,10 +65,10 @@ rt_hw_context_switch:
*/ */
.globl rt_hw_context_switch_to .globl rt_hw_context_switch_to
rt_hw_context_switch_to: rt_hw_context_switch_to:
ldr sp, [r0] @; get new task stack pointer LDR SP, [R0] @; get new task stack pointer
ldmfd sp!, {r4} @; pop new task cpsr LDMFD SP!, {R4} @; pop new task cpsr
msr spsr_cxsf, r4 MSR SPSR_cxsf, R4
ldmfd sp!, {r0-r12, lr, pc}^ @; pop new task r0-r12, lr & pc LDMFD SP!, {R0-R12, LR, PC}^ @; pop new task r0-r12, lr & pc
/* /*
* void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to);
......
libcpu/arm/arm926/cpuport.c
浏览文件 @ 49fa5c44
...@@ -32,18 +32,18 @@ ...@@ -32,18 +32,18 @@
extern void machine_reset(void); extern void machine_reset(void);
extern void machine_shutdown(void); extern void machine_shutdown(void);
#ifdef __GNUC__ #if defined(__GNUC__) || defined(__ICCARM__)
rt_inline rt_uint32_t cp15_rd(void) rt_inline rt_uint32_t cp15_rd(void)
{ {
rt_uint32_t i; rt_uint32_t i;
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i)); __asm volatile("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
return i; return i;
} }
rt_inline void cache_enable(rt_uint32_t bit) rt_inline void cache_enable(rt_uint32_t bit)
{ {
__asm__ __volatile__(\ __asm volatile(\
"mrc p15,0,r0,c1,c0,0\n\t" \ "mrc p15,0,r0,c1,c0,0\n\t" \
"orr r0,r0,%0\n\t" \ "orr r0,r0,%0\n\t" \
"mcr p15,0,r0,c1,c0,0" \ "mcr p15,0,r0,c1,c0,0" \
...@@ -54,7 +54,7 @@ rt_inline void cache_enable(rt_uint32_t bit) ...@@ -54,7 +54,7 @@ rt_inline void cache_enable(rt_uint32_t bit)
rt_inline void cache_disable(rt_uint32_t bit) rt_inline void cache_disable(rt_uint32_t bit)
{ {
__asm__ __volatile__(\ __asm volatile(\
"mrc p15,0,r0,c1,c0,0\n\t" \ "mrc p15,0,r0,c1,c0,0\n\t" \
"bic r0,r0,%0\n\t" \ "bic r0,r0,%0\n\t" \
"mcr p15,0,r0,c1,c0,0" \ "mcr p15,0,r0,c1,c0,0" \
...@@ -64,12 +64,12 @@ rt_inline void cache_disable(rt_uint32_t bit) ...@@ -64,12 +64,12 @@ rt_inline void cache_disable(rt_uint32_t bit)
} }
#endif #endif
#ifdef __CC_ARM #if defined(__CC_ARM)
rt_inline rt_uint32_t cp15_rd(void) rt_inline rt_uint32_t cp15_rd(void)
{ {
rt_uint32_t i; rt_uint32_t i;
__asm __asm volatile
{ {
mrc p15, 0, i, c1, c0, 0 mrc p15, 0, i, c1, c0, 0
} }
...@@ -81,7 +81,7 @@ rt_inline void cache_enable(rt_uint32_t bit) ...@@ -81,7 +81,7 @@ rt_inline void cache_enable(rt_uint32_t bit)
{ {
rt_uint32_t value; rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
orr value, value, bit orr value, value, bit
...@@ -93,7 +93,7 @@ rt_inline void cache_disable(rt_uint32_t bit) ...@@ -93,7 +93,7 @@ rt_inline void cache_disable(rt_uint32_t bit)
{ {
rt_uint32_t value; rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
bic value, value, bit bic value, value, bit
...@@ -102,38 +102,6 @@ rt_inline void cache_disable(rt_uint32_t bit) ...@@ -102,38 +102,6 @@ rt_inline void cache_disable(rt_uint32_t bit)
} }
#endif #endif
#ifdef __ICCARM__
rt_inline rt_uint32_t cp15_rd(void)
{
rt_uint32_t i;
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
return i;
}
rt_inline void cache_enable(rt_uint32_t bit)
{
asm volatile(\
"mrc p15,0,r0,c1,c0,0\n\t" \
"orr r0,r0,%0\n\t" \
"mcr p15,0,r0,c1,c0,0" \
: \
:"r" (bit) \
:"memory");
}
rt_inline void cache_disable(rt_uint32_t bit)
{
asm volatile(\
"mrc p15,0,r0,c1,c0,0\n\t" \
"bic r0,r0,%0\n\t" \
"mcr p15,0,r0,c1,c0,0" \
: \
:"r" (bit) \
:"memory");
}
#endif
/** /**
* enable I-Cache * enable I-Cache
* *
...@@ -249,27 +217,24 @@ int __rt_ffs(int value) ...@@ -249,27 +217,24 @@ int __rt_ffs(int value)
return x; return x;
} }
#elif defined(__ICCARM__) #elif defined(__GNUC__) || defined(__ICCARM__)
int __rt_ffs(int value) int __rt_ffs(int value)
{ {
if (value == 0) register rt_uint32_t x;
return value;
__ASM("RSB r4, r0, #0");
__ASM("AND r4, r4, r0");
__ASM("CLZ r4, r4");
__ASM("RSB r0, r4, #32");
}
#elif defined(__GNUC__)
int __rt_ffs(int value)
{
if (value == 0) if (value == 0)
return value; return value;
value &= (-value); __asm
asm ("clz %0, %1": "=r"(value) :"r"(value)); (
"rsb %[temp], %[val], #0\n"
return (32 - value); "and %[temp], %[temp], %[val]\n"
"clz %[temp], %[temp]\n"
"rsb %[temp], %[temp], #32\n"
:[temp] "=r"(x)
:[val] "r"(value)
);
return x;
} }
#endif #endif
......
libcpu/arm/arm926/mmu.c
浏览文件 @ 49fa5c44
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "mmu.h" #include "mmu.h"
/*----- Keil -----------------------------------------------------------------*/
#ifdef __CC_ARM #ifdef __CC_ARM
void mmu_setttbase(rt_uint32_t i) void mmu_setttbase(rt_uint32_t i)
{ {
...@@ -35,32 +36,22 @@ void mmu_setttbase(rt_uint32_t i) ...@@ -35,32 +36,22 @@ void mmu_setttbase(rt_uint32_t i)
* set by page table entry * set by page table entry
*/ */
value = 0; value = 0;
__asm __asm volatile{ mcr p15, 0, value, c8, c7, 0 }
{
mcr p15, 0, value, c8, c7, 0
}
value = 0x55555555; value = 0x55555555;
__asm __asm volatile { mcr p15, 0, value, c3, c0, 0 }
{ __asm volatile { mcr p15, 0, i, c2, c0, 0 }
mcr p15, 0, value, c3, c0, 0
mcr p15, 0, i, c2, c0, 0
}
} }
void mmu_set_domain(rt_uint32_t i) void mmu_set_domain(rt_uint32_t i)
{ {
__asm __asm volatile { mcr p15, 0, i, c3, c0, 0 }
{
mcr p15,0, i, c3, c0, 0
}
} }
void mmu_enable() void mmu_enable()
{ {
register rt_uint32_t value; register rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
orr value, value, #0x01 orr value, value, #0x01
...@@ -72,7 +63,7 @@ void mmu_disable() ...@@ -72,7 +63,7 @@ void mmu_disable()
{ {
register rt_uint32_t value; register rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
bic value, value, #0x01 bic value, value, #0x01
...@@ -84,7 +75,7 @@ void mmu_enable_icache() ...@@ -84,7 +75,7 @@ void mmu_enable_icache()
{ {
register rt_uint32_t value; register rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
orr value, value, #0x1000 orr value, value, #0x1000
...@@ -96,7 +87,7 @@ void mmu_enable_dcache() ...@@ -96,7 +87,7 @@ void mmu_enable_dcache()
{ {
register rt_uint32_t value; register rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
orr value, value, #0x04 orr value, value, #0x04
...@@ -108,7 +99,7 @@ void mmu_disable_icache() ...@@ -108,7 +99,7 @@ void mmu_disable_icache()
{ {
register rt_uint32_t value; register rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
bic value, value, #0x1000 bic value, value, #0x1000
...@@ -120,7 +111,7 @@ void mmu_disable_dcache() ...@@ -120,7 +111,7 @@ void mmu_disable_dcache()
{ {
register rt_uint32_t value; register rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
bic value, value, #0x04 bic value, value, #0x04
...@@ -132,7 +123,7 @@ void mmu_enable_alignfault() ...@@ -132,7 +123,7 @@ void mmu_enable_alignfault()
{ {
register rt_uint32_t value; register rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
orr value, value, #0x02 orr value, value, #0x02
...@@ -144,7 +135,7 @@ void mmu_disable_alignfault() ...@@ -144,7 +135,7 @@ void mmu_disable_alignfault()
{ {
register rt_uint32_t value; register rt_uint32_t value;
__asm __asm volatile
{ {
mrc p15, 0, value, c1, c0, 0 mrc p15, 0, value, c1, c0, 0
bic value, value, #0x02 bic value, value, #0x02
...@@ -154,10 +145,7 @@ void mmu_disable_alignfault() ...@@ -154,10 +145,7 @@ void mmu_disable_alignfault()
void mmu_clean_invalidated_cache_index(int index) void mmu_clean_invalidated_cache_index(int index)
{ {
__asm __asm volatile { mcr p15, 0, index, c7, c14, 2 }
{
mcr p15, 0, index, c7, c14, 2
}
} }
void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size) void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
...@@ -168,10 +156,7 @@ void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size) ...@@ -168,10 +156,7 @@ void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
while(ptr < buffer + size) while(ptr < buffer + size)
{ {
__asm __asm volatile { MCR p15, 0, ptr, c7, c14, 1 }
{
MCR p15, 0, ptr, c7, c14, 1
}
ptr += CACHE_LINE_SIZE; ptr += CACHE_LINE_SIZE;
} }
} }
...@@ -184,10 +169,7 @@ void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size) ...@@ -184,10 +169,7 @@ void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size)
while (ptr < buffer + size) while (ptr < buffer + size)
{ {
__asm __asm volatile { MCR p15, 0, ptr, c7, c10, 1 }
{
MCR p15, 0, ptr, c7, c10, 1
}
ptr += CACHE_LINE_SIZE; ptr += CACHE_LINE_SIZE;
} }
} }
...@@ -200,10 +182,7 @@ void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size) ...@@ -200,10 +182,7 @@ void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size)
while (ptr < buffer + size) while (ptr < buffer + size)
{ {
__asm __asm volatile { MCR p15, 0, ptr, c7, c6, 1 }
{
MCR p15, 0, ptr, c7, c6, 1
}
ptr += CACHE_LINE_SIZE; ptr += CACHE_LINE_SIZE;
} }
} }
...@@ -213,10 +192,7 @@ void mmu_invalidate_tlb() ...@@ -213,10 +192,7 @@ void mmu_invalidate_tlb()
register rt_uint32_t value; register rt_uint32_t value;
value = 0; value = 0;
__asm __asm volatile { mcr p15, 0, value, c8, c7, 0 }
{
mcr p15, 0, value, c8, c7, 0
}
} }
void mmu_invalidate_icache() void mmu_invalidate_icache()
...@@ -225,10 +201,7 @@ void mmu_invalidate_icache() ...@@ -225,10 +201,7 @@ void mmu_invalidate_icache()
value = 0; value = 0;
__asm __asm volatile { mcr p15, 0, value, c7, c5, 0 }
{
mcr p15, 0, value, c7, c5, 0
}
} }
...@@ -238,12 +211,10 @@ void mmu_invalidate_dcache_all() ...@@ -238,12 +211,10 @@ void mmu_invalidate_dcache_all()
value = 0; value = 0;
__asm __asm volatile { mcr p15, 0, value, c7, c6, 0 }
{
mcr p15, 0, value, c7, c6, 0
}
} }
#elif defined(__GNUC__) /*----- GNU ------------------------------------------------------------------*/
#elif defined(__GNUC__) || defined(__ICCARM__)
void mmu_setttbase(register rt_uint32_t i) void mmu_setttbase(register rt_uint32_t i)
{ {
register rt_uint32_t value; register rt_uint32_t value;
...@@ -254,311 +225,117 @@ void mmu_setttbase(register rt_uint32_t i) ...@@ -254,311 +225,117 @@ void mmu_setttbase(register rt_uint32_t i)
* set by page table entry * set by page table entry
*/ */
value = 0; value = 0;
asm ("mcr p15, 0, %0, c8, c7, 0"::"r"(value)); asm volatile ("mcr p15, 0, %0, c8, c7, 0"::"r"(value));
value = 0x55555555; value = 0x55555555;
asm ("mcr p15, 0, %0, c3, c0, 0"::"r"(value)); asm volatile ("mcr p15, 0, %0, c3, c0, 0"::"r"(value));
asm ("mcr p15, 0, %0, c2, c0, 0"::"r"(i));
}
void mmu_set_domain(register rt_uint32_t i)
{
asm ("mcr p15,0, %0, c3, c0, 0": :"r" (i));
}
void mmu_enable()
{
register rt_uint32_t i;
/* read control register */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
i |= 0x1;
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
}
void mmu_disable()
{
register rt_uint32_t i;
/* read control register */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
i &= ~0x1;
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
}
void mmu_enable_icache()
{
register rt_uint32_t i;
/* read control register */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
i |= (1 << 12);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
}
void mmu_enable_dcache()
{
register rt_uint32_t i;
/* read control register */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
i |= (1 << 2);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
}
void mmu_disable_icache()
{
register rt_uint32_t i;
/* read control register */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
i &= ~(1 << 12);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
}
void mmu_disable_dcache()
{
register rt_uint32_t i;
/* read control register */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
i &= ~(1 << 2);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
}
void mmu_enable_alignfault()
{
register rt_uint32_t i;
/* read control register */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
i |= (1 << 1);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
}
void mmu_disable_alignfault()
{
register rt_uint32_t i;
/* read control register */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
i &= ~(1 << 1);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
}
void mmu_clean_invalidated_cache_index(int index)
{
asm ("mcr p15, 0, %0, c7, c14, 2": :"r" (index));
}
void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
{
unsigned int ptr;
ptr = buffer & ~(CACHE_LINE_SIZE - 1);
while(ptr < buffer + size)
{
asm ("mcr p15, 0, %0, c7, c14, 1": :"r" (ptr));
ptr += CACHE_LINE_SIZE;
}
}
void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size)
{
unsigned int ptr;
ptr = buffer & ~(CACHE_LINE_SIZE - 1);
while (ptr < buffer + size)
{
asm ("mcr p15, 0, %0, c7, c10, 1": :"r" (ptr));
ptr += CACHE_LINE_SIZE;
}
}
void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size)
{
unsigned int ptr;
ptr = buffer & ~(CACHE_LINE_SIZE - 1);
while (ptr < buffer + size)
{
asm ("mcr p15, 0, %0, c7, c6, 1": :"r" (ptr));
ptr += CACHE_LINE_SIZE;
}
}
void mmu_invalidate_tlb()
{
asm ("mcr p15, 0, %0, c8, c7, 0": :"r" (0));
}
void mmu_invalidate_icache()
{
asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (0));
}
void mmu_invalidate_dcache_all() asm volatile ("mcr p15, 0, %0, c2, c0, 0"::"r"(i));
{
asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (0));
}
#elif defined(__ICCARM__)
void mmu_setttbase(register rt_uint32_t i)
{
register rt_uint32_t value;
/* Invalidates all TLBs.Domain access is selected as
* client by configuring domain access register,
* in that case access controlled by permission value
* set by page table entry
*/
value = 0;
asm ("mcr p15, 0, %0, c8, c7, 0"::"r"(value));
value = 0x55555555;
asm ("mcr p15, 0, %0, c3, c0, 0"::"r"(value));
asm ("mcr p15, 0, %0, c2, c0, 0"::"r"(i));
} }
void mmu_set_domain(register rt_uint32_t i) void mmu_set_domain(register rt_uint32_t i)
{ {
asm ("mcr p15,0, %0, c3, c0, 0": :"r" (i)); asm volatile ("mcr p15,0, %0, c3, c0, 0": :"r" (i));
} }
void mmu_enable() void mmu_enable()
{ {
register rt_uint32_t i; asm volatile
(
/* read control register */ "mrc p15, 0, r0, c1, c0, 0 \n"
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i)); "orr r0, r0, #0x1 \n"
"mcr p15, 0, r0, c1, c0, 0 \n"
i |= 0x1; :::"r0"
);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
} }
void mmu_disable() void mmu_disable()
{ {
register rt_uint32_t i; asm volatile
(
/* read control register */ "mrc p15, 0, r0, c1, c0, 0 \n"
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i)); "bic r0, r0, #0x1 \n"
"mcr p15, 0, r0, c1, c0, 0 \n"
i &= ~0x1; :::"r0"
);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
} }
void mmu_enable_icache() void mmu_enable_icache()
{ {
register rt_uint32_t i; asm volatile
(
/* read control register */ "mrc p15, 0, r0, c1, c0, 0 \n"
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i)); "orr r0, r0, #(1<<12) \n"
"mcr p15, 0, r0, c1, c0, 0 \n"
i |= (1 << 12); :::"r0"
);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
} }
void mmu_enable_dcache() void mmu_enable_dcache()
{ {
register rt_uint32_t i; asm volatile
(
/* read control register */ "mrc p15, 0, r0, c1, c0, 0 \n"
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i)); "orr r0, r0, #(1<<2) \n"
"mcr p15, 0, r0, c1, c0, 0 \n"
i |= (1 << 2); :::"r0"
);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
} }
void mmu_disable_icache() void mmu_disable_icache()
{ {
register rt_uint32_t i; asm volatile
(
"mrc p15, 0, r0, c1, c0, 0 \n"
"bic r0, r0, #(1<<12) \n"
"mcr p15, 0, r0, c1, c0, 0 \n"
:::"r0"
);
/* read control register */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
i &= ~(1 << 12);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
} }
void mmu_disable_dcache() void mmu_disable_dcache()
{ {
register rt_uint32_t i; asm volatile
(
/* read control register */ "mrc p15, 0, r0, c1, c0, 0 \n"
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i)); "bic r0, r0, #(1<<2) \n"
"mcr p15, 0, r0, c1, c0, 0 \n"
:::"r0"
);
i &= ~(1 << 2);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
} }
void mmu_enable_alignfault() void mmu_enable_alignfault()
{ {
register rt_uint32_t i; asm volatile
(
/* read control register */ "mrc p15, 0, r0, c1, c0, 0 \n"
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i)); "orr r0, r0, #1 \n"
"mcr p15, 0, r0, c1, c0, 0 \n"
:::"r0"
);
i |= (1 << 1);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
} }
void mmu_disable_alignfault() void mmu_disable_alignfault()
{ {
register rt_uint32_t i; asm volatile
(
/* read control register */ "mrc p15, 0, r0, c1, c0, 0 \n"
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i)); "bic r0, r0, #1 \n"
"mcr p15, 0, r0, c1, c0, 0 \n"
i &= ~(1 << 1); :::"r0"
);
/* write back to control register */
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
} }
void mmu_clean_invalidated_cache_index(int index) void mmu_clean_invalidated_cache_index(int index)
{ {
asm ("mcr p15, 0, %0, c7, c14, 2": :"r" (index)); asm volatile ("mcr p15, 0, %0, c7, c14, 2": :"r" (index));
} }
void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size) void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
...@@ -569,7 +346,8 @@ void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size) ...@@ -569,7 +346,8 @@ void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
while(ptr < buffer + size) while(ptr < buffer + size)
{ {
asm ("mcr p15, 0, %0, c7, c14, 1": :"r" (ptr)); asm volatile ("mcr p15, 0, %0, c7, c14, 1": :"r" (ptr));
ptr += CACHE_LINE_SIZE; ptr += CACHE_LINE_SIZE;
} }
} }
...@@ -583,7 +361,8 @@ void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size) ...@@ -583,7 +361,8 @@ void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size)
while (ptr < buffer + size) while (ptr < buffer + size)
{ {
asm ("mcr p15, 0, %0, c7, c10, 1": :"r" (ptr)); asm volatile ("mcr p15, 0, %0, c7, c10, 1": :"r" (ptr));
ptr += CACHE_LINE_SIZE; ptr += CACHE_LINE_SIZE;
} }
} }
...@@ -596,35 +375,40 @@ void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size) ...@@ -596,35 +375,40 @@ void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size)
while (ptr < buffer + size) while (ptr < buffer + size)
{ {
asm ("mcr p15, 0, %0, c7, c6, 1": :"r" (ptr)); asm volatile ("mcr p15, 0, %0, c7, c6, 1": :"r" (ptr));
ptr += CACHE_LINE_SIZE; ptr += CACHE_LINE_SIZE;
} }
} }
void mmu_invalidate_tlb() void mmu_invalidate_tlb()
{ {
asm ("mcr p15, 0, %0, c8, c7, 0": :"r" (0)); asm volatile ("mcr p15, 0, %0, c8, c7, 0": :"r" (0));
} }
void mmu_invalidate_icache() void mmu_invalidate_icache()
{ {
asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (0)); asm volatile ("mcr p15, 0, %0, c7, c5, 0": :"r" (0));
} }
void mmu_invalidate_dcache_all() void mmu_invalidate_dcache_all()
{ {
asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (0)); asm volatile ("mcr p15, 0, %0, c7, c6, 0": :"r" (0));
} }
#endif #endif
/* level1 page table */ /* level1 page table */
#if defined(__ICCARM__) #if defined(__ICCARM__)
#pragma data_alignment=(16*1024) #pragma data_alignment=(16*1024)
static volatile unsigned int _page_table[4*1024];; static volatile rt_uint32_t _page_table[4*1024];
#else #else
static volatile unsigned int _page_table[4*1024] \ static volatile rt_uint32_t _page_table[4*1024] \
__attribute__((aligned(16*1024))); __attribute__((aligned(16*1024)));
#endif #endif
void mmu_setmtt(rt_uint32_t vaddrStart, rt_uint32_t vaddrEnd, void mmu_setmtt(rt_uint32_t vaddrStart, rt_uint32_t vaddrEnd,
rt_uint32_t paddrStart, rt_uint32_t attr) rt_uint32_t paddrStart, rt_uint32_t attr)
{ {
......
libcpu/arm/arm926/start_gcc.S
浏览文件 @ 49fa5c44
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* Date Author Notes * Date Author Notes
* 2011-01-13 weety first version * 2011-01-13 weety first version
* 2015-04-15 ArdaFu Split from AT91SAM9260 BSP * 2015-04-15 ArdaFu Split from AT91SAM9260 BSP
* 2015-04-21 ArdaFu Remove remap code. Using mmu to map vector table
*/ */
#define S_FRAME_SIZE (18*4) //72 #define S_FRAME_SIZE (18*4) //72
...@@ -63,31 +64,30 @@ ...@@ -63,31 +64,30 @@
.global UND_STACK_START .global UND_STACK_START
UND_STACK_START: UND_STACK_START:
.space SVC_STK_SIZE
.align 2
.global SVC_STACK_START
SVC_STACK_START:
.space ABT_STK_SIZE .space ABT_STK_SIZE
.align 2 .align 2
.global ABT_STACK_START .global ABT_STACK_START
ABT_STACK_START: ABT_STACK_START:
.space IRQ_STK_SIZE
.align 2
.global IRQ_STACK_START
IRQ_STACK_START:
.space FIQ_STK_SIZE .space FIQ_STK_SIZE
.align 2 .align 2
.global FIQ_STACK_START .global FIQ_STACK_START
FIQ_STACK_START: FIQ_STACK_START:
.space IRQ_STK_SIZE
.align 2
.global IRQ_STACK_START
IRQ_STACK_START:
.skip SYS_STK_SIZE .skip SYS_STK_SIZE
.align 2 .align 2
.global SYS_STACK_START .global SYS_STACK_START
SYS_STACK_START: SYS_STACK_START:
.space SVC_STK_SIZE
.align 2
.global SVC_STACK_START
SVC_STACK_START:
@;--------------Jump vector table----------------------------------------------- @;--------------Jump vector table-----------------------------------------------
.section .init, "ax" .section .init, "ax"
...@@ -132,24 +132,21 @@ Reset_Handler: ...@@ -132,24 +132,21 @@ Reset_Handler:
MRS R0, CPSR MRS R0, CPSR
BIC R0, R0, #MODEMASK BIC R0, R0, #MODEMASK
ORR R0, R0, #MODE_SVC|NOINT ORR R0, R0, #MODE_SVC|NOINT
MSR CPSR, R0 MSR CPSR_cxsf, R0
LDR SP, =SVC_STACK_START
@; Set CO-Processor
@; little-end，disbale I/D Cache MMU, vector table is 0x00000000
MRC P15, 0, R0, C1, C0, 0 @; Read CP15
LDR R1, =0x00003085 @; set clear bits
BIC R0, R0, R1
MCR P15, 0, R0, C1, C0, 0 @; Write CP15
@; Call low level init function, @; Call low level init function,
@; disable and clear all IRQs and remap internal ram to 0x00000000. @; disable and clear all IRQs, Init MMU, Init interrupt controller, etc.
LDR SP, =SVC_STACK_START
LDR R0, =rt_low_level_init LDR R0, =rt_low_level_init
BLX R0 BLX R0
@; Copy Exception Vectors to Internal RAM
LDR R8, =entry @; Source
LDR R9, =VECTOR_TABLE_START @; Destination
CMP R8, R9
BEQ Setup_Stack
LDMIA R8!, {R0-R7} @; Load Vectors
STMIA R9!, {R0-R7} @; Store Vectors
LDMIA R8!, {R0-R7} @; Load Handler Addresses
STMIA R9!, {R0-R7} @; Store Handler Addresses
Setup_Stack: Setup_Stack:
@; Setup Stack for each mode @; Setup Stack for each mode
MRS R0, CPSR MRS R0, CPSR
......
libcpu/arm/arm926/start_iar.S
浏览文件 @ 49fa5c44
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
; * Date Author Notes ; * Date Author Notes
; * 2011-01-13 weety first version ; * 2011-01-13 weety first version
; * 2015-04-15 ArdaFu Split from AT91SAM9260 BSP ; * 2015-04-15 ArdaFu Split from AT91SAM9260 BSP
; * 2015-04-21 ArdaFu Remove remap code. Using mmu to map vector table
; */ ; */
#define S_FRAME_SIZE (18*4) ;72 #define S_FRAME_SIZE (18*4) ;72
...@@ -80,16 +81,16 @@ FIQ_STACK_START: ...@@ -80,16 +81,16 @@ FIQ_STACK_START:
PUBLIC IRQ_STACK_START PUBLIC IRQ_STACK_START
IRQ_STACK_START: IRQ_STACK_START:
ALIGNRAM 2
DS8 SVC_STK_SIZE
PUBLIC SVC_STACK_START
SVC_STACK_START:
ALIGNRAM 2 ALIGNRAM 2
DS8 SYS_STK_SIZE DS8 SYS_STK_SIZE
PUBLIC SYS_STACK_START PUBLIC SYS_STACK_START
SYS_STACK_START: SYS_STACK_START:
ALIGNRAM 2
DS8 SVC_STK_SIZE
PUBLIC SVC_STACK_START
SVC_STACK_START:
;--------------Jump vector table------------------------------------------------ ;--------------Jump vector table------------------------------------------------
SECTION .intvec:CODE:ROOT(2) SECTION .intvec:CODE:ROOT(2)
ARM ARM
...@@ -134,22 +135,19 @@ Reset_Handler: ...@@ -134,22 +135,19 @@ Reset_Handler:
BIC R0, R0, #MODEMASK BIC R0, R0, #MODEMASK
ORR R0, R0, #MODE_SVC|NOINT ORR R0, R0, #MODE_SVC|NOINT
MSR CPSR_cxsf, R0 MSR CPSR_cxsf, R0
LDR SP, =SVC_STACK_START
; Set CO-Processor
; little-end，disbale I/D Cache MMU, vector table is 0x00000000
MRC P15, 0, R0, C1, C0, 0 ; Read CP15
LDR R1, =0x00003085 ; set clear bits
BIC R0, R0, R1
MCR P15, 0, R0, C1, C0, 0 ; Write CP15
; Call low level init function, ; Call low level init function,
; disable and clear all IRQs and remap internal ram to 0x00000000. ; disable and clear all IRQs, Init MMU, Init interrupt controller, etc.
LDR SP, =SVC_STACK_START
LDR R0, =rt_low_level_init LDR R0, =rt_low_level_init
BLX R0 BLX R0
; Copy Exception Vectors to Internal RAM
LDR R8, =Entry_Point ; Source
LDR R9, =VECTOR_TABLE_START ; Destination
CMP R8, R9
BEQ Setup_Stack
LDMIA R8!, {R0-R7} ; Load Vectors
STMIA R9!, {R0-R7} ; Store Vectors
LDMIA R8!, {R0-R7} ; Load Handler Addresses
STMIA R9!, {R0-R7} ; Store Handler Addresses
Setup_Stack: Setup_Stack:
; Setup Stack for each mode ; Setup Stack for each mode
......
libcpu/arm/arm926/start_rvds.S
浏览文件 @ 49fa5c44
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
; * Change Logs: ; * Change Logs:
; * Date Author Notes ; * Date Author Notes
; * 2011-08-14 weety first version ; * 2011-08-14 weety first version
; * 2015-04-15 ArdaFu Split from AT91SAM9260 BSP ; * 2015-04-15 ArdaFu Split from AT91SAM9260 BSP
; * 2015-04-21 ArdaFu Remove remap code. Using mmu to map vector table
; */ ; */
S_FRAME_SIZE EQU (18*4) ;72 S_FRAME_SIZE EQU (18*4) ;72
...@@ -59,46 +60,38 @@ NOINT EQU 0xC0 ...@@ -59,46 +60,38 @@ NOINT EQU 0xC0
GET rt_low_level_keil.inc GET rt_low_level_keil.inc
;----------------------- Stack and Heap Definitions ---------------------------- ;----------------------- Stack and Heap Definitions ----------------------------
AREA STACK, NOINIT, READWRITE, ALIGN=3 AREA STACK, NOINIT, READWRITE, ALIGN=2
Stack_Mem Stack_Mem
SPACE UND_STK_SIZE SPACE UND_STK_SIZE
EXPORT UND_STACK_START EXPORT UND_STACK_START
UND_STACK_START UND_STACK_START
ALIGN 8 ALIGN 4
SPACE ABT_STK_SIZE SPACE ABT_STK_SIZE
EXPORT ABT_STACK_START EXPORT ABT_STACK_START
ABT_STACK_START ABT_STACK_START
ALIGN 8 ALIGN 4
SPACE FIQ_STK_SIZE SPACE FIQ_STK_SIZE
EXPORT FIQ_STACK_START EXPORT FIQ_STACK_START
FIQ_STACK_START FIQ_STACK_START
ALIGN 8 ALIGN 4
SPACE IRQ_STK_SIZE SPACE IRQ_STK_SIZE
EXPORT IRQ_STACK_START EXPORT IRQ_STACK_START
IRQ_STACK_START IRQ_STACK_START
ALIGN 8 ALIGN 4
SPACE SVC_STK_SIZE
EXPORT SVC_STACK_START
SVC_STACK_START
ALIGN 8
SPACE SYS_STK_SIZE SPACE SYS_STK_SIZE
EXPORT SYS_STACK_START EXPORT SYS_STACK_START
SYS_STACK_START SYS_STACK_START
Stack_Top
Heap_Size EQU 0x00000000
AREA HEAP, NOINIT, READWRITE, ALIGN=3
__heap_base
Heap_Mem
SPACE Heap_Size
__heap_limit
ALIGN 4
SPACE SVC_STK_SIZE
EXPORT SVC_STACK_START
SVC_STACK_START
Stack_Top
PRESERVE8 PRESERVE8
;--------------Jump vector table------------------------------------------------ ;--------------Jump vector table------------------------------------------------
EXPORT Entry_Point EXPORT Entry_Point
...@@ -139,25 +132,22 @@ Reset_Handler ...@@ -139,25 +132,22 @@ Reset_Handler
; set the cpu to SVC32 mode ; set the cpu to SVC32 mode
MRS R0,CPSR MRS R0,CPSR
BIC R0,R0,#MODEMASK BIC R0,R0,#MODEMASK
ORR R0,R0,#MODE_SVC ORR R0,R0,#MODE_SVC:OR:NOINT
MSR CPSR_CXSF,R0 MSR CPSR_cxsf,R0
LDR SP, =SVC_STACK_START
; Set CO-Processor
; little-end，disbale I/D Cache MMU, vector table is 0x00000000
MRC p15, 0, R0, c1, c0, 0 ; Read CP15
LDR R1, =0x00003085 ; set clear bits
BIC R0, R0, R1
MCR p15, 0, R0, c1, c0, 0 ; Write CP15
; Call low level init function, ; Call low level init function,
; disable and clear all IRQs and remap internal ram to 0x00000000. ; disable and clear all IRQs, Init MMU, Init interrupt controller, etc.
LDR SP, =SVC_STACK_START
LDR R0, =rt_low_level_init LDR R0, =rt_low_level_init
BLX R0 BLX R0
; Copy Exception Vectors to Internal RAM
LDR R8, =Entry_Point ; Source
LDR R9, =VECTOR_TABLE_START ; Destination
CMP R8, R9
BEQ Setup_Stack
LDMIA R8!, {R0-R7} ; Load Vectors
STMIA R9!, {R0-R7} ; Store Vectors
LDMIA R8!, {R0-R7} ; Load Handler Addresses
STMIA R9!, {R0-R7} ; Store Handler Addresses
Setup_Stack Setup_Stack
; Setup Stack for each mode ; Setup Stack for each mode
MRS R0, CPSR MRS R0, CPSR
...@@ -301,23 +291,4 @@ rt_hw_context_switch_interrupt_do PROC ...@@ -301,23 +291,4 @@ rt_hw_context_switch_interrupt_do PROC
LDMFD SP!, {R0-R12,LR,PC}^ ; pop new task's R0-R12,LR & PC SPSR to CPSR LDMFD SP!, {R0-R12,LR,PC}^ ; pop new task's R0-R12,LR & PC SPSR to CPSR
ENDP ENDP
IF :DEF:__MICROLIB
EXPORT __heap_base
EXPORT __heap_limit
ELSE
; User Initial Stack & Heap
AREA |.text|, CODE, READONLY
IMPORT __use_two_region_memory
EXPORT __user_initial_stackheap
__user_initial_stackheap
LDR R0, = Heap_Mem
LDR R1, = (Stack_Mem + SYS_STK_SIZE)
LDR R2, = (Heap_Mem + Heap_Size)
LDR R3, = Stack_Mem
BX LR
ENDIF
END END
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或