2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>

	* cpu.c, rtems/score/cpu.h, rtems/score/m68k.h:
	Use "__asm__" instead of "asm" for improved c99-compliance.

4 files changed, 30 insertions, 25 deletions

diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index aab814d95e..3122dfd030 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* cpu.c, rtems/score/cpu.h, rtems/score/m68k.h:
+	Use "__asm__" instead of "asm" for improved c99-compliance.
+
 2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
 
 	PR 1635/cpukit
diff --git a/cpukit/score/cpu/m68k/cpu.c b/cpukit/score/cpu/m68k/cpu.c
index 160151ed66..036ca64ea2 100644
--- a/cpukit/score/cpu/m68k/cpu.c
+++ b/cpukit/score/cpu/m68k/cpu.c
@@ -156,7 +156,7 @@ void _CPU_Install_interrupt_stack( void )
 #if ( M68K_HAS_SEPARATE_STACKS == 1 )
   void *isp = _CPU_Interrupt_stack_high;
 
-  asm volatile ( "movec %0,%%isp" : "=r" (isp) : "0" (isp) );
+  __asm__ volatile ( "movec %0,%%isp" : "=r" (isp) : "0" (isp) );
 #endif
 }
 
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h
index e94034225c..8aa06de412 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h
@@ -485,7 +485,7 @@ void *_CPU_Thread_Idle_body( uintptr_t ignored );
 
 #if ( defined(__mcoldfire__) )
 #define _CPU_Fatal_halt( _error ) \
