diff options
10 files changed, 18 insertions, 30 deletions
diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog b/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog index f2a1579998..a93cca2d31 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog @@ -1,3 +1,8 @@ +2005-02-09 Ralf Corsepius <ralf.corsepius@rtems.org> + + * cpu.c, cpu_asm.S, irq_stub.S, rtems/score/ppc_offs.h: + Remove PPC_ABI_GCC27. + 2005-01-07 Ralf Corsepius <ralf.corsepius@rtems.org> * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V. diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c index 9692c5ee92..365bfc974f 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c @@ -65,12 +65,10 @@ void _CPU_Initialize( #endif #if (PPC_ABI != PPC_ABI_POWEROPEN) register uint32_t r2 = 0; -#if (PPC_ABI != PPC_ABI_GCC27) register uint32_t r13 = 0; asm ("mr %0,13" : "=r" ((r13)) : "0" ((r13))); _CPU_IRQ_info.Default_r13 = r13; -#endif asm ("mr %0,2" : "=r" ((r2)) : "0" ((r2))); _CPU_IRQ_info.Default_r2 = r2; @@ -356,7 +354,7 @@ void _CPU_ISR_install_vector( void _CPU_Install_interrupt_stack( void ) { -#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_ABI == PPC_ABI_POWEROPEN) _CPU_IRQ_info.Stack = _CPU_Interrupt_stack_high - 56; #else _CPU_IRQ_info.Stack = _CPU_Interrupt_stack_high - 8; @@ -412,7 +410,7 @@ void _CPU_Fatal_error(uint32_t _error) const CPU_Trap_table_entry _CPU_Trap_slot_template = { -#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_ABI == PPC_ABI_POWEROPEN) #error " Vector install not tested." #if (PPC_HAS_FPU) #error " Vector install not tested." diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu_asm.S b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu_asm.S index 7b578bafca..d3be508d8c 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu_asm.S +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu_asm.S @@ -570,7 +570,7 @@ PROC (_CPU_Context_restore): blr /* Individual interrupt prologues look like this: - * #if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) + * #if (PPC_ABI == PPC_ABI_POWEROPEN) * #if (PPC_HAS_FPU) * stwu r1, -(20*4 + 18*8 + IP_END)(r1) * #else diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/irq_stub.S b/c/src/lib/libbsp/powerpc/support/old_exception_processing/irq_stub.S index 6a0dd00342..b4e869ae35 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/irq_stub.S +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/irq_stub.S @@ -134,11 +134,6 @@ LABEL (nested): mtlr r6 lwz r11,8(r4) #endif -#if (PPC_ABI == PPC_ABI_GCC27) - lwz r2, Default_r2(r11) - mtlr r4 - #lwz r2, 0(r2) -#endif #if (PPC_ABI == PPC_ABI_SVR4 || PPC_ABI == PPC_ABI_EABI) mtlr r4 lwz r2, Default_r2(r11) diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/ppc_offs.h b/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/ppc_offs.h index 05a4fddb8f..21959fc29a 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/ppc_offs.h +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/ppc_offs.h @@ -106,7 +106,7 @@ #endif .set IP_LINK, 0 -#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_ABI == PPC_ABI_POWEROPEN) .set IP_0, (IP_LINK + 56) #else .set IP_0, (IP_LINK + 8) @@ -153,12 +153,8 @@ .set Switch_necessary, 20 #else .set Default_r2, 16 -#if (PPC_ABI != PPC_ABI_GCC27) .set Default_r13, 20 .set Switch_necessary, 24 -#else - .set Switch_necessary, 20 -#endif #endif .set Signal, Switch_necessary + 4 .set msr_initial, Signal + 4 diff --git a/c/src/lib/libcpu/powerpc/old-exceptions/ChangeLog b/c/src/lib/libcpu/powerpc/old-exceptions/ChangeLog index f2a1579998..a93cca2d31 100644 --- a/c/src/lib/libcpu/powerpc/old-exceptions/ChangeLog +++ b/c/src/lib/libcpu/powerpc/old-exceptions/ChangeLog @@ -1,3 +1,8 @@ +2005-02-09 Ralf Corsepius <ralf.corsepius@rtems.org> + + * cpu.c, cpu_asm.S, irq_stub.S, rtems/score/ppc_offs.h: + Remove PPC_ABI_GCC27. + 2005-01-07 Ralf Corsepius <ralf.corsepius@rtems.org> * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V. diff --git a/c/src/lib/libcpu/powerpc/old-exceptions/cpu.c b/c/src/lib/libcpu/powerpc/old-exceptions/cpu.c index 9692c5ee92..365bfc974f 100644 --- a/c/src/lib/libcpu/powerpc/old-exceptions/cpu.c +++ b/c/src/lib/libcpu/powerpc/old-exceptions/cpu.c @@ -65,12 +65,10 @@ void _CPU_Initialize( #endif #if (PPC_ABI != PPC_ABI_POWEROPEN) register uint32_t r2 = 0; -#if (PPC_ABI != PPC_ABI_GCC27) register uint32_t r13 = 0; asm ("mr %0,13" : "=r" ((r13)) : "0" ((r13))); _CPU_IRQ_info.Default_r13 = r13; -#endif asm ("mr %0,2" : "=r" ((r2)) : "0" ((r2))); _CPU_IRQ_info.Default_r2 = r2; @@ -356,7 +354,7 @@ void _CPU_ISR_install_vector( void _CPU_Install_interrupt_stack( void ) { -#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_ABI == PPC_ABI_POWEROPEN) _CPU_IRQ_info.Stack = _CPU_Interrupt_stack_high - 56; #else _CPU_IRQ_info.Stack = _CPU_Interrupt_stack_high - 8; @@ -412,7 +410,7 @@ void _CPU_Fatal_error(uint32_t _error) const CPU_Trap_table_entry _CPU_Trap_slot_template = { -#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_ABI == PPC_ABI_POWEROPEN) #error " Vector install not tested." #if (PPC_HAS_FPU) #error " Vector install not tested." diff --git a/c/src/lib/libcpu/powerpc/old-exceptions/cpu_asm.S b/c/src/lib/libcpu/powerpc/old-exceptions/cpu_asm.S index 7b578bafca..d3be508d8c 100644 --- a/c/src/lib/libcpu/powerpc/old-exceptions/cpu_asm.S +++ b/c/src/lib/libcpu/powerpc/old-exceptions/cpu_asm.S @@ -570,7 +570,7 @@ PROC (_CPU_Context_restore): blr /* Individual interrupt prologues look like this: - * #if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) + * #if (PPC_ABI == PPC_ABI_POWEROPEN) * #if (PPC_HAS_FPU) * stwu r1, -(20*4 + 18*8 + IP_END)(r1) * #else diff --git a/c/src/lib/libcpu/powerpc/old-exceptions/irq_stub.S b/c/src/lib/libcpu/powerpc/old-exceptions/irq_stub.S index 6a0dd00342..b4e869ae35 100644 --- a/c/src/lib/libcpu/powerpc/old-exceptions/irq_stub.S +++ b/c/src/lib/libcpu/powerpc/old-exceptions/irq_stub.S @@ -134,11 +134,6 @@ LABEL (nested): mtlr r6 lwz r11,8(r4) #endif -#if (PPC_ABI == PPC_ABI_GCC27) - lwz r2, Default_r2(r11) - mtlr r4 - #lwz r2, 0(r2) -#endif #if (PPC_ABI == PPC_ABI_SVR4 || PPC_ABI == PPC_ABI_EABI) mtlr r4 lwz r2, Default_r2(r11) diff --git a/c/src/lib/libcpu/powerpc/old-exceptions/rtems/score/ppc_offs.h b/c/src/lib/libcpu/powerpc/old-exceptions/rtems/score/ppc_offs.h index 05a4fddb8f..21959fc29a 100644 --- a/c/src/lib/libcpu/powerpc/old-exceptions/rtems/score/ppc_offs.h +++ b/c/src/lib/libcpu/powerpc/old-exceptions/rtems/score/ppc_offs.h @@ -106,7 +106,7 @@ #endif .set IP_LINK, 0 -#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_ABI == PPC_ABI_POWEROPEN) .set IP_0, (IP_LINK + 56) #else .set IP_0, (IP_LINK + 8) @@ -153,12 +153,8 @@ .set Switch_necessary, 20 #else .set Default_r2, 16 -#if (PPC_ABI != PPC_ABI_GCC27) .set Default_r13, 20 .set Switch_necessary, 24 -#else - .set Switch_necessary, 20 -#endif #endif .set Signal, Switch_necessary + 4 .set msr_initial, Signal + 4 |