RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2000-12-13 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* cpu.c: Removed duplicate declaration for _ISR_Vector_table.
	* cpu_asm.S: Removed assembly language to vector ISR handler
	on MIPS ISA I.  Now call mips_vector_isr_handlers() in libcpu or BSP.
	* rtems/score/cpu.h (CPU_INTERRUPT_NUMBER_OF_VECTORS): No
	longer a constant -- get the real value from libcpu.
This commit is contained in:
Joel Sherrill
2000-12-13 22:12:06 +00:00
parent 0289674755
commit 797d88ba31
8 changed files with 32 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/exec/score/cpu/mips/ChangeLog
View File

@@ -1,3 +1,11 @@
2000-12-13 Joel Sherrill <joel@OARcorp.com>
* cpu.c: Removed duplicate declaration for _ISR_Vector_table.
* cpu_asm.S: Removed assembly language to vector ISR handler
on MIPS ISA I. Now call mips_vector_isr_handlers() in libcpu or BSP.
* rtems/score/cpu.h (CPU_INTERRUPT_NUMBER_OF_VECTORS): No
longer a constant -- get the real value from libcpu.
2000-12-13 Joel Sherrill <joel@OARcorp.com> 2000-12-13 Joel Sherrill <joel@OARcorp.com>
* cpu_asm.h: Removed. * cpu_asm.h: Removed.

2
c/src/exec/score/cpu/mips/cpu.c
View File

