diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 09:24:09 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 09:24:09 +0000 |
| commit | 3631c234d87298206aa416ead3e4001342233f78 (patch) | |
| tree | 169585d83c55d911a00363b3e2ceed9e986ecffa /cpukit | |
| parent | 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-3631c234d87298206aa416ead3e4001342233f78.tar.bz2 | |
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* rtems/powerpc/registers.h, rtems/score/cpu.h:
Use "__asm__" instead of "asm" for improved c99-compliance.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/score/cpu/powerpc/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/powerpc/rtems/powerpc/registers.h | 14 | ||||
| -rw-r--r-- | cpukit/score/cpu/powerpc/rtems/score/cpu.h | 4 |
3 files changed, 14 insertions, 9 deletions
diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index eea0cec15e..219fb10143 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> + + * rtems/powerpc/registers.h, rtems/score/cpu.h: + Use "__asm__" instead of "asm" for improved c99-compliance. + 2011-01-31 Sebastian Huber <sebastian.huber@embedded-brains.de> * rtems/powerpc/registers.h: Changed Freescale EIS prefix. More diff --git a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h b/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h index 3c8779029d..d49a6e91cc 100644 --- a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h +++ b/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h @@ -424,15 +424,15 @@ extern "C" { #define _CPU_MSR_GET( _msr_value ) \ do { \ _msr_value = 0; \ - asm volatile ("mfmsr %0" : "=&r" ((_msr_value)) : "0" ((_msr_value))); \ + __asm__ volatile ("mfmsr %0" : "=&r" ((_msr_value)) : "0" ((_msr_value))); \ } while (0) #define _CPU_MSR_SET( _msr_value ) \ -{ asm volatile ("mtmsr %0" : "=&r" ((_msr_value)) : "0" ((_msr_value))); } +{ __asm__ volatile ("mtmsr %0" : "=&r" ((_msr_value)) : "0" ((_msr_value))); } static inline void ppc_interrupt_set_disable_mask( uint32_t mask ) { - asm volatile ( + __asm__ volatile ( "mtspr 272, %0" : : "r" (mask) @@ -443,7 +443,7 @@ static inline uint32_t ppc_interrupt_get_disable_mask( void ) { uint32_t mask; - asm volatile ( + __asm__ volatile ( "mfspr %0, 272" : "=r" (mask) ); @@ -456,7 +456,7 @@ static inline uint32_t ppc_interrupt_disable( void ) uint32_t level; uint32_t mask; - asm volatile ( + __asm__ volatile ( "mfmsr %0;" "mfspr %1, 272;" "andc %1, %0, %1;" @@ -469,7 +469,7 @@ static inline uint32_t ppc_interrupt_disable( void ) static inline void ppc_interrupt_enable( uint32_t level ) { - asm volatile ( + __asm__ volatile ( "mtmsr %0" : : "r" (level) @@ -480,7 +480,7 @@ static inline void ppc_interrupt_flash( uint32_t level ) { uint32_t current_level; - asm volatile ( + __asm__ volatile ( "mfmsr %0;" "mtmsr %1;" "mtmsr %0" diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/rtems/score/cpu.h index 9e15553092..b076f7e87d 100644 --- a/cpukit/score/cpu/powerpc/rtems/score/cpu.h +++ b/cpukit/score/cpu/powerpc/rtems/score/cpu.h @@ -666,7 +666,7 @@ static inline uint32_t CPU_swap_u32( { uint32_t swapped; - asm volatile("rlwimi %0,%1,8,24,31;" + __asm__ volatile("rlwimi %0,%1,8,24,31;" "rlwimi %0,%1,24,16,23;" "rlwimi %0,%1,8,8,15;" "rlwimi %0,%1,24,0,7;" : @@ -817,7 +817,7 @@ void _CPU_Context_Initialize( #define _CPU_Bitfield_Find_first_bit( _value, _output ) \ { \ - asm volatile ("cntlzw %0, %1" : "=r" ((_output)), "=r" ((_value)) : \ + __asm__ volatile ("cntlzw %0, %1" : "=r" ((_output)), "=r" ((_value)) : \ "1" ((_value))); \ } |