-  { asm volatile( "move.w %%sr,%%d0\n\t" \
+  { __asm__ volatile( "move.w %%sr,%%d0\n\t" \
 		  "or.l %2,%%d0\n\t" \
 		  "move.w %%d0,%%sr\n\t" \
 		  "move.l %1,%%d0\n\t" \
@@ -497,7 +497,7 @@ void *_CPU_Thread_Idle_body( uintptr_t ignored );
   }
 #else
 #define _CPU_Fatal_halt( _error ) \
-  { asm volatile( "movl  %0,%%d0; " \
+  { __asm__ volatile( "movl  %0,%%d0; " \
                   "orw   #0x0700,%%sr; " \
                   "stop  #0x2700" : "=d" ((_error)) : "0" ((_error)) ); \
   }
@@ -532,12 +532,12 @@ extern const unsigned char _CPU_m68k_BFFFO_table[256];
 #if ( M68K_HAS_BFFFO == 1 )
 
 #define _CPU_Bitfield_Find_first_bit( _value, _output ) \
-  asm volatile( "bfffo (%1),#0,#16,%0" : "=d" (_output) : "a" (&_value));
+  __asm__ volatile( "bfffo (%1),#0,#16,%0" : "=d" (_output) : "a" (&_value));
 
 #elif ( __mcfisaaplus__ )
   /* This is simplified by the fact that RTEMS never calls it with _value=0 */
 #define _CPU_Bitfield_Find_first_bit( _value, _output ) \
-    asm volatile ( \
+    __asm__ volatile ( \
        "   swap     %0\n"        \
        "   ff1.l    %0\n"        \
        : "=d" ((_output))        \
@@ -554,7 +554,7 @@ extern const unsigned char _CPU_m68k_BFFFO_table[256];
   { \
     register int dumby; \
     \
-    asm volatile ( \
+    __asm__ volatile ( \
        "   clr.l   %1\n"         \
        "   move.w  %2,%1\n"      \
        "   lsr.l   #8,%1\n"      \
@@ -574,7 +574,7 @@ extern const unsigned char _CPU_m68k_BFFFO_table[256];
   { \
     register int dumby; \
     \
-    asm volatile ( "   move.w  %2,%1\n"        \
+    __asm__ volatile ( "   move.w  %2,%1\n"        \
        "   lsr.w   #8,%1\n"        \
        "   beq.s   1f\n"           \
        "   move.b  (%3,%1.w),%0\n" \
@@ -592,7 +592,7 @@ extern const unsigned char _CPU_m68k_BFFFO_table[256];
   { \
     register int dumby; \
     \
-    asm volatile ( "   move.w  %2,%1\n"        \
+    __asm__ volatile ( "   move.w  %2,%1\n"        \
        "   lsr.w   #8,%1\n"        \
        "   beq.s   1f\n"           \
        "   move.b  (%3,%1.w),%0\n" \
diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/rtems/score/m68k.h
index 17af5fd92c..88c214a992 100644
--- a/cpukit/score/cpu/m68k/rtems/score/m68k.h
+++ b/cpukit/score/cpu/m68k/rtems/score/m68k.h
@@ -335,7 +335,7 @@ extern "C" {
 #if ( defined(__mcoldfire__) )
 #define m68k_disable_interrupts( _level ) \
    do { register uint32_t   _tmpsr = 0x0700; \
-        asm volatile ( "move.w %%sr,%0\n\t" \
+        __asm__ volatile ( "move.w %%sr,%0\n\t" \
  		       "or.l   %0,%1\n\t" \
  		       "move.w %1,%%sr" \
  		       : "=d" (_level), "=d"(_tmpsr) : "1"(_tmpsr) \
@@ -343,14 +343,14 @@ extern "C" {
    } while( 0 )
 #else
 #define m68k_disable_interrupts( _level ) \
-  asm volatile ( "move.w  %%sr,%0\n\t" \
+  __asm__ volatile ( "move.w  %%sr,%0\n\t" \
                  "or.w    #0x0700,%%sr" \
                     : "=d" (_level) \
                     : : "cc" )
 #endif
 
 #define m68k_enable_interrupts( _level ) \
-  asm volatile ( "move.w  %0,%%sr " : : "d" (_level) : "cc");
+  __asm__ volatile ( "move.w  %0,%%sr " : : "d" (_level) : "cc");
 
 #if ( defined(__mcoldfire__) )
 #define m68k_flash_interrupts( _level ) \
@@ -363,7 +363,7 @@ extern "C" {
    } while( 0 )
 #else
 #define m68k_flash_interrupts( _level ) \
-  asm volatile ( "move.w  %0,%%sr\n\t" \
+  __asm__ volatile ( "move.w  %0,%%sr\n\t" \
                  "or.w    #0x0700,%%sr" \
                     : : "d" (_level) \
                     : "cc" )
@@ -373,7 +373,7 @@ extern "C" {
   do { \
     register uint32_t   _tmpsr; \
     \
-    asm volatile( "move.w %%sr,%0" : "=d" (_tmpsr)); \
+    __asm__ volatile( "move.w %%sr,%0" : "=d" (_tmpsr)); \
     _level = (_tmpsr & 0x0700) >> 8; \
   } while (0)
 
@@ -381,17 +381,17 @@ extern "C" {
   do { \
     register uint32_t   _tmpsr; \
     \
-    asm volatile( "move.w  %%sr,%0" : "=d" (_tmpsr)); \
+    __asm__ volatile( "move.w  %%sr,%0" : "=d" (_tmpsr)); \
     _tmpsr = (_tmpsr & 0xf8ff) | ((_newlevel) << 8); \
-    asm volatile( "move.w  %0,%%sr" : : "d" (_tmpsr)); \
+    __asm__ volatile( "move.w  %0,%%sr" : : "d" (_tmpsr)); \
   } while (0)
 
 #if ( M68K_HAS_VBR == 1 && !defined(__mcoldfire__) )
 #define m68k_get_vbr( vbr ) \
-  asm volatile ( "movec   %%vbr,%0 " : "=r" (vbr))
+  __asm__ volatile ( "movec   %%vbr,%0 " : "=r" (vbr))
 
 #define m68k_set_vbr( vbr ) \
-  asm volatile ( "movec   %0,%%vbr " : : "r" (vbr))
+  __asm__ volatile ( "movec   %0,%%vbr " : : "r" (vbr))
 
 #elif ( defined(__mcoldfire__) )
 extern void*                     _VBR;
@@ -399,7 +399,7 @@ extern void*                     _VBR;
 
 #define m68k_set_vbr( _vbr ) \
   do { \
-    asm volatile ( "movec   %0,%%vbr " : : "r" (_vbr)); \
+    __asm__ volatile ( "movec   %0,%%vbr " : : "r" (_vbr)); \
     _VBR = (void *)_vbr; \
   } while(0)
 
@@ -411,9 +411,9 @@ extern void*                     _VBR;
 /*
  *  Access Control Registers
  */
-#define m68k_set_cacr(_cacr) asm volatile ("movec %0,%%cacr" : : "d" (_cacr))
-#define m68k_set_acr0(_acr0) asm volatile ("movec %0,%%acr0" : : "d" (_acr0))
-#define m68k_set_acr1(_acr1) asm volatile ("movec %0,%%acr1" : : "d" (_acr1))
+#define m68k_set_cacr(_cacr) __asm__ volatile ("movec %0,%%cacr" : : "d" (_cacr))
+#define m68k_set_acr0(_acr0) __asm__ volatile ("movec %0,%%acr0" : : "d" (_acr0))
+#define m68k_set_acr1(_acr1) __asm__ volatile ("movec %0,%%acr1" : : "d" (_acr1))
 
 /*
  *  The following routine swaps the endian format of an unsigned int.
@@ -454,9 +454,9 @@ static inline uint32_t m68k_swap_u32(
 {
   uint32_t swapped = value;
 
-  asm volatile( "rorw  #8,%0" : "=d" (swapped) : "0" (swapped) );
-  asm volatile( "swap  %0"    : "=d" (swapped) : "0" (swapped) );
-  asm volatile( "rorw  #8,%0" : "=d" (swapped) : "0" (swapped) );
+  __asm__ volatile( "rorw  #8,%0" : "=d" (swapped) : "0" (swapped) );
+  __asm__ volatile( "swap  %0"    : "=d" (swapped) : "0" (swapped) );
+  __asm__ volatile( "rorw  #8,%0" : "=d" (swapped) : "0" (swapped) );
 
   return( swapped );
 }
@@ -467,7 +467,7 @@ static inline uint16_t m68k_swap_u16(
 {
   uint16_t swapped = value;
 
-  asm volatile( "rorw  #8,%0" : "=d" (swapped) : "0" (swapped) );
+  __asm__ volatile( "rorw  #8,%0" : "=d" (swapped) : "0" (swapped) );
 
   return( swapped );
 }