From 4fea054ca575418a4190f0b7876c206382ccfd05 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 6 Nov 2018 19:34:15 +0100 Subject: score: Remove _ISR_Dispatch() This function was only used on some m68k variants. On these m68k variants there is no need to use a global symbol. Use a local label instead. Remove _ISR_Dispatch() from the architecture-independent layer. --- cpukit/score/cpu/m68k/cpu_asm.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cpukit/score/cpu/m68k') diff --git a/cpukit/score/cpu/m68k/cpu_asm.S b/cpukit/score/cpu/m68k/cpu_asm.S index 6ec89d8ee0..3c16e62fbc 100644 --- a/cpukit/score/cpu/m68k/cpu_asm.S +++ b/cpukit/score/cpu/m68k/cpu_asm.S @@ -324,7 +324,7 @@ bframe: #if ( M68K_HAS_SEPARATE_STACKS == 1 ) movec msp,a0 | a0 = master stack pointer movew #0,a0@- | push format word - movel #SYM(_ISR_Dispatch),a0@- | push return addr + movel #thread_dispatch,a0@- | push return addr movew a0@(6),a0@- | push saved sr movec a0,msp | set master stack pointer #else @@ -344,8 +344,8 @@ exit: moveml a7@,d0-d1/a0-a1 | restore d0-d1,a0-a1 rte | return to thread | OR _Isr_dispatch -/*void _ISR_Dispatch() - * +#if ( M68K_HAS_SEPARATE_STACKS == 1 ) +/* * Entry point from the outermost interrupt service routine exit. * The current stack is the supervisor mode stack if this processor * has separate stacks. @@ -357,8 +357,7 @@ exit: moveml a7@,d0-d1/a0-a1 | restore d0-d1,a0-a1 * 4. return from interrupt */ - .global SYM (_ISR_Dispatch) -SYM (_ISR_Dispatch): +thread_dispatch: #if ( !defined(__mcoldfire__) ) movml d0-d1/a0-a1,a7@- jsr SYM (_Thread_Dispatch) @@ -375,3 +374,4 @@ SYM (_ISR_Dispatch): addql #2,a7 | pop format/id #endif /* M68K_HAS_VBR */ rte +#endif /* M68K_HAS_SEPARATE_STACKS */ -- cgit v1.2.3