@@ -42,8 +42,6 @@
#include <rtems/score/wkspace.h> #include <rtems/score/wkspace.h>
ISR_Handler_entry _ISR_Vector_table[ ISR_NUMBER_OF_VECTORS ];
/* _CPU_Initialize /* _CPU_Initialize
* *
* This routine performs processor dependent initialization. * This routine performs processor dependent initialization.

84
c/src/exec/score/cpu/mips/cpu_asm.S
View File

@@ -792,8 +792,9 @@ _ISR_Handler_1:
mfc0 k1,C0_SR mfc0 k1,C0_SR
and k0,k1 and k0,k1
and k0,CAUSE_IPMASK and k0,CAUSE_IPMASK
beq k0,zero,_ISR_Handler_exit /* external interrupt not enabled, ignore */ beq k0,zero,_ISR_Handler_exit
/* but if it's not an exception or an interrupt, /* external interrupt not enabled, ignore */
/* but if it's not an exception or an interrupt, */
/* Then where did it come from??? */ /* Then where did it come from??? */
nop nop
@@ -821,85 +822,12 @@ _ISR_Handler_1:
sw t1,_Thread_Dispatch_disable_level sw t1,_Thread_Dispatch_disable_level
/* /*
* while ( interrupts_pending(cause_reg) ) { * Call the CPU model or BSP specific routine to decode the
* vector = BITFIELD_TO_INDEX(cause_reg); * interrupt source and actually vector to device ISR handlers.
* (*_ISR_Vector_table[ vector ])( vector );
* }
*/ */
/* k0 has the SR interrupt bits */
la t3, _ISR_Vector_table
/* The bits you look at can be prioritized here just by */ jal mips_vector_isr_handlers
/* changing what bit is looked at. I.E. SR_IBITx */
/* This code might become a loop, servicing all ints before returning.. */
/* Right now, it will go thru the whole list once */
_ISR_check_bit_0:
and k1, k0, SR_IBIT1
beq k1, zero, _ISR_check_bit_1
nop nop
li t1, ISR_VEC_SIZE*0
add t3, t1
jal t3
nop
_ISR_check_bit_1:
and k1, k0, SR_IBIT2
beq k1, zero, _ISR_check_bit_2
nop
li t1, ISR_VEC_SIZE*1
add t3, t1
jal t3
nop
_ISR_check_bit_2:
and k1, k0, SR_IBIT3
beq k1, zero, _ISR_check_bit_3
nop
li t1, ISR_VEC_SIZE*2
add t3, t1
jal t3
nop
_ISR_check_bit_3:
and k1, k0, SR_IBIT4
beq k1, zero, _ISR_check_bit_4
nop
li t1, ISR_VEC_SIZE*3
add t3, t1
jal t3
nop
_ISR_check_bit_4:
and k1, k0, SR_IBIT5
beq k1, zero, _ISR_check_bit_5
nop
li t1, ISR_VEC_SIZE*4
add t3, t1
jal t3
nop
_ISR_check_bit_5:
and k1, k0, SR_IBIT6
beq k1, zero, _ISR_check_bit_6
nop
li t1, ISR_VEC_SIZE*5
add t3, t1
jal t3
nop
_ISR_check_bit_6:
and k1, k0, SR_IBIT7
beq k1, zero, _ISR_check_bit_7
nop
li t1, ISR_VEC_SIZE*6
add t3, t1
jal t3
nop
_ISR_check_bit_7:
and k1, k0, SR_IBIT8
beq k1, zero, _ISR_exit_int_check
nop
li t1, ISR_VEC_SIZE*7
add t3, t1
jal t3
nop
_ISR_exit_int_check:
/* /*
* --_ISR_Nest_level; * --_ISR_Nest_level;

2
c/src/exec/score/cpu/mips/rtems/score/cpu.h
View File

@@ -526,7 +526,7 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
*/ */
extern unsigned int mips_interrupt_number_of_vectors; extern unsigned int mips_interrupt_number_of_vectors;
#define CPU_INTERRUPT_NUMBER_OF_VECTORS 8 #define CPU_INTERRUPT_NUMBER_OF_VECTORS (mips_interrupt_number_of_vectors)
#define CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER (CPU_INTERRUPT_NUMBER_OF_VECTORS - 1) #define CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER (CPU_INTERRUPT_NUMBER_OF_VECTORS - 1)
/* /*

8
cpukit/score/cpu/mips/ChangeLog
View File

@@ -1,3 +1,11 @@
2000-12-13 Joel Sherrill <joel@OARcorp.com>
* cpu.c: Removed duplicate declaration for _ISR_Vector_table.
* cpu_asm.S: Removed assembly language to vector ISR handler
on MIPS ISA I. Now call mips_vector_isr_handlers() in libcpu or BSP.
* rtems/score/cpu.h (CPU_INTERRUPT_NUMBER_OF_VECTORS): No
longer a constant -- get the real value from libcpu.
2000-12-13 Joel Sherrill <joel@OARcorp.com> 2000-12-13 Joel Sherrill <joel@OARcorp.com>
* cpu_asm.h: Removed. * cpu_asm.h: Removed.

2
cpukit/score/cpu/mips/cpu.c
View File

@@ -42,8 +42,6 @@
#include <rtems/score/wkspace.h> #include <rtems/score/wkspace.h>
ISR_Handler_entry _ISR_Vector_table[ ISR_NUMBER_OF_VECTORS ];
/* _CPU_Initialize /* _CPU_Initialize
* *
* This routine performs processor dependent initialization. * This routine performs processor dependent initialization.

84
cpukit/score/cpu/mips/cpu_asm.S
View File

@@ -792,8 +792,9 @@ _ISR_Handler_1:
mfc0 k1,C0_SR mfc0 k1,C0_SR
and k0,k1 and k0,k1
and k0,CAUSE_IPMASK and k0,CAUSE_IPMASK
beq k0,zero,_ISR_Handler_exit /* external interrupt not enabled, ignore */ beq k0,zero,_ISR_Handler_exit
/* but if it's not an exception or an interrupt, /* external interrupt not enabled, ignore */
/* but if it's not an exception or an interrupt, */
/* Then where did it come from??? */ /* Then where did it come from??? */
nop nop
@@ -821,85 +822,12 @@ _ISR_Handler_1:
sw t1,_Thread_Dispatch_disable_level sw t1,_Thread_Dispatch_disable_level
/* /*
* while ( interrupts_pending(cause_reg) ) { * Call the CPU model or BSP specific routine to decode the
* vector = BITFIELD_TO_INDEX(cause_reg); * interrupt source and actually vector to device ISR handlers.
* (*_ISR_Vector_table[ vector ])( vector );
* }
*/ */
/* k0 has the SR interrupt bits */
la t3, _ISR_Vector_table
/* The bits you look at can be prioritized here just by */ jal mips_vector_isr_handlers
/* changing what bit is looked at. I.E. SR_IBITx */
/* This code might become a loop, servicing all ints before returning.. */
/* Right now, it will go thru the whole list once */
_ISR_check_bit_0:
and k1, k0, SR_IBIT1
beq k1, zero, _ISR_check_bit_1
nop nop
li t1, ISR_VEC_SIZE*0
add t3, t1
jal t3
nop
_ISR_check_bit_1:
and k1, k0, SR_IBIT2
beq k1, zero, _ISR_check_bit_2
nop
li t1, ISR_VEC_SIZE*1
add t3, t1
jal t3
nop
_ISR_check_bit_2:
and k1, k0, SR_IBIT3
beq k1, zero, _ISR_check_bit_3
nop
li t1, ISR_VEC_SIZE*2
add t3, t1
jal t3
nop
_ISR_check_bit_3:
and k1, k0, SR_IBIT4
beq k1, zero, _ISR_check_bit_4
nop
li t1, ISR_VEC_SIZE*3
add t3, t1
jal t3
nop
_ISR_check_bit_4:
and k1, k0, SR_IBIT5
beq k1, zero, _ISR_check_bit_5
nop
li t1, ISR_VEC_SIZE*4
add t3, t1
jal t3
nop
_ISR_check_bit_5:
and k1, k0, SR_IBIT6
beq k1, zero, _ISR_check_bit_6
nop
li t1, ISR_VEC_SIZE*5
add t3, t1
jal t3
nop
_ISR_check_bit_6:
and k1, k0, SR_IBIT7
beq k1, zero, _ISR_check_bit_7
nop
li t1, ISR_VEC_SIZE*6
add t3, t1
jal t3
nop
_ISR_check_bit_7:
and k1, k0, SR_IBIT8
beq k1, zero, _ISR_exit_int_check
nop
li t1, ISR_VEC_SIZE*7
add t3, t1
jal t3
nop
_ISR_exit_int_check:
/* /*
* --_ISR_Nest_level; * --_ISR_Nest_level;

2
cpukit/score/cpu/mips/rtems/score/cpu.h
View File

@@ -526,7 +526,7 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
*/ */
extern unsigned int mips_interrupt_number_of_vectors; extern unsigned int mips_interrupt_number_of_vectors;
#define CPU_INTERRUPT_NUMBER_OF_VECTORS 8 #define CPU_INTERRUPT_NUMBER_OF_VECTORS (mips_interrupt_number_of_vectors)
#define CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER (CPU_INTERRUPT_NUMBER_OF_VECTORS - 1) #define CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER (CPU_INTERRUPT_NUMBER_OF_VECTORS - 1)
/* /*