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

2000-10-18 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* cpu_asm.S, rtems/score/cpu.h: Modified to better support
	multilibing.  These changes result in the code being able to
	compile with the default gcc settings.  It is not functional
	in this configuration but does compile.
This commit is contained in:
Joel Sherrill
2000-10-18 12:58:29 +00:00
parent 38e5a9f021
commit 54ba5aaad6
6 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/exec/score/cpu/h8300/ChangeLog
View File

@@ -1,3 +1,10 @@
2000-10-18 Joel Sherrill <joel@OARcorp.com>
* cpu_asm.S, rtems/score/cpu.h: Modified to better support
multilibing. These changes result in the code being able to
compile with the default gcc settings. It is not functional
in this configuration but does compile.
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Include compile.am. * Makefile.am: Include compile.am.

12
c/src/exec/score/cpu/h8300/cpu_asm.S
View File

@@ -48,6 +48,7 @@
__CPU_Context_switch: __CPU_Context_switch:
/* Save Context */ /* Save Context */
#if defined(__H8300H__) || defined(__H8300S__)
stc.w ccr,@(0:16,er0) stc.w ccr,@(0:16,er0)
mov.l er7,@(2:16,er0) mov.l er7,@(2:16,er0)
mov.l er6,@(6:16,er0) mov.l er6,@(6:16,er0)
@@ -66,6 +67,7 @@ restore:
mov.l @(6:16,er1),er6 mov.l @(6:16,er1),er6
mov.l @(2:16,er1),er7 mov.l @(2:16,er1),er7
ldc.w @(0:16,er1),ccr ldc.w @(0:16,er1),ccr
#endif
rts rts
@@ -75,8 +77,10 @@ restore:
__CPU_Context_restore: __CPU_Context_restore:
Mov.l er0,er1 #if defined(__H8300H__) || defined(__H8300S__)
mov.l er0,er1
jmp @restore:24 jmp @restore:24
#endif
@@ -96,6 +100,7 @@ __CPU_Context_restore:
__ISR_Handler: __ISR_Handler:
#if defined(__H8300H__) || defined(__H8300S__)
mov.l er1,@-er7 mov.l er1,@-er7
mov.l er2,@-er7 mov.l er2,@-er7
mov.l er3,@-er7 mov.l er3,@-er7
@@ -176,6 +181,7 @@ exit:
mov @er7+,er2 mov @er7+,er2
mov @er7+,er1 mov @er7+,er1
mov @er7+,er0 mov @er7+,er0
#endif
rte rte
/* /*
@@ -191,7 +197,8 @@ exit:
_ISR_Dispatch: _ISR_Dispatch:
Jsr @__Thread_Dispatch #if defined(__H8300H__) || defined(__H8300S__)
jsr @__Thread_Dispatch
mov @er7+,er6 mov @er7+,er6
mov @er7+,er5 mov @er7+,er5
mov @er7+,er4 mov @er7+,er4
@@ -199,6 +206,7 @@ _ISR_Dispatch:
mov @er7+,er2 mov @er7+,er2
mov @er7+,er1 mov @er7+,er1
mov @er7+,er0 mov @er7+,er0
#endif
rte rte

27
c/src/exec/score/cpu/h8300/rtems/score/cpu.h
View File

@@ -649,7 +649,7 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
/* end of ISR handler macros */ /* end of ISR handler macros */
#else #else /* modern gcc version */
/* /*
* Disable all interrupts for an RTEMS critical section. The previous * Disable all interrupts for an RTEMS critical section. The previous
@@ -660,10 +660,7 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
* XXX * XXX
*/ */
#if defined(__H8300__) #if defined(__H8300H__) || defined(__H8300S__)
#define _CPU_ISR_Disable( _isr_cookie )
asm volatile( "orc #0x80,ccr " );
#else
#define _CPU_ISR_Disable( _isr_cookie ) \ #define _CPU_ISR_Disable( _isr_cookie ) \
do { \ do { \
unsigned char __ccr; \ unsigned char __ccr; \
@@ -671,6 +668,8 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
: "=m" (__ccr) : "0" (__ccr) ); \ : "=m" (__ccr) : "0" (__ccr) ); \
(_isr_cookie) = __ccr; \ (_isr_cookie) = __ccr; \
} while (0) } while (0)
#else
#define _CPU_ISR_Disable( _isr_cookie ) (_isr_cookie) = 0
#endif #endif
@@ -684,15 +683,14 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
* XXX * XXX
*/ */
#if defined(__H8300__) #if defined(__H8300H__) || defined(__H8300S__)
#define _CPU_ISR_Enable( _isr_cookie ) \
asm(" andc #0x7f,ccr \n")
#else
#define _CPU_ISR_Enable( _isr_cookie ) \ #define _CPU_ISR_Enable( _isr_cookie ) \
do { \ do { \
unsigned char __ccr = (unsigned char) (_isr_cookie); \ unsigned char __ccr = (unsigned char) (_isr_cookie); \
asm volatile( "ldc %0, ccr" : : "m" (__ccr) ); \ asm volatile( "ldc %0, ccr" : : "m" (__ccr) ); \
} while (0) } while (0)
#else
#define _CPU_ISR_Enable( _isr_cookie )
#endif #endif
/* /*
@@ -706,15 +704,14 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
* XXX * XXX
*/ */
#if defined(__H8300__) #if defined(__H8300H__) || defined(__H8300S__)
#define _CPU_ISR_Enable( _isr_cookie ) \
asm( "andc #0x7f,ccr \n orc #0x80,ccr\n" )
#else
#define _CPU_ISR_Flash( _isr_cookie ) \ #define _CPU_ISR_Flash( _isr_cookie ) \
do { \ do { \
unsigned char __ccr = (unsigned char) (_isr_cookie); \ unsigned char __ccr = (unsigned char) (_isr_cookie); \
asm volatile( "ldc %0, ccr ; orc #0x80,ccr " : : "m" (__ccr) ); \ asm volatile( "ldc %0, ccr ; orc #0x80,ccr " : : "m" (__ccr) ); \
} while (0) } while (0)
#else
#define _CPU_ISR_Flash( _isr_cookie )
#endif #endif
#endif /* end of old gcc */ #endif /* end of old gcc */
@@ -1151,8 +1148,8 @@ void _CPU_Context_restore_fp(
* XXX * XXX
*/ */
static inline unsigned int CPU_swap_u32( static inline unsigned32 CPU_swap_u32(
unsigned int value unsigned32 value
) )
{ {
unsigned32 byte1, byte2, byte3, byte4, swapped; unsigned32 byte1, byte2, byte3, byte4, swapped;

7
cpukit/score/cpu/h8300/ChangeLog
View File

@@ -1,3 +1,10 @@
2000-10-18 Joel Sherrill <joel@OARcorp.com>
* cpu_asm.S, rtems/score/cpu.h: Modified to better support
multilibing. These changes result in the code being able to
compile with the default gcc settings. It is not functional
in this configuration but does compile.
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Include compile.am. * Makefile.am: Include compile.am.

12
cpukit/score/cpu/h8300/cpu_asm.S
View File

@@ -48,6 +48,7 @@
__CPU_Context_switch: __CPU_Context_switch:
/* Save Context */ /* Save Context */
#if defined(__H8300H__) || defined(__H8300S__)
stc.w ccr,@(0:16,er0) stc.w ccr,@(0:16,er0)
mov.l er7,@(2:16,er0) mov.l er7,@(2:16,er0)
mov.l er6,@(6:16,er0) mov.l er6,@(6:16,er0)
@@ -66,6 +67,7 @@ restore:
mov.l @(6:16,er1),er6 mov.l @(6:16,er1),er6
mov.l @(2:16,er1),er7 mov.l @(2:16,er1),er7
ldc.w @(0:16,er1),ccr ldc.w @(0:16,er1),ccr
#endif
rts rts
@@ -75,8 +77,10 @@ restore:
__CPU_Context_restore: __CPU_Context_restore:
Mov.l er0,er1 #if defined(__H8300H__) || defined(__H8300S__)
mov.l er0,er1
jmp @restore:24 jmp @restore:24
#endif
@@ -96,6 +100,7 @@ __CPU_Context_restore:
__ISR_Handler: __ISR_Handler:
#if defined(__H8300H__) || defined(__H8300S__)
mov.l er1,@-er7 mov.l er1,@-er7
mov.l er2,@-er7 mov.l er2,@-er7
mov.l er3,@-er7 mov.l er3,@-er7
@@ -176,6 +181,7 @@ exit:
mov @er7+,er2 mov @er7+,er2
mov @er7+,er1 mov @er7+,er1
mov @er7+,er0 mov @er7+,er0
#endif
rte rte
/* /*
@@ -191,7 +197,8 @@ exit:
_ISR_Dispatch: _ISR_Dispatch:
Jsr @__Thread_Dispatch #if defined(__H8300H__) || defined(__H8300S__)
jsr @__Thread_Dispatch
mov @er7+,er6 mov @er7+,er6
mov @er7+,er5 mov @er7+,er5
mov @er7+,er4 mov @er7+,er4
@@ -199,6 +206,7 @@ _ISR_Dispatch:
mov @er7+,er2 mov @er7+,er2
mov @er7+,er1 mov @er7+,er1
mov @er7+,er0 mov @er7+,er0
#endif
rte rte

27
cpukit/score/cpu/h8300/rtems/score/cpu.h
View File

@@ -649,7 +649,7 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
/* end of ISR handler macros */ /* end of ISR handler macros */
#else #else /* modern gcc version */
/* /*
* Disable all interrupts for an RTEMS critical section. The previous * Disable all interrupts for an RTEMS critical section. The previous
@@ -660,10 +660,7 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
* XXX * XXX
*/ */
#if defined(__H8300__) #if defined(__H8300H__) || defined(__H8300S__)
#define _CPU_ISR_Disable( _isr_cookie )
asm volatile( "orc #0x80,ccr " );
#else
#define _CPU_ISR_Disable( _isr_cookie ) \ #define _CPU_ISR_Disable( _isr_cookie ) \
do { \ do { \
unsigned char __ccr; \ unsigned char __ccr; \
@@ -671,6 +668,8 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
: "=m" (__ccr) : "0" (__ccr) ); \ : "=m" (__ccr) : "0" (__ccr) ); \
(_isr_cookie) = __ccr; \ (_isr_cookie) = __ccr; \
} while (0) } while (0)
#else
#define _CPU_ISR_Disable( _isr_cookie ) (_isr_cookie) = 0
#endif #endif
@@ -684,15 +683,14 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
* XXX * XXX
*/ */
#if defined(__H8300__) #if defined(__H8300H__) || defined(__H8300S__)
#define _CPU_ISR_Enable( _isr_cookie ) \
asm(" andc #0x7f,ccr \n")
#else
#define _CPU_ISR_Enable( _isr_cookie ) \ #define _CPU_ISR_Enable( _isr_cookie ) \
do { \ do { \
unsigned char __ccr = (unsigned char) (_isr_cookie); \ unsigned char __ccr = (unsigned char) (_isr_cookie); \
asm volatile( "ldc %0, ccr" : : "m" (__ccr) ); \ asm volatile( "ldc %0, ccr" : : "m" (__ccr) ); \
} while (0) } while (0)
#else
#define _CPU_ISR_Enable( _isr_cookie )
#endif #endif
/* /*
@@ -706,15 +704,14 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
* XXX * XXX
*/ */
#if defined(__H8300__) #if defined(__H8300H__) || defined(__H8300S__)
#define _CPU_ISR_Enable( _isr_cookie ) \
asm( "andc #0x7f,ccr \n orc #0x80,ccr\n" )
#else
#define _CPU_ISR_Flash( _isr_cookie ) \ #define _CPU_ISR_Flash( _isr_cookie ) \
do { \ do { \
unsigned char __ccr = (unsigned char) (_isr_cookie); \ unsigned char __ccr = (unsigned char) (_isr_cookie); \
asm volatile( "ldc %0, ccr ; orc #0x80,ccr " : : "m" (__ccr) ); \ asm volatile( "ldc %0, ccr ; orc #0x80,ccr " : : "m" (__ccr) ); \
} while (0) } while (0)
#else
#define _CPU_ISR_Flash( _isr_cookie )
#endif #endif
#endif /* end of old gcc */ #endif /* end of old gcc */
@@ -1151,8 +1148,8 @@ void _CPU_Context_restore_fp(
* XXX * XXX
*/ */
static inline unsigned int CPU_swap_u32( static inline unsigned32 CPU_swap_u32(
unsigned int value unsigned32 value
) )
{ {
unsigned32 byte1, byte2, byte3, byte4, swapped; unsigned32 byte1, byte2, byte3, byte4, swapped;