chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update Nios II 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1281 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
wuyangyong 2011-02-19 19:25:05 +00:00
parent 57756a5989
commit 664a1345cf
2 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libcpu/nios/nios_ii/context_gcc.S
View File

@ -10,6 +10,7 @@
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2011-02-14 aozima first implementation for Nios II. * 2011-02-14 aozima first implementation for Nios II.
* 2011-02-20 aozima fix context&switch bug.
*/ */
/** /**
@ -47,16 +48,20 @@ rt_hw_context_switch_interrupt_do:
/* save from thread */ /* save from thread */
addi sp,sp,-72 addi sp,sp,-72
rdctl r2, status /* frist save r2,so that save status */
stw r2, 4(sp)
/* save status */
/* when the interrupt happen,the interrupt is enable */
movi r2, 1
stw r2, 68(sp) /* status */ stw r2, 68(sp) /* status */
stw r2, 4(sp)
stw r3, 8(sp) stw r3, 8(sp)
stw r4, 12(sp) stw r4, 12(sp)
/* get & save from thread pc */ /* get & save from thread pc */
ldw r4,%gprel(rt_current_thread_entry)(gp) ldw r4,%gprel(rt_current_thread_entry)(gp)
stw r4, 0(sp) /* thread back */ stw r4, 0(sp) /* thread pc */
stw r5, 16(sp) stw r5, 16(sp)
stw r6, 20(sp) stw r6, 20(sp)
@ -75,20 +80,25 @@ rt_hw_context_switch_interrupt_do:
stw ra, 64(sp) stw ra, 64(sp)
/* save from thread sp */ /* save from thread sp */
/* rt_interrupt_from_thread = &from_thread->sp */
ldw r4, %gprel(rt_interrupt_from_thread)(gp) ldw r4, %gprel(rt_interrupt_from_thread)(gp)
/* *r4(from_thread->sp) = sp */
stw sp, (r4) stw sp, (r4)
/* clear rt_thread_switch_interrput_flag */ /* clear rt_thread_switch_interrput_flag */
/* rt_thread_switch_interrput_flag = 0 */
stw zero,%gprel(rt_thread_switch_interrput_flag)(gp) stw zero,%gprel(rt_thread_switch_interrput_flag)(gp)
/* load to thread sp */ /* load to thread sp */
/* r4 = rt_interrupt_to_thread(&to_thread->sp) */
ldw r4, %gprel(rt_interrupt_to_thread)(gp) ldw r4, %gprel(rt_interrupt_to_thread)(gp)
/* sp = to_thread->sp */
ldw sp, (r4) ldw sp, (r4)
ldw r2, 68(sp) /* status */ ldw r2, 68(sp) /* status */
wrctl status, r2 wrctl estatus, r2
ldw at, 0(sp) /* thread pc */ ldw ea, 0(sp) /* thread pc */
ldw r2, 4(sp) ldw r2, 4(sp)
ldw r3, 8(sp) ldw r3, 8(sp)
ldw r4, 12(sp) ldw r4, 12(sp)
@ -110,7 +120,8 @@ rt_hw_context_switch_interrupt_do:
addi sp, sp, 72 addi sp, sp, 72
jmp at /* estatus --> status,ea --> pc */
eret
/* /*
* void rt_hw_context_switch(rt_uint32 from, rt_uint32 to); * void rt_hw_context_switch(rt_uint32 from, rt_uint32 to);
@ -123,11 +134,14 @@ rt_hw_context_switch:
/* save from thread */ /* save from thread */
addi sp,sp,-72 addi sp,sp,-72
/* frist save r2,so that save status */
stw r2, 4(sp)
/* save status */
rdctl r2, status rdctl r2, status
stw r2, 68(sp) /* status */ stw r2, 68(sp) /* status */
stw ra, 0(sp) /* thread back */ stw ra, 0(sp) /* return from rt_hw_context_switch */
stw r2, 4(sp)
stw r3, 8(sp) stw r3, 8(sp)
stw r4, 12(sp) stw r4, 12(sp)
stw r5, 16(sp) stw r5, 16(sp)
@ -147,21 +161,26 @@ rt_hw_context_switch:
stw ra, 64(sp) stw ra, 64(sp)
/* save form thread sp */ /* save form thread sp */
/* from_thread->sp(r4) = sp */
stw sp, (r4) stw sp, (r4)
/* update rt_interrupt_from_thread */ /* update rt_interrupt_from_thread */
/* rt_interrupt_from_thread = r4(from_thread->sp) */
stw r4,%gprel(rt_interrupt_from_thread)(gp) stw r4,%gprel(rt_interrupt_from_thread)(gp)
/* update rt_interrupt_to_thread */ /* update rt_interrupt_to_thread */
/* rt_interrupt_to_thread = r5 */
stw r5,%gprel(rt_interrupt_to_thread)(gp) stw r5,%gprel(rt_interrupt_to_thread)(gp)
/* get to thread sp */ /* get to thread sp */
/* sp = rt_interrupt_to_thread(r5:to_thread->sp) */
ldw sp, (r5) ldw sp, (r5)
ldw r2, 68(sp) /* status */ ldw r2, 68(sp) /* status */
wrctl status, r2 wrctl estatus, r2
ldw ea, 0(sp) /* thread pc */
ldw at, 0(sp) /* thread pc */
ldw r2, 4(sp) ldw r2, 4(sp)
ldw r3, 8(sp) ldw r3, 8(sp)
ldw r4, 12(sp) ldw r4, 12(sp)
@ -183,7 +202,8 @@ rt_hw_context_switch:
addi sp, sp, 72 addi sp, sp, 72
jmp at /* estatus --> status,ea --> pc */
eret
/* /*
* void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to);
@ -223,9 +243,10 @@ rt_hw_context_switch_to:
ldw sp, (r4) // sp = *r4 ldw sp, (r4) // sp = *r4
ldw r2, 68(sp) /* status */ ldw r2, 68(sp) /* status */
wrctl status, r2 wrctl estatus, r2
ldw ea, 0(sp) /* thread entry */
ldw at, 0(sp) /* thread entry */
ldw r2, 4(sp) ldw r2, 4(sp)
ldw r3, 8(sp) ldw r3, 8(sp)
ldw r4, 12(sp) ldw r4, 12(sp)
@ -247,6 +268,7 @@ rt_hw_context_switch_to:
addi sp, sp, 72 addi sp, sp, 72
jmp at /* estatus --> status,ea --> pc */
eret
/*@}*/ /*@}*/

5
libcpu/nios/nios_ii/vector.S
View File

@ -9,10 +9,15 @@
/* get exception back */ /* get exception back */
ldw ea, 72(sp) ldw ea, 72(sp)
/* if(rt_thread_switch_interrput_flag == 0) goto no_need_context */
ldw r4,%gprel(rt_thread_switch_interrput_flag)(gp) ldw r4,%gprel(rt_thread_switch_interrput_flag)(gp)
beq r4,zero,no_need_context beq r4,zero,no_need_context
need_context: need_context:
movia ea, rt_hw_context_switch_interrupt_do movia ea, rt_hw_context_switch_interrupt_do
/* disable interrput */
mov r5, zero
no_need_context: no_need_context:
ldw ra, 0(sp) ldw ra, 0(sp)