From 3d0af835baaeef051cdbd0f15fa86dc811c085ac Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 11 Feb 2011 09:57:25 +0000 Subject: =?UTF-8?q?2011-02-11=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * sh7032/delay/delay.c, sh7032/score/cpu_asm.c, sh7032/score/ispsh7032.c, sh7045/sci/sci.c, sh7045/sci/sci_termios.c, sh7045/score/cpu_asm.c, sh7045/score/ispsh7045.c, sh7750/sci/sh4uart.c, sh7750/score/cpu_asm.c, sh7750/score/ispsh7750.c, shgdb/score/cpu_asm.c, shgdb/score/ispshgdb.c: Use "__asm__" instead of "asm" for improved c99-compliance. --- c/src/lib/libcpu/sh/ChangeLog | 10 ++++++++++ c/src/lib/libcpu/sh/sh7032/delay/delay.c | 2 +- c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c | 2 +- c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c | 2 +- c/src/lib/libcpu/sh/sh7045/sci/sci.c | 2 +- c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c | 4 ++-- c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c | 2 +- c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c | 2 +- c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c | 4 ++-- c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c | 2 +- c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c | 2 +- c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c | 2 +- c/src/lib/libcpu/sh/shgdb/score/ispshgdb.c | 2 +- 13 files changed, 24 insertions(+), 14 deletions(-) diff --git a/c/src/lib/libcpu/sh/ChangeLog b/c/src/lib/libcpu/sh/ChangeLog index 08b05fcebe..0a1c57a253 100644 --- a/c/src/lib/libcpu/sh/ChangeLog +++ b/c/src/lib/libcpu/sh/ChangeLog @@ -1,3 +1,13 @@ +2011-02-11 Ralf Corsépius + + * sh7032/delay/delay.c, sh7032/score/cpu_asm.c, + sh7032/score/ispsh7032.c, sh7045/sci/sci.c, + sh7045/sci/sci_termios.c, sh7045/score/cpu_asm.c, + sh7045/score/ispsh7045.c, sh7750/sci/sh4uart.c, + sh7750/score/cpu_asm.c, sh7750/score/ispsh7750.c, + shgdb/score/cpu_asm.c, shgdb/score/ispshgdb.c: + Use "__asm__" instead of "asm" for improved c99-compliance. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libcpu/sh/sh7032/delay/delay.c b/c/src/lib/libcpu/sh/sh7032/delay/delay.c index 16645ea200..26f2c4f7f6 100644 --- a/c/src/lib/libcpu/sh/sh7032/delay/delay.c +++ b/c/src/lib/libcpu/sh/sh7032/delay/delay.c @@ -43,7 +43,7 @@ void CPU_delay( uint32_t microseconds ) register uint32_t clicks_per_usec = bsp_clicks_per_second / 1000000; register uint32_t _delay = (microseconds) * (clicks_per_usec); - asm volatile ( + __asm__ volatile ( "0: add #-4,%0\n\ nop\n\ cmp/pl %0\n\ diff --git a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c index ad2633c98f..229bbd07b9 100644 --- a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c @@ -49,7 +49,7 @@ extern proc_ptr _Hardware_isr_Table[]; unsigned long *_old_stack_ptr; #endif -register unsigned long *stack_ptr asm("r15"); +register unsigned long *stack_ptr __asm__ ("r15"); /* * sh_set_irq_priority diff --git a/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c b/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c index 83ab10081f..982b1906db 100644 --- a/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c +++ b/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c @@ -122,7 +122,7 @@ asm (".global _"Str(name)"\n\t" \ * Dummy interrupt service procedure for * interrupts being not allowed --> Trap 34 ************************************************/ -asm(" .section .text\n\ +__asm__ (" .section .text\n\ .global __dummy_isp\n\ __dummy_isp:\n\ mov.l r14,@-r15\n\ diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci.c b/c/src/lib/libcpu/sh/sh7045/sci/sci.c index 548551164b..57bd149519 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/sci.c +++ b/c/src/lib/libcpu/sh/sh7045/sci/sci.c @@ -379,7 +379,7 @@ rtems_device_driver sh_sci_open( _sci_set_cflags( &sci_device[minor], sci_device[minor].cflags ); for (a=0; a < 10000L; a++) { /* Delay */ - asm volatile ("nop"); + __asm__ volatile ("nop"); } write8((SCI_RE | SCI_TE), /* enable async. Tx and Rx */ diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c b/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c index 168402a152..7ee6555330 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c +++ b/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c @@ -113,7 +113,7 @@ int sh_sci_set_attributes( SH_SCI_REG_DATA(brr, minor, SCI_BRR); for (a=0; a < 10000L; a++) { /* Delay one bit */ - asm volatile ("nop"); + __asm__ volatile ("nop"); } SH_SCI_REG_FLAG((SCI_RE | SCI_TE), minor, SCI_SCR); @@ -295,7 +295,7 @@ int sh_sci_first_open( sh_sci_set_attributes(minor, Console_Port_Tbl[minor].pDeviceParams); for (a=0; a < 10000L; a++) { /* Delay */ - asm volatile ("nop"); + __asm__ volatile ("nop"); } write8((SCI_RE | SCI_TE), /* enable async. Tx and Rx */ diff --git a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c index 05c2cf24be..4aa57fe97d 100644 --- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c @@ -48,7 +48,7 @@ extern proc_ptr _Hardware_isr_Table[]; unsigned long *_old_stack_ptr; #endif -register unsigned long *stack_ptr asm("r15"); +register unsigned long *stack_ptr __asm__ ("r15"); /* * sh_set_irq_priority diff --git a/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c b/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c index 7ba9745830..94a9d8e860 100644 --- a/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c +++ b/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c @@ -151,7 +151,7 @@ asm (".global _"Str(name)"\n\t"\ * Dummy interrupt service procedure for * interrupts being not allowed --> Trap 34 ************************************************/ -asm(" .section .text\n\ +__asm__ (" .section .text\n\ .global __dummy_isp\n\ __dummy_isp:\n\ mov.l r14,@-r15\n\ diff --git a/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c b/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c index 3ea5c35f9a..a2c298bc38 100644 --- a/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c +++ b/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c @@ -842,7 +842,7 @@ sh4uart_start_remote_tx(sh4uart *uart) * Says gdb that program finished to get out from it. */ extern void ipl_finish(void); -asm( +__asm__ ( " .global _ipl_finish\n" "_ipl_finish:\n" " mov.l __ipl_finish_value, r0\n" @@ -856,7 +856,7 @@ asm( ); extern int ipl_serial_input(int poll_count); -asm( +__asm__ ( " .global _ipl_serial_input\n" "_ipl_serial_input:\n" " mov #1,r0\n" diff --git a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c index 46f4aa1984..f1a4446bba 100644 --- a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c @@ -48,7 +48,7 @@ extern proc_ptr _Hardware_isr_Table[]; unsigned long *_old_stack_ptr; #endif -register unsigned long *stack_ptr asm("r15"); +register unsigned long *stack_ptr __asm__ ("r15"); /* * This routine provides the RTEMS interrupt management. diff --git a/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c b/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c index 3da229ef4d..77be0cf16b 100644 --- a/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c +++ b/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c @@ -309,7 +309,7 @@ asm (" .text\n" * Dummy interrupt service procedure for * interrupts being not allowed --> Trap 2 ************************************************/ -asm(" .section .text\n\ +__asm__ (" .section .text\n\ .global __dummy_isp\n\ __dummy_isp:\n\ mov.l r14,@-r15\n\ diff --git a/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c b/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c index e8012fad92..1a5a490fc6 100644 --- a/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c @@ -21,7 +21,7 @@ unsigned long *_old_stack_ptr; #endif -register unsigned long *stack_ptr asm("r15"); +register unsigned long *stack_ptr __asm__ ("r15"); /* * This routine provides the RTEMS interrupt management. diff --git a/c/src/lib/libcpu/sh/shgdb/score/ispshgdb.c b/c/src/lib/libcpu/sh/shgdb/score/ispshgdb.c index 3e6e06f600..ed63834101 100644 --- a/c/src/lib/libcpu/sh/shgdb/score/ispshgdb.c +++ b/c/src/lib/libcpu/sh/shgdb/score/ispshgdb.c @@ -137,7 +137,7 @@ asm (".global _"Str(name)"\n\t"\ * Dummy interrupt service procedure for * interrupts being not allowed --> Trap 34 ************************************************/ -asm(" .section .text\n\ +__asm__ (" .section .text\n\ .global __dummy_isp\n\ __dummy_isp:\n\ mov.l r14,@-r15\n\ -- cgit v1.2.3