forked from len0rd/rockbox
Onda VX747:
* Get rid of bug when interrupts are enabled * Get threading to work (although with some weirdness) * Other fixes/optimizations git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18512 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere
parent
e3f1a3f33e
commit
1e294e3f25
11 changed files with 234 additions and 252 deletions
|
|
@ -991,34 +991,31 @@ static inline void core_sleep(void)
|
|||
* Start the thread running and terminate it if it returns
|
||||
*---------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
void start_thread(void); /* Provide C access to ASM label */
|
||||
#if 0
|
||||
static void __attribute__((used)) __start_thread(void)
|
||||
static void __attribute__((used)) _start_thread(void)
|
||||
{
|
||||
|
||||
/* $v0 = context */
|
||||
/* $t1 = context */
|
||||
asm volatile (
|
||||
".set noreorder \n"
|
||||
"_start_thread: \n" /* Start here - no naked attribute */
|
||||
"lw $8, (4)$2 \n" /* Fetch thread function pointer ($8 = $t0, $2 = $v0) */
|
||||
"lw $29, (108)$2 \n" /* Set initial sp(=$29) */
|
||||
"jalr $8 \n" /* Start the thread ($8 = $t0,)*/
|
||||
"sw $0, (116)$2 \n" /* Clear start address ($2 = $v0) */
|
||||
".set reorder \n"
|
||||
"start_thread: \n"
|
||||
".set noreorder \n"
|
||||
".set noat \n"
|
||||
"lw $8, 4($9) \n" /* Fetch thread function pointer ($8 = $t0, $9 = $t1) */
|
||||
"lw $29, 40($9) \n" /* Set initial sp(=$29) */
|
||||
"sw $0, 48($9) \n" /* Clear start address */
|
||||
"jalr $8 \n" /* Start the thread */
|
||||
"nop \n"
|
||||
".set at \n"
|
||||
".set reorder \n"
|
||||
);
|
||||
thread_exit();
|
||||
|
||||
}
|
||||
#else
|
||||
void start_thread(void)
|
||||
{
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Place context pointer in $v0 slot, function pointer in $v1 slot, and
|
||||
/* Place context pointer in $s0 slot, function pointer in $s1 slot, and
|
||||
* start_thread pointer in context_start */
|
||||
#define THREAD_STARTUP_INIT(core, thread, function) \
|
||||
#define THREAD_STARTUP_INIT(core, thread, function) \
|
||||
({ (thread)->context.r[0] = (uint32_t)&(thread)->context, \
|
||||
(thread)->context.r[1] = (uint32_t)(function), \
|
||||
(thread)->context.start = (uint32_t)start_thread; })
|
||||
|
|
@ -1029,43 +1026,26 @@ void start_thread(void)
|
|||
*/
|
||||
static inline void store_context(void* addr)
|
||||
{
|
||||
#if 0
|
||||
asm volatile (
|
||||
".set noreorder \n"
|
||||
".set noat \n"
|
||||
"sw $1, (0)%0 \n"
|
||||
"sw $2,(4)%0 \n" /* $v0 */
|
||||
"sw $3,(8)%0 \n" /* $v1 */
|
||||
"sw $4,(12)%0 \n" /* $a0 */
|
||||
"sw $5,(16)%0 \n" /* $a1 */
|
||||
"sw $6,(20)%0 \n" /* $a2 */
|
||||
"sw $7,(24)%0 \n" /* $a3 */
|
||||
"sw $8,(28)%0 \n" /* $t0 */
|
||||
"sw $9,(32)%0 \n" /* $t1 */
|
||||
"sw $10,(36)%0 \n" /* $t2 */
|
||||
"sw $11,(40)%0 \n" /* $t3 */
|
||||
"sw $12,(44)%0 \n" /* $t4 */
|
||||
"sw $13,(48)%0 \n" /* $t5 */
|
||||
"sw $14,(52)%0 \n" /* $t6 */
|
||||
"sw $15,(56)%0 \n" /* $t7 */
|
||||
"sw $24,(60)%0 \n" /* $t8 */
|
||||
"sw $25,(64)%0 \n" /* $t9 */
|
||||
"sw $16,(68)%0 \n" /* $s0 */
|
||||
"sw $17,(72)%0 \n" /* $s1 */
|
||||
"sw $18,(76)%0 \n" /* $s2 */
|
||||
"sw $19,(80)%0 \n" /* $s3 */
|
||||
"sw $20,(84)%0 \n" /* $s4 */
|
||||
"sw $21,(88)%0 \n" /* $s5 */
|
||||
"sw $22,(92)%0 \n" /* $s6 */
|
||||
"sw $23,(96)%0 \n" /* $s7 */
|
||||
"sw $28,(100)%0 \n" /* gp */
|
||||
"sw $30,(104)%0 \n" /* fp */
|
||||
"sw $29,(108)%0 \n" /* sp */
|
||||
"sw $31,(112)%0 \n" /* ra */
|
||||
".set reorder \n"
|
||||
: : "r" (addr)
|
||||
".set noreorder \n"
|
||||
".set noat \n"
|
||||
"move $8, %0 \n"
|
||||
"sw $16, 0($8) \n" /* $s0 */
|
||||
"sw $17, 4($8) \n" /* $s1 */
|
||||
"sw $18, 8($8) \n" /* $s2 */
|
||||
"sw $19, 12($8) \n" /* $s3 */
|
||||
"sw $20, 16($8) \n" /* $s4 */
|
||||
"sw $21, 20($8) \n" /* $s5 */
|
||||
"sw $22, 24($8) \n" /* $s6 */
|
||||
"sw $23, 28($8) \n" /* $s7 */
|
||||
"sw $28, 32($8) \n" /* gp */
|
||||
"sw $30, 36($8) \n" /* fp */
|
||||
"sw $29, 40($8) \n" /* sp */
|
||||
"sw $31, 44($8) \n" /* ra */
|
||||
".set at \n"
|
||||
".set reorder \n"
|
||||
: : "r" (addr) : "t0"
|
||||
);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
|
|
@ -1074,48 +1054,33 @@ static inline void store_context(void* addr)
|
|||
*/
|
||||
static inline void load_context(const void* addr)
|
||||
{
|
||||
#if 0
|
||||
asm volatile (
|
||||
".set noat \n"
|
||||
".set noreorder \n"
|
||||
"lw $8, 116(%0) \n" /* Get start address ($8 = $t0) */
|
||||
//"tst r0, r0 \n"
|
||||
"j .running \n" /* NULL -> already running */
|
||||
"jr $8 \n" /* $t0 = $8 = context */
|
||||
".running: \n"
|
||||
"lw $1, (0)%0 \n"
|
||||
"lw $2,(4)%0 \n" /* $v0 */
|
||||
"lw $3,(8)%0 \n" /* $v1 */
|
||||
"lw $4,(12)%0 \n" /* $a0 */
|
||||
"lw $5,(16)%0 \n" /* $a1 */
|
||||
"lw $6,(20)%0 \n" /* $a2 */
|
||||
"lw $7,(24)%0 \n" /* $a3 */
|
||||
"lw $8,(28)%0 \n" /* $t0 */
|
||||
"lw $9,(32)%0 \n" /* $t1 */
|
||||
"lw $10,(36)%0 \n" /* $t2 */
|
||||
"lw $11,(40)%0 \n" /* $t3 */
|
||||
"lw $12,(44)%0 \n" /* $t4 */
|
||||
"lw $13,(48)%0 \n" /* $t5 */
|
||||
"lw $14,(52)%0 \n" /* $t6 */
|
||||
"lw $15,(56)%0 \n" /* $t7 */
|
||||
"lw $24,(60)%0 \n" /* $t8 */
|
||||
"lw $25,(64)%0 \n" /* $t9 */
|
||||
"lw $16,(68)%0 \n" /* $s0 */
|
||||
"lw $17,(72)%0 \n" /* $s1 */
|
||||
"lw $18,(76)%0 \n" /* $s2 */
|
||||
"lw $19,(80)%0 \n" /* $s3 */
|
||||
"lw $20,(84)%0 \n" /* $s4 */
|
||||
"lw $21,(88)%0 \n" /* $s5 */
|
||||
"lw $22,(92)%0 \n" /* $s6 */
|
||||
"lw $23,(96)%0 \n" /* $s7 */
|
||||
"lw $28,(100)%0 \n" /* gp */
|
||||
"lw $30,(104)%0 \n" /* fp */
|
||||
"lw $29,(108)%0 \n" /* sp */
|
||||
"lw $31,(112)%0 \n" /* ra */
|
||||
".set reorder \n"
|
||||
: : "r" (addr) : "v0" /* only! */
|
||||
".set noat \n"
|
||||
".set noreorder \n"
|
||||
"lw $8, 48(%0) \n" /* Get start address ($8 = $t0) */
|
||||
"beqz $8, running \n" /* NULL -> already running */
|
||||
"nop \n"
|
||||
"move $9, %0 \n" /* $t1 = context */
|
||||
"jr $8 \n"
|
||||
"nop \n"
|
||||
"running: \n"
|
||||
"move $8, %0 \n"
|
||||
"lw $16, 0($8) \n" /* $s0 */
|
||||
"lw $17, 4($8) \n" /* $s1 */
|
||||
"lw $18, 8($8) \n" /* $s2 */
|
||||
"lw $19, 12($8) \n" /* $s3 */
|
||||
"lw $20, 16($8) \n" /* $s4 */
|
||||
"lw $21, 20($8) \n" /* $s5 */
|
||||
"lw $22, 24($8) \n" /* $s6 */
|
||||
"lw $23, 28($8) \n" /* $s7 */
|
||||
"lw $28, 32($8) \n" /* gp */
|
||||
"lw $30, 36($8) \n" /* fp */
|
||||
"lw $29, 40($8) \n" /* sp */
|
||||
"lw $31, 44($8) \n" /* ra */
|
||||
".set at \n"
|
||||
".set reorder \n"
|
||||
: : "r" (addr) : "t0" /* only! */
|
||||
);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
|
|
@ -1124,26 +1089,27 @@ static inline void load_context(const void* addr)
|
|||
*/
|
||||
static inline void core_sleep(void)
|
||||
{
|
||||
/*
|
||||
#if 0
|
||||
#if CONFIG_CPU == JZ4732
|
||||
REG_CPM_LCR &= ~CPM_LCR_LPM_MASK;
|
||||
REG_CPM_LCR |= CPM_LCR_LPM_SLEEP;
|
||||
*/
|
||||
#if 0
|
||||
asm volatile(".set mips32 \n"
|
||||
"mfc0 t0, 12 \n"
|
||||
"move t1, t0 \n"
|
||||
"ori t0, t0, 0x8000000 \n" /* Enable reduced power mode */
|
||||
"mtc0 t0, 12 \n"
|
||||
#endif
|
||||
asm volatile(".set mips32r2 \n"
|
||||
"mfc0 $8, $12 \n" /* mfc $t0, $12 */
|
||||
"move $9, $8 \n" /* move $t1, $t0 */
|
||||
"la $10, 0x8000000 \n" /* la $t2, 0x8000000 */
|
||||
"or $8, $8, $10 \n" /* Enable reduced power mode */
|
||||
"mtc0 $8, $12 \n"
|
||||
"wait \n"
|
||||
"mtc0 t1, 12 \n"
|
||||
"mtc0 $9, $12 \n"
|
||||
".set mips0 \n"
|
||||
::: "t0", "t1"
|
||||
::: "t0", "t1", "t2"
|
||||
);
|
||||
#endif
|
||||
/*
|
||||
#if CONFIG_CPU == JZ4732
|
||||
REG_CPM_LCR &= ~CPM_LCR_LPM_MASK;
|
||||
REG_CPM_LCR |= CPM_LCR_LPM_IDLE;
|
||||
*/
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2071,7 +2037,6 @@ static inline void block_thread_on_l(struct thread_entry *thread,
|
|||
*/
|
||||
void switch_thread(void)
|
||||
{
|
||||
#ifndef ONDA_VX747
|
||||
|
||||
const unsigned int core = CURRENT_CORE;
|
||||
struct thread_entry *block = cores[core].block_task;
|
||||
|
|
@ -2208,7 +2173,6 @@ void switch_thread(void)
|
|||
profile_thread_started(thread - threads);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue