change log for rtems (2011-02-11)
rtems-vc at rtems.org
rtems-vc at rtems.org
Fri Feb 11 12:10:45 UTC 2011
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* misc/timer.c: Fix typo.
M 1.63 c/src/lib/libbsp/arm/lpc24xx/ChangeLog
M 1.4 c/src/lib/libbsp/arm/lpc24xx/misc/timer.c
diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.62 rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.63
--- rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.62 Wed Feb 9 05:41:54 2011
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog Fri Feb 11 05:37:34 2011
@@ -1,3 +1,7 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * misc/timer.c: Fix typo.
+
2011-02-09 Ralf Corsépius <ralf.corsepius at rtems.org>
* misc/timer.c: Include <rtems/btimer.h>.
diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c:1.3 rtems/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c:1.4
--- rtems/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c:1.3 Wed Feb 9 05:41:54 2011
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c Fri Feb 11 05:37:35 2011
@@ -20,7 +20,7 @@
*/
#include <rtems.h>
-#include <bsh.h>
+#include <bsp.h>
#include <rtems/btimer.h>
#include <rtems/timerdrv.h>
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/bsp.h, startup/bspreset.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.71 c/src/lib/libbsp/arm/gba/ChangeLog
M 1.6 c/src/lib/libbsp/arm/gba/include/bsp.h
M 1.2 c/src/lib/libbsp/arm/gba/startup/bspreset.c
diff -u rtems/c/src/lib/libbsp/arm/gba/ChangeLog:1.70 rtems/c/src/lib/libbsp/arm/gba/ChangeLog:1.71
--- rtems/c/src/lib/libbsp/arm/gba/ChangeLog:1.70 Wed Feb 9 05:37:35 2011
+++ rtems/c/src/lib/libbsp/arm/gba/ChangeLog Fri Feb 11 05:42:34 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * include/bsp.h, startup/bspreset.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-09 Ralf Corsépius <ralf.corsepius at rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
diff -u rtems/c/src/lib/libbsp/arm/gba/include/bsp.h:1.5 rtems/c/src/lib/libbsp/arm/gba/include/bsp.h:1.6
--- rtems/c/src/lib/libbsp/arm/gba/include/bsp.h:1.5 Fri Jan 28 14:29:34 2011
+++ rtems/c/src/lib/libbsp/arm/gba/include/bsp.h Fri Feb 11 05:42:34 2011
@@ -44,7 +44,7 @@
uint32_t i; \
for(i = 0; i<microseconds;) {i++;} \
uint32_t _cnt = _microseconds; \
- asm volatile ("0: nop; sub %0, %0, #1; cmp %0,#0; bne 0b" : "=c"(_cnt) : "0"(_cnt)); \
+ __asm__ volatile ("0: nop; sub %0, %0, #1; cmp %0,#0; bne 0b" : "=c"(_cnt) : "0"(_cnt)); \
}
/** gba_zero_memory library function in start.S */
diff -u rtems/c/src/lib/libbsp/arm/gba/startup/bspreset.c:1.1 rtems/c/src/lib/libbsp/arm/gba/startup/bspreset.c:1.2
--- rtems/c/src/lib/libbsp/arm/gba/startup/bspreset.c:1.1 Mon Sep 22 16:53:32 2008
+++ rtems/c/src/lib/libbsp/arm/gba/startup/bspreset.c Fri Feb 11 05:42:34 2011
@@ -11,6 +11,6 @@
void bsp_reset(void)
{
- asm volatile ("ldr r0, =_gba_reset");
- asm volatile ("bx r0");
+ __asm__ volatile ("ldr r0, =_gba_reset");
+ __asm__ volatile ("bx r0");
}
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/swi.h, startup/bspreset.c, startup/syscalls.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.12 c/src/lib/libbsp/arm/gdbarmsim/ChangeLog
M 1.2 c/src/lib/libbsp/arm/gdbarmsim/include/swi.h
M 1.2 c/src/lib/libbsp/arm/gdbarmsim/startup/bspreset.c
M 1.5 c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c
diff -u rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog:1.11 rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog:1.12
--- rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog:1.11 Wed Feb 2 08:57:51 2011
+++ rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog Fri Feb 11 05:42:36 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * include/swi.h, startup/bspreset.c, startup/syscalls.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/arm/gdbarmsim/include/swi.h:1.1 rtems/c/src/lib/libbsp/arm/gdbarmsim/include/swi.h:1.2
--- rtems/c/src/lib/libbsp/arm/gdbarmsim/include/swi.h:1.1 Thu Oct 1 16:48:42 2009
+++ rtems/c/src/lib/libbsp/arm/gdbarmsim/include/swi.h Fri Feb 11 05:42:36 2011
@@ -80,7 +80,7 @@
do_AngelSWI (int reason, void * arg)
{
int value;
- asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
+ __asm__ volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
: "=r" (value) /* Outputs */
: "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */
: "r0", "r1", "r2", "r3", "ip", "lr", "memory", "cc"
diff -u rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/bspreset.c:1.1 rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/bspreset.c:1.2
--- rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/bspreset.c:1.1 Thu Oct 1 16:48:42 2009
+++ rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/bspreset.c Fri Feb 11 05:42:36 2011
@@ -15,5 +15,5 @@
void bsp_reset( void )
{
- asm ("swi %a0" :: "i" (SWI_Exit));
+ __asm__ ("swi %a0" :: "i" (SWI_Exit));
}
diff -u rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c:1.4 rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c:1.5
--- rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c:1.4 Sun Aug 15 17:50:13 2010
+++ rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c Fri Feb 11 05:42:36 2011
@@ -85,7 +85,7 @@
static int newslot _PARAMS ((void));
/* Register name faking - works in collusion with the linker. */
-register char * stack_ptr asm ("sp");
+register char * stack_ptr __asm__ ("sp");
/* following is copied from libc/stdio/local.h to check std streams */
@@ -175,21 +175,21 @@
const char * name;
name = ":tt";
- asm ("mov r0,%2; mov r1, #0; swi %a1; mov %0, r0"
+ __asm__ ("mov r0,%2; mov r1, #0; swi %a1; mov %0, r0"
: "=r"(fh)
: "i" (SWI_Open),"r"(name)
: "r0","r1");
monitor_stdin = fh;
name = ":tt";
- asm ("mov r0,%2; mov r1, #4; swi %a1; mov %0, r0"
+ __asm__ ("mov r0,%2; mov r1, #4; swi %a1; mov %0, r0"
: "=r"(fh)
: "i" (SWI_Open),"r"(name)
: "r0","r1");
monitor_stdout = fh;
name = ":tt";
- asm ("mov r0,%2; mov r1, #8; swi %a1; mov %0, r0"
+ __asm__ ("mov r0,%2; mov r1, #8; swi %a1; mov %0, r0"
: "=r"(fh)
: "i" (SWI_Open),"r"(name)
: "r0","r1");
@@ -217,8 +217,8 @@
#ifdef ARM_RDI_MONITOR
return do_AngelSWI (AngelSWI_Reason_Errno, NULL);
#else
- register int r0 asm("r0");
- asm ("swi %a1" : "=r"(r0) : "i" (SWI_GetErrno));
+ register int r0 __asm__ ("r0");
+ __asm__ ("swi %a1" : "=r"(r0) : "i" (SWI_GetErrno));
return r0;
#endif
}
@@ -258,13 +258,13 @@
return checkerror (do_AngelSWI (AngelSWI_Reason_Read, block));
#else
- register int r0 asm("r0");
- register int r1 asm("r1");
- register int r2 asm("r2");
+ register int r0 __asm__ ("r0");
+ register int r1 __asm__ ("r1");
+ register int r2 __asm__ ("r2");
r0 = fh;
r1 = (int)ptr;
r2 = len;
- asm ("swi %a4"
+ __asm__ ("swi %a4"
: "=r" (r0)
: "0"(r0), "r"(r1), "r"(r2), "i"(SWI_Read));
return checkerror (r0);
@@ -360,7 +360,7 @@
#else
if (dir == SEEK_END)
{
- asm ("mov r0, %2; swi %a1; mov %0, r0"
+ __asm__ ("mov r0, %2; swi %a1; mov %0, r0"
: "=r" (res)
: "i" (SWI_Flen), "r" (pfd->handle)
: "r0");
@@ -371,7 +371,7 @@
}
/* This code only does absolute seeks. */
- asm ("mov r0, %2; mov r1, %3; swi %a1; mov %0, r0"
+ __asm__ ("mov r0, %2; mov r1, %3; swi %a1; mov %0, r0"
: "=r" (res)
: "i" (SWI_Seek), "r" (pfd->handle), "r" (ptr)
: "r0", "r1");
@@ -412,13 +412,13 @@
return checkerror (do_AngelSWI (AngelSWI_Reason_Write, block));
#else
- register int r0 asm("r0");
- register int r1 asm("r1");
- register int r2 asm("r2");
+ register int r0 __asm__ ("r0");
+ register int r1 __asm__ ("r1");
+ register int r2 __asm__ ("r2");
r0 = fh;
r1 = (int)ptr;
r2 = len;
- asm ("swi %a4"
+ __asm__ ("swi %a4"
: "=r" (r0)
: "0"(r0), "r"(r1), "r"(r2), "i"(SWI_Write));
return checkerror (r0);
@@ -518,7 +518,7 @@
fh = do_AngelSWI (AngelSWI_Reason_Open, block);
#else
- asm ("mov r0,%2; mov r1, %3; swi %a1; mov %0, r0"
+ __asm__ ("mov r0,%2; mov r1, %3; swi %a1; mov %0, r0"
: "=r"(fh)
: "i" (SWI_Open),"r"(path),"r"(aflags)
: "r0","r1");
@@ -548,9 +548,9 @@
#ifdef ARM_RDI_MONITOR
return checkerror (do_AngelSWI (AngelSWI_Reason_Close, &fh));
#else
- register int r0 asm("r0");
+ register int r0 __asm__ ("r0");
r0 = fh;
- asm ("swi %a2"
+ __asm__ ("swi %a2"
: "=r"(r0)
: "0"(r0), "i" (SWI_Close));
return checkerror (r0);
@@ -599,7 +599,7 @@
caddr_t
_sbrk (int incr)
{
- extern char end asm ("end"); /* Defined by the linker. */
+ extern char end __asm__ ("end"); /* Defined by the linker. */
static char * heap_end;
char * prev_heap_end;
@@ -650,7 +650,7 @@
#ifdef ARM_RDI_MONITOR
res = checkerror (do_AngelSWI (AngelSWI_Reason_FLen, &pfd->handle));
#else
- asm ("mov r0, %2; swi %a1; mov %0, r0"
+ __asm__ ("mov r0, %2; swi %a1; mov %0, r0"
: "=r" (res)
: "i" (SWI_Flen), "r" (pfd->handle)
: "r0");
@@ -703,9 +703,9 @@
block[1] = strlen(path);
res = do_AngelSWI (AngelSWI_Reason_Remove, block);
#else
- register int r0 asm("r0");
+ register int r0 __asm__ ("r0");
r0 = (int)path;
- asm ("swi %a2"
+ __asm__ ("swi %a2"
: "=r"(r0)
: "0"(r0), "i" (SWI_Remove));
res = r0;
@@ -728,7 +728,7 @@
#else
{
int value;
- asm ("swi %a1; mov %0, r0" : "=r" (value): "i" (SWI_Time) : "r0");
+ __asm__ ("swi %a1; mov %0, r0" : "=r" (value): "i" (SWI_Time) : "r0");
tp->tv_sec = value;
}
#endif
@@ -755,7 +755,7 @@
#ifdef ARM_RDI_MONITOR
timeval = do_AngelSWI (AngelSWI_Reason_Clock,NULL);
#else
- asm ("swi %a1; mov %0, r0" : "=r" (timeval): "i" (SWI_Clock) : "r0");
+ __asm__ ("swi %a1; mov %0, r0" : "=r" (timeval): "i" (SWI_Clock) : "r0");
#endif
return timeval;
}
@@ -795,9 +795,9 @@
#ifdef ARM_RDI_MONITOR
return checkerror (do_AngelSWI (AngelSWI_Reason_IsTTY, &pfd->handle));
#else
- register int r0 asm("r0");
+ register int r0 __asm__ ("r0");
r0 = pfd->handle;
- asm ("swi %a2"
+ __asm__ ("swi %a2"
: "=r" (r0)
: "0"(r0), "i" (SWI_IsTTY));
return checkerror (r0);
@@ -831,9 +831,9 @@
}
return e;
#else
- register int r0 asm("r0");
+ register int r0 __asm__ ("r0");
r0 = (int)s;
- asm ("swi %a2"
+ __asm__ ("swi %a2"
: "=r" (r0)
: "0"(r0), "i" (SWI_CLI));
return checkerror (r0);
@@ -851,11 +851,11 @@
block[3] = strlen(newpath);
return checkerror (do_AngelSWI (AngelSWI_Reason_Rename, block)) ? -1 : 0;
#else
- register int r0 asm("r0");
- register int r1 asm("r1");
+ register int r0 __asm__ ("r0");
+ register int r1 __asm__ ("r1");
r0 = (int)oldpath;
r1 = (int)newpath;
- asm ("swi %a3"
+ __asm__ ("swi %a3"
: "=r" (r0)
: "0" (r0), "r" (r1), "i" (SWI_Rename));
return checkerror (r0);
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* startup/bspreset.c, startup/bspstart.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.64 c/src/lib/libbsp/arm/gp32/ChangeLog
M 1.4 c/src/lib/libbsp/arm/gp32/startup/bspreset.c
M 1.22 c/src/lib/libbsp/arm/gp32/startup/bspstart.c
diff -u rtems/c/src/lib/libbsp/arm/gp32/ChangeLog:1.63 rtems/c/src/lib/libbsp/arm/gp32/ChangeLog:1.64
--- rtems/c/src/lib/libbsp/arm/gp32/ChangeLog:1.63 Wed Feb 2 08:57:52 2011
+++ rtems/c/src/lib/libbsp/arm/gp32/ChangeLog Fri Feb 11 05:48:14 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * startup/bspreset.c, startup/bspstart.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/arm/gp32/startup/bspreset.c:1.3 rtems/c/src/lib/libbsp/arm/gp32/startup/bspreset.c:1.4
--- rtems/c/src/lib/libbsp/arm/gp32/startup/bspreset.c:1.3 Fri Jan 28 14:29:35 2011
+++ rtems/c/src/lib/libbsp/arm/gp32/startup/bspreset.c Fri Feb 11 05:48:14 2011
@@ -13,7 +13,7 @@
rtems_interrupt_level level;
rtems_interrupt_disable(level);
/* disable mmu, invalide i-cache and call swi #4 */
- asm volatile(""
+ __asm__ volatile(""
"mrc p15,0,r0,c1,c0,0 \n"
"bic r0,r0,#1 \n"
"mcr p15,0,r0,c1,c0,0 \n"
diff -u rtems/c/src/lib/libbsp/arm/gp32/startup/bspstart.c:1.21 rtems/c/src/lib/libbsp/arm/gp32/startup/bspstart.c:1.22
--- rtems/c/src/lib/libbsp/arm/gp32/startup/bspstart.c:1.21 Fri Jan 28 14:29:35 2011
+++ rtems/c/src/lib/libbsp/arm/gp32/startup/bspstart.c Fri Feb 11 05:48:14 2011
@@ -30,7 +30,7 @@
Thread bsp_idle_task(uint32_t ignored)
{
while(1) {
- asm volatile ("MCR p15,0,r0,c7,c0,4 \n");
+ __asm__ volatile ("MCR p15,0,r0,c7,c0,4 \n");
}
}
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* startup/bspstarthooks.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.64 c/src/lib/libbsp/arm/lpc24xx/ChangeLog
M 1.8 c/src/lib/libbsp/arm/lpc24xx/startup/bspstarthooks.c
diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.63 rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.64
--- rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.63 Fri Feb 11 05:37:34 2011
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog Fri Feb 11 05:48:16 2011
@@ -1,5 +1,10 @@
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * startup/bspstarthooks.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* misc/timer.c: Fix typo.
2011-02-09 Ralf Corsépius <ralf.corsepius at rtems.org>
diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/startup/bspstarthooks.c:1.7 rtems/c/src/lib/libbsp/arm/lpc24xx/startup/bspstarthooks.c:1.8
--- rtems/c/src/lib/libbsp/arm/lpc24xx/startup/bspstarthooks.c:1.7 Fri Dec 3 03:56:48 2010
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/startup/bspstarthooks.c Fri Feb 11 05:48:16 2011
@@ -65,7 +65,7 @@
ticks /= 4;
for (i = 0; i <= ticks; ++i) {
- asm volatile ("nop");
+ __asm__ volatile ("nop");
}
}
#endif
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* irq/irq.c, misc/restart.c, rtc/rtc-config.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.26 c/src/lib/libbsp/arm/lpc32xx/ChangeLog
M 1.7 c/src/lib/libbsp/arm/lpc32xx/irq/irq.c
M 1.3 c/src/lib/libbsp/arm/lpc32xx/misc/restart.c
M 1.5 c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c
diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog:1.25 rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog:1.26
--- rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog:1.25 Wed Feb 9 06:02:24 2011
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog Fri Feb 11 05:48:17 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * irq/irq.c, misc/restart.c, rtc/rtc-config.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-09 Ralf Corsépius <ralf.corsepius at rtems.org>
* misc/timer.c: Include <rtems/btimer.h>.
diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c:1.6 rtems/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c:1.7
--- rtems/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c:1.6 Wed Jun 23 03:27:57 2010
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c Fri Feb 11 05:48:17 2011
@@ -114,7 +114,7 @@
{
ARM_SWITCH_REGISTERS;
- asm volatile (
+ __asm__ volatile (
ARM_SWITCH_TO_ARM
"clz %[val], %[val]\n"
"rsb %[val], %[val], #31\n"
diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/misc/restart.c:1.2 rtems/c/src/lib/libbsp/arm/lpc32xx/misc/restart.c:1.3
--- rtems/c/src/lib/libbsp/arm/lpc32xx/misc/restart.c:1.2 Tue Sep 28 09:38:26 2010
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/misc/restart.c Fri Feb 11 05:48:17 2011
@@ -40,7 +40,7 @@
ctrl &= ~(ARM_CP15_CTRL_I | ARM_CP15_CTRL_C | ARM_CP15_CTRL_M);
arm_cp15_set_control(ctrl);
- asm volatile (
+ __asm__ volatile (
ARM_SWITCH_TO_ARM
"mov pc, %[addr]\n"
ARM_SWITCH_BACK
diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c:1.4 rtems/c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c:1.5
--- rtems/c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c:1.4 Fri Nov 12 07:29:14 2010
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c Fri Feb 11 05:48:17 2011
@@ -49,7 +49,7 @@
/* It needs some time before we can read the values back */
while (i != 0) {
- asm volatile ("nop");
+ __asm__ volatile ("nop");
--i;
}
}
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* console/console.c, dswifi/arm9/source/wifi_arm9.c, tools/bin2s.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.63 c/src/lib/libbsp/arm/nds/ChangeLog
M 1.6 c/src/lib/libbsp/arm/nds/console/console.c
M 1.6 c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c
M 1.5 c/src/lib/libbsp/arm/nds/tools/bin2s.c
diff -u rtems/c/src/lib/libbsp/arm/nds/ChangeLog:1.62 rtems/c/src/lib/libbsp/arm/nds/ChangeLog:1.63
--- rtems/c/src/lib/libbsp/arm/nds/ChangeLog:1.62 Wed Feb 9 06:03:20 2011
+++ rtems/c/src/lib/libbsp/arm/nds/ChangeLog Fri Feb 11 05:48:20 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * console/console.c, dswifi/arm9/source/wifi_arm9.c, tools/bin2s.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-09 Ralf Corsépius <ralf.corsepius at rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
diff -u rtems/c/src/lib/libbsp/arm/nds/console/console.c:1.5 rtems/c/src/lib/libbsp/arm/nds/console/console.c:1.6
--- rtems/c/src/lib/libbsp/arm/nds/console/console.c:1.5 Sun Apr 25 21:28:02 2010
+++ rtems/c/src/lib/libbsp/arm/nds/console/console.c Fri Feb 11 05:48:20 2011
@@ -38,7 +38,7 @@
nds_putch (char c)
{
#ifdef TESTSUITE
- asm volatile ("swi $0x1");
+ __asm__ volatile ("swi $0x1");
#endif
consolePrintChar (c);
}
diff -u rtems/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c:1.5 rtems/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c:1.6
--- rtems/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c:1.5 Mon Dec 7 03:35:45 2009
+++ rtems/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c Fri Feb 11 05:48:20 2011
@@ -61,7 +61,7 @@
}
void sgIP_IntrWaitEvent() {
- // __asm( ".ARM\n swi 0x060000\n" );
+ // __asm__ ( ".ARM\n swi 0x060000\n" );
int i,j;
j=0;
for(i=0;i<20000;i++) {
diff -u rtems/c/src/lib/libbsp/arm/nds/tools/bin2s.c:1.4 rtems/c/src/lib/libbsp/arm/nds/tools/bin2s.c:1.5
--- rtems/c/src/lib/libbsp/arm/nds/tools/bin2s.c:1.4 Sun Nov 29 22:16:52 2009
+++ rtems/c/src/lib/libbsp/arm/nds/tools/bin2s.c Fri Feb 11 05:48:20 2011
@@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------------
$Id$
- bin2s: convert a binary file to a gcc asm module
+ bin2s: convert a binary file to a gcc asm-module
for gfx/foo.bin it'll write foo_bin (an array of char)
foo_bin_end, and foo_bin_len (an unsigned int)
for 4bit.chr it'll write _4bit_chr, _4bit_chr_end, and
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* startup/bspreset.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.118 c/src/lib/libbsp/arm/edb7312/ChangeLog
M 1.5 c/src/lib/libbsp/arm/edb7312/startup/bspreset.c
M 1.57 c/src/lib/libbsp/arm/rtl22xx/ChangeLog
M 1.4 c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c
M 1.32 c/src/lib/libbsp/arm/smdk2410/ChangeLog
M 1.2 c/src/lib/libbsp/arm/smdk2410/startup/bspreset.c
diff -u rtems/c/src/lib/libbsp/arm/edb7312/ChangeLog:1.117 rtems/c/src/lib/libbsp/arm/edb7312/ChangeLog:1.118
--- rtems/c/src/lib/libbsp/arm/edb7312/ChangeLog:1.117 Wed Feb 9 05:38:36 2011
+++ rtems/c/src/lib/libbsp/arm/edb7312/ChangeLog Fri Feb 11 05:42:32 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * startup/bspreset.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-09 Ralf Corsépius <ralf.corsepius at rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
diff -u rtems/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c:1.4 rtems/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c:1.5
--- rtems/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c:1.4 Thu Aug 27 22:17:17 2009
+++ rtems/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c Fri Feb 11 05:42:32 2011
@@ -18,6 +18,6 @@
SKYEYE_MAGIC_ADDRESS = 0xff;
#else
- asm volatile ("b _start");
+ __asm__ volatile ("b _start");
#endif
}
diff -u rtems/c/src/lib/libbsp/arm/rtl22xx/ChangeLog:1.56 rtems/c/src/lib/libbsp/arm/rtl22xx/ChangeLog:1.57
--- rtems/c/src/lib/libbsp/arm/rtl22xx/ChangeLog:1.56 Wed Feb 2 08:58:00 2011
+++ rtems/c/src/lib/libbsp/arm/rtl22xx/ChangeLog Fri Feb 11 05:48:21 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * startup/bspreset.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c:1.3 rtems/c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c:1.4
--- rtems/c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c:1.3 Sun Nov 29 08:53:02 2009
+++ rtems/c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c Fri Feb 11 05:48:21 2011
@@ -24,13 +24,13 @@
#ifdef __thumb__
int tmp;
- asm volatile (" .code 16 \n" \
+ __asm__ volatile (" .code 16 \n" \
"ldr %[tmp], =_start \n" \
"bx %[tmp] \n" \
"nop \n" \
: [tmp]"=&r" (tmp) );
#else
- asm volatile ("b _start");
+ __asm__ volatile ("b _start");
#endif
while(1);
#endif
diff -u rtems/c/src/lib/libbsp/arm/smdk2410/ChangeLog:1.31 rtems/c/src/lib/libbsp/arm/smdk2410/ChangeLog:1.32
--- rtems/c/src/lib/libbsp/arm/smdk2410/ChangeLog:1.31 Wed Feb 2 08:58:01 2011
+++ rtems/c/src/lib/libbsp/arm/smdk2410/ChangeLog Fri Feb 11 05:48:22 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * startup/bspreset.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/arm/smdk2410/startup/bspreset.c:1.1 rtems/c/src/lib/libbsp/arm/smdk2410/startup/bspreset.c:1.2
--- rtems/c/src/lib/libbsp/arm/smdk2410/startup/bspreset.c:1.1 Sun Aug 9 22:03:08 2009
+++ rtems/c/src/lib/libbsp/arm/smdk2410/startup/bspreset.c Fri Feb 11 05:48:22 2011
@@ -21,7 +21,7 @@
rtems_interrupt_level level;
rtems_interrupt_disable(level);
/* disable mmu, invalide i-cache and call swi #4 */
- asm volatile(""
+ __asm__ volatile(""
"mrc p15,0,r0,c1,c0,0 \n"
"bic r0,r0,#1 \n"
"mcr p15,0,r0,c1,c0,0 \n"
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* shared/abort/abort.c, shared/abort/simple_abort.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.89 c/src/lib/libbsp/arm/ChangeLog
M 1.6 c/src/lib/libbsp/arm/shared/abort/abort.c
M 1.9 c/src/lib/libbsp/arm/shared/abort/simple_abort.c
diff -u rtems/c/src/lib/libbsp/arm/ChangeLog:1.88 rtems/c/src/lib/libbsp/arm/ChangeLog:1.89
--- rtems/c/src/lib/libbsp/arm/ChangeLog:1.88 Wed Feb 2 08:57:41 2011
+++ rtems/c/src/lib/libbsp/arm/ChangeLog Fri Feb 11 05:49:52 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * shared/abort/abort.c, shared/abort/simple_abort.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/arm/shared/abort/abort.c:1.5 rtems/c/src/lib/libbsp/arm/shared/abort/abort.c:1.6
--- rtems/c/src/lib/libbsp/arm/shared/abort/abort.c:1.5 Tue Jan 12 09:03:22 2010
+++ rtems/c/src/lib/libbsp/arm/shared/abort/abort.c Fri Feb 11 05:49:52 2011
@@ -71,7 +71,7 @@
mode=_print_full_context_mode2txt[spsr&0x1f];
if(!mode) mode="unknown";
- asm volatile (ARM_SWITCH_TO_ARM
+ __asm__ volatile (ARM_SWITCH_TO_ARM
" MRS %[cpsr], cpsr \n"
" ORR %[arm_switch_reg], %[spsr], #0xc0 \n"
" MSR cpsr_c, %[arm_switch_reg] \n"
diff -u rtems/c/src/lib/libbsp/arm/shared/abort/simple_abort.c:1.8 rtems/c/src/lib/libbsp/arm/shared/abort/simple_abort.c:1.9
--- rtems/c/src/lib/libbsp/arm/shared/abort/simple_abort.c:1.8 Tue Jan 12 09:03:22 2010
+++ rtems/c/src/lib/libbsp/arm/shared/abort/simple_abort.c Fri Feb 11 05:49:52 2011
@@ -64,7 +64,7 @@
mode=_print_full_context_mode2txt[(spsr&0x1f)-0x10];
if(!mode) mode="unknown";
- asm volatile (
+ __asm__ volatile (
ARM_SWITCH_TO_ARM
"mrs %[cpsr], cpsr\n"
"orr %[arm_switch_reg], %[spsr], #0xc0\n"
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* startup/bspstart.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.71 c/src/lib/libbsp/arm/csb336/ChangeLog
M 1.18 c/src/lib/libbsp/arm/csb336/startup/bspstart.c
M 1.29 c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog
M 1.7 c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c
diff -u rtems/c/src/lib/libbsp/arm/csb336/ChangeLog:1.70 rtems/c/src/lib/libbsp/arm/csb336/ChangeLog:1.71
--- rtems/c/src/lib/libbsp/arm/csb336/ChangeLog:1.70 Wed Feb 2 08:57:43 2011
+++ rtems/c/src/lib/libbsp/arm/csb336/ChangeLog Fri Feb 11 05:42:31 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * startup/bspstart.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/arm/csb336/startup/bspstart.c:1.17 rtems/c/src/lib/libbsp/arm/csb336/startup/bspstart.c:1.18
--- rtems/c/src/lib/libbsp/arm/csb336/startup/bspstart.c:1.17 Fri Apr 30 09:40:17 2010
+++ rtems/c/src/lib/libbsp/arm/csb336/startup/bspstart.c Fri Feb 11 05:42:31 2011
@@ -44,7 +44,7 @@
/* Delay to allow time for PLL to get going */
for (i = 0; i < 100; i++) {
- asm volatile ("nop\n");
+ __asm__ volatile ("nop\n");
}
/* Set the CPU to asynchrous clock mode, so it uses its fastest clock */
diff -u rtems/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog:1.28 rtems/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog:1.29
--- rtems/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog:1.28 Wed Feb 2 08:58:06 2011
+++ rtems/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog Fri Feb 11 05:58:03 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * startup/bspstart.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c:1.6 rtems/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c:1.7
--- rtems/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c:1.6 Sun Nov 29 21:38:33 2009
+++ rtems/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c Fri Feb 11 05:58:03 2011
@@ -121,9 +121,9 @@
*((uint16_t*)PLL_CTL) = PLL_MSEL|PLL_DF;
/* Commands to set PLL values */
- asm("cli r0;");
- asm("idle;");
- asm("sti r0;");
+ __asm__ ("cli r0;");
+ __asm__ ("idle;");
+ __asm__ ("sti r0;");
/* Delay for PLL stabilization */
for (n=0; n<200; n++) {}
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/tm27.h, startup/bspstart.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.51 c/src/lib/libbsp/bfin/eZKit533/ChangeLog
M 1.2 c/src/lib/libbsp/bfin/eZKit533/include/tm27.h
M 1.18 c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c
diff -u rtems/c/src/lib/libbsp/bfin/eZKit533/ChangeLog:1.50 rtems/c/src/lib/libbsp/bfin/eZKit533/ChangeLog:1.51
--- rtems/c/src/lib/libbsp/bfin/eZKit533/ChangeLog:1.50 Wed Feb 2 08:58:07 2011
+++ rtems/c/src/lib/libbsp/bfin/eZKit533/ChangeLog Fri Feb 11 05:58:04 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * include/tm27.h, startup/bspstart.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h:1.1 rtems/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h:1.2
--- rtems/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h:1.1 Mon Oct 23 14:38:11 2006
+++ rtems/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h Fri Feb 11 05:58:04 2011
@@ -26,7 +26,7 @@
set_vector( handler, 0x06, 1 ); \
}
-#define Cause_tm27_intr() asm volatile("raise 0x06;" : :);
+#define Cause_tm27_intr() __asm__ volatile("raise 0x06;" : :);
#define Clear_tm27_intr() /* empty */
diff -u rtems/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c:1.17 rtems/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c:1.18
--- rtems/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c:1.17 Sun Nov 29 21:38:33 2009
+++ rtems/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c Fri Feb 11 05:58:04 2011
@@ -118,9 +118,9 @@
*((uint16_t*)PLL_CTL) = PLL_MSEL|PLL_DF;
/* Commands to set PLL values */
- asm("cli r0;");
- asm("idle;");
- asm("sti r0;");
+ __asm__ ("cli r0;");
+ __asm__ ("idle;");
+ __asm__ ("sti r0;");
/* Delay for PLL stabilization */
for (n=0; n<200; n++) {}
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/bsp.h:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.16 c/src/lib/libbsp/avr/avrtest/ChangeLog
M 1.3 c/src/lib/libbsp/avr/avrtest/include/bsp.h
M 1.115 c/src/lib/libbsp/h8300/h8sim/ChangeLog
M 1.18 c/src/lib/libbsp/h8300/h8sim/include/bsp.h
diff -u rtems/c/src/lib/libbsp/avr/avrtest/ChangeLog:1.15 rtems/c/src/lib/libbsp/avr/avrtest/ChangeLog:1.16
--- rtems/c/src/lib/libbsp/avr/avrtest/ChangeLog:1.15 Wed Feb 2 08:58:04 2011
+++ rtems/c/src/lib/libbsp/avr/avrtest/ChangeLog Fri Feb 11 05:52:02 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * include/bsp.h:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/avr/avrtest/include/bsp.h:1.2 rtems/c/src/lib/libbsp/avr/avrtest/include/bsp.h:1.3
--- rtems/c/src/lib/libbsp/avr/avrtest/include/bsp.h:1.2 Mon May 4 13:11:43 2009
+++ rtems/c/src/lib/libbsp/avr/avrtest/include/bsp.h Fri Feb 11 05:52:02 2011
@@ -41,7 +41,7 @@
#define rtems_bsp_delay( microseconds ) \
{ register uint32_t _delay=(microseconds); \
register uint32_t _tmp = 0; /* initialized to avoid warning */ \
- asm volatile( "0: \
+ __asm__ volatile( "0: \
remo 3,31,%0 ; \
cmpo 0,%0 ; \
subo 1,%1,%1 ; \
diff -u rtems/c/src/lib/libbsp/h8300/h8sim/ChangeLog:1.114 rtems/c/src/lib/libbsp/h8300/h8sim/ChangeLog:1.115
--- rtems/c/src/lib/libbsp/h8300/h8sim/ChangeLog:1.114 Wed Feb 2 08:58:09 2011
+++ rtems/c/src/lib/libbsp/h8300/h8sim/ChangeLog Fri Feb 11 05:59:23 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * include/bsp.h:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/h8300/h8sim/include/bsp.h:1.17 rtems/c/src/lib/libbsp/h8300/h8sim/include/bsp.h:1.18
--- rtems/c/src/lib/libbsp/h8300/h8sim/include/bsp.h:1.17 Wed Sep 24 16:26:42 2008
+++ rtems/c/src/lib/libbsp/h8300/h8sim/include/bsp.h Fri Feb 11 05:59:23 2011
@@ -39,7 +39,7 @@
#define rtems_bsp_delay( microseconds ) \
{ register uint32_t _delay=(microseconds); \
register uint32_t _tmp = 0; /* initialized to avoid warning */ \
- asm volatile( "0: \
+ __asm__ volatile( "0: \
remo 3,31,%0 ; \
cmpo 0,%0 ; \
subo 1,%1,%1 ; \
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/bsp.h, include/tm27.h, network/network.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.147 c/src/lib/libbsp/i386/i386ex/ChangeLog
M 1.33 c/src/lib/libbsp/i386/i386ex/include/bsp.h
M 1.4 c/src/lib/libbsp/i386/i386ex/include/tm27.h
M 1.16 c/src/lib/libbsp/i386/i386ex/network/network.c
diff -u rtems/c/src/lib/libbsp/i386/i386ex/ChangeLog:1.146 rtems/c/src/lib/libbsp/i386/i386ex/ChangeLog:1.147
--- rtems/c/src/lib/libbsp/i386/i386ex/ChangeLog:1.146 Wed Feb 9 02:22:58 2011
+++ rtems/c/src/lib/libbsp/i386/i386ex/ChangeLog Fri Feb 11 06:04:27 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * include/bsp.h, include/tm27.h, network/network.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-09 Ralf Corsépius <ralf.corsepius at rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
diff -u rtems/c/src/lib/libbsp/i386/i386ex/include/bsp.h:1.32 rtems/c/src/lib/libbsp/i386/i386ex/include/bsp.h:1.33
--- rtems/c/src/lib/libbsp/i386/i386ex/include/bsp.h:1.32 Thu Sep 18 12:31:31 2008
+++ rtems/c/src/lib/libbsp/i386/i386ex/include/bsp.h Fri Feb 11 06:04:27 2011
@@ -39,7 +39,7 @@
\
_counter = (_microseconds); \
\
- asm volatile ( "0: nop;" \
+ __asm__ volatile ( "0: nop;" \
" mov %0,%0 ;" \
" loop 0b" : "=c" (_counter) \
: "0" (_counter) \
diff -u rtems/c/src/lib/libbsp/i386/i386ex/include/tm27.h:1.3 rtems/c/src/lib/libbsp/i386/i386ex/include/tm27.h:1.4
--- rtems/c/src/lib/libbsp/i386/i386ex/include/tm27.h:1.3 Thu Aug 6 16:51:46 2009
+++ rtems/c/src/lib/libbsp/i386/i386ex/include/tm27.h Fri Feb 11 06:04:27 2011
@@ -25,7 +25,7 @@
#define Install_tm27_vector(handler)
-#define Cause_tm27_intr() asm volatile( "int $0x90" : : );
+#define Cause_tm27_intr() __asm__ volatile( "int $0x90" : : );
#define Clear_tm27_intr() /* empty */
diff -u rtems/c/src/lib/libbsp/i386/i386ex/network/network.c:1.15 rtems/c/src/lib/libbsp/i386/i386ex/network/network.c:1.16
--- rtems/c/src/lib/libbsp/i386/i386ex/network/network.c:1.15 Fri Nov 6 01:50:28 2009
+++ rtems/c/src/lib/libbsp/i386/i386ex/network/network.c Fri Feb 11 06:04:27 2011
@@ -7,7 +7,7 @@
void printk_time(void);
#ifdef DBG_VERSION
-#define BREAKPOINT() asm(" int $3");
+#define BREAKPOINT() __asm__ (" int $3");
#else
#define BREAKPOINT()
#endif
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/bsp.h, include/tm27.h:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.268 c/src/lib/libbsp/i386/pc386/ChangeLog
M 1.48 c/src/lib/libbsp/i386/pc386/include/bsp.h
M 1.4 c/src/lib/libbsp/i386/pc386/include/tm27.h
diff -u rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.267 rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.268
--- rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.267 Wed Feb 9 09:57:29 2011
+++ rtems/c/src/lib/libbsp/i386/pc386/ChangeLog Fri Feb 11 06:04:30 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * include/bsp.h, include/tm27.h:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-09 Jennifer Averett <jennifer.averett at oarcorp.com>
* console/ps2_mouse.c: Formatting changes in preparation for making
diff -u rtems/c/src/lib/libbsp/i386/pc386/include/bsp.h:1.47 rtems/c/src/lib/libbsp/i386/pc386/include/bsp.h:1.48
--- rtems/c/src/lib/libbsp/i386/pc386/include/bsp.h:1.47 Fri Jan 28 14:35:34 2011
+++ rtems/c/src/lib/libbsp/i386/pc386/include/bsp.h Fri Feb 11 06:04:30 2011
@@ -145,7 +145,7 @@
#define rtems_bsp_delay(_microseconds) \
{ \
uint32_t _cnt = _microseconds; \
- asm volatile ("0: nop; mov %0,%0; loop 0b" : "=c"(_cnt) : "0"(_cnt)); \
+ __asm__ volatile ("0: nop; mov %0,%0; loop 0b" : "=c"(_cnt) : "0"(_cnt)); \
}
#endif
diff -u rtems/c/src/lib/libbsp/i386/pc386/include/tm27.h:1.3 rtems/c/src/lib/libbsp/i386/pc386/include/tm27.h:1.4
--- rtems/c/src/lib/libbsp/i386/pc386/include/tm27.h:1.3 Thu Aug 6 16:51:48 2009
+++ rtems/c/src/lib/libbsp/i386/pc386/include/tm27.h Fri Feb 11 06:04:30 2011
@@ -23,7 +23,7 @@
#define Install_tm27_vector(handler)
-#define Cause_tm27_intr() asm volatile("int $0x90" : :);
+#define Cause_tm27_intr() __asm__ volatile("int $0x90" : :);
#define Clear_tm27_intr() /* empty */
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/bsp.h, include/tm27.h, tools/debug_c/serial_gdb.h:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.140 c/src/lib/libbsp/i386/ts_386ex/ChangeLog
M 1.23 c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
M 1.4 c/src/lib/libbsp/i386/ts_386ex/include/tm27.h
M 1.3 c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/serial_gdb.h
diff -u rtems/c/src/lib/libbsp/i386/ts_386ex/ChangeLog:1.139 rtems/c/src/lib/libbsp/i386/ts_386ex/ChangeLog:1.140
--- rtems/c/src/lib/libbsp/i386/ts_386ex/ChangeLog:1.139 Wed Feb 9 02:22:58 2011
+++ rtems/c/src/lib/libbsp/i386/ts_386ex/ChangeLog Fri Feb 11 06:04:32 2011
@@ -1,3 +1,8 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * include/bsp.h, include/tm27.h, tools/debug_c/serial_gdb.h:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-09 Ralf Corsépius <ralf.corsepius at rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
diff -u rtems/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h:1.22 rtems/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h:1.23
--- rtems/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h:1.22 Thu Sep 18 12:34:49 2008
+++ rtems/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h Fri Feb 11 06:04:32 2011
@@ -81,7 +81,7 @@
\
_counter = (_microseconds); \
\
- asm volatile ( "0: nop;" \
+ __asm__ volatile ( "0: nop;" \
" mov %0,%0 ;" \
" loop 0b" : "=c" (_counter) \
: "0" (_counter) \
diff -u rtems/c/src/lib/libbsp/i386/ts_386ex/include/tm27.h:1.3 rtems/c/src/lib/libbsp/i386/ts_386ex/include/tm27.h:1.4
--- rtems/c/src/lib/libbsp/i386/ts_386ex/include/tm27.h:1.3 Thu Aug 6 16:51:50 2009
+++ rtems/c/src/lib/libbsp/i386/ts_386ex/include/tm27.h Fri Feb 11 06:04:32 2011
@@ -25,7 +25,7 @@
#define Install_tm27_vector(handler)
-#define Cause_tm27_intr() asm volatile( "int $0x90" : : );
+#define Cause_tm27_intr() __asm__ volatile( "int $0x90" : : );
#define Clear_tm27_intr() /* empty */
diff -u rtems/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/serial_gdb.h:1.2 rtems/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/serial_gdb.h:1.3
--- rtems/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/serial_gdb.h:1.2 Thu Apr 15 08:26:13 2004
+++ rtems/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/serial_gdb.h Fri Feb 11 06:04:32 2011
@@ -10,7 +10,7 @@
void init_serial_gdb( void );
-#define breakpoint() asm("int $3")
+#define breakpoint() __asm__ ("int $3")
#ifdef __cplusplus
}
*ralf*:
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* shared/comm/gdb_glue.c, shared/comm/i386-stub.c,
shared/comm/i386_io.h, shared/comm/uart.c, shared/irq/idt.c,
shared/pci/pcibios.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
M 1.74 c/src/lib/libbsp/i386/ChangeLog
M 1.7 c/src/lib/libbsp/i386/shared/comm/gdb_glue.c
M 1.13 c/src/lib/libbsp/i386/shared/comm/i386-stub.c
M 1.6 c/src/lib/libbsp/i386/shared/comm/i386_io.h
M 1.20 c/src/lib/libbsp/i386/shared/comm/uart.c
M 1.16 c/src/lib/libbsp/i386/shared/irq/idt.c
M 1.21 c/src/lib/libbsp/i386/shared/pci/pcibios.c
diff -u rtems/c/src/lib/libbsp/i386/ChangeLog:1.73 rtems/c/src/lib/libbsp/i386/ChangeLog:1.74
--- rtems/c/src/lib/libbsp/i386/ChangeLog:1.73 Wed Feb 2 08:58:11 2011
+++ rtems/c/src/lib/libbsp/i386/ChangeLog Fri Feb 11 06:06:30 2011
@@ -1,3 +1,10 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * shared/comm/gdb_glue.c, shared/comm/i386-stub.c,
+ shared/comm/i386_io.h, shared/comm/uart.c, shared/irq/idt.c,
+ shared/pci/pcibios.c:
+ Use "__asm__" instead of "asm" for improved c99-compliance.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/i386/shared/comm/gdb_glue.c:1.6 rtems/c/src/lib/libbsp/i386/shared/comm/gdb_glue.c:1.7
--- rtems/c/src/lib/libbsp/i386/shared/comm/gdb_glue.c:1.6 Tue Jan 4 17:28:37 2005
+++ rtems/c/src/lib/libbsp/i386/shared/comm/gdb_glue.c Fri Feb 11 06:06:31 2011
@@ -16,7 +16,7 @@
#include <stdio.h>
#include <uart.h>
-#define BREAKPOINT() asm(" int $3");
+#define BREAKPOINT() __asm__ (" int $3");
extern int BSPConsolePort;
void i386_stub_glue_init(int);
diff -u rtems/c/src/lib/libbsp/i386/shared/comm/i386-stub.c:1.12 rtems/c/src/lib/libbsp/i386/shared/comm/i386-stub.c:1.13
--- rtems/c/src/lib/libbsp/i386/shared/comm/i386-stub.c:1.12 Sun Sep 7 09:30:51 2008
+++ rtems/c/src/lib/libbsp/i386/shared/comm/i386-stub.c Fri Feb 11 06:06:31 2011
@@ -160,33 +160,33 @@
/* Restore the program's registers (including the stack pointer, which
means we get the right stack and don't have to worry about popping our
return address and any stack frames and so on) and return. */
-asm (".text");
-asm (".globl return_to_prog");
-asm ("return_to_prog:");
-asm (" movw registers+44, %ss");
-asm (" movl registers+16, %esp");
-asm (" movl registers+4, %ecx");
-asm (" movl registers+8, %edx");
-asm (" movl registers+12, %ebx");
-asm (" movl registers+20, %ebp");
-asm (" movl registers+24, %esi");
-asm (" movl registers+28, %edi");
-asm (" movw registers+48, %ds");
-asm (" movw registers+52, %es");
-asm (" movw registers+56, %fs");
-asm (" movw registers+60, %gs");
-asm (" movl registers+36, %eax");
-asm (" pushl %eax"); /* saved eflags */
-asm (" movl registers+40, %eax");
-asm (" pushl %eax"); /* saved cs */
-asm (" movl registers+32, %eax");
-asm (" pushl %eax"); /* saved eip */
-asm (" movl registers, %eax");
+__asm__ (".text");
+__asm__ (".globl return_to_prog");
+__asm__ ("return_to_prog:");
+__asm__ (" movw registers+44, %ss");
+__asm__ (" movl registers+16, %esp");
+__asm__ (" movl registers+4, %ecx");
+__asm__ (" movl registers+8, %edx");
+__asm__ (" movl registers+12, %ebx");
+__asm__ (" movl registers+20, %ebp");
+__asm__ (" movl registers+24, %esi");
+__asm__ (" movl registers+28, %edi");
+__asm__ (" movw registers+48, %ds");
+__asm__ (" movw registers+52, %es");
+__asm__ (" movw registers+56, %fs");
+__asm__ (" movw registers+60, %gs");
+__asm__ (" movl registers+36, %eax");
+__asm__ (" pushl %eax"); /* saved eflags */
+__asm__ (" movl registers+40, %eax");
+__asm__ (" pushl %eax"); /* saved cs */
+__asm__ (" movl registers+32, %eax");
+__asm__ (" pushl %eax"); /* saved eip */
+__asm__ (" movl registers, %eax");
/* use iret to restore pc and flags together so
that trace flag works right. */
-asm (" iret");
+__asm__ (" iret");
-#define BREAKPOINT() asm(" int $3");
+#define BREAKPOINT() __asm__ (" int $3");
/* Put the error code here just in case the user cares. */
int gdb_i386errcode;
@@ -197,74 +197,74 @@
/* GDB stores segment registers in 32-bit words (that's just the way
m-i386v.h is written). So zero the appropriate areas in registers. */
#define SAVE_REGISTERS1() \
- asm ("movl %eax, registers"); \
- asm ("movl %ecx, registers+4"); \
- asm ("movl %edx, registers+8"); \
- asm ("movl %ebx, registers+12"); \
- asm ("movl %ebp, registers+20"); \
- asm ("movl %esi, registers+24"); \
- asm ("movl %edi, registers+28"); \
- asm ("movw $0, %ax"); \
- asm ("movw %ds, registers+48"); \
- asm ("movw %ax, registers+50"); \
- asm ("movw %es, registers+52"); \
- asm ("movw %ax, registers+54"); \
- asm ("movw %fs, registers+56"); \
- asm ("movw %ax, registers+58"); \
- asm ("movw %gs, registers+60"); \
- asm ("movw %ax, registers+62");
+ __asm__ ("movl %eax, registers"); \
+ __asm__ ("movl %ecx, registers+4"); \
+ __asm__ ("movl %edx, registers+8"); \
+ __asm__ ("movl %ebx, registers+12"); \
+ __asm__ ("movl %ebp, registers+20"); \
+ __asm__ ("movl %esi, registers+24"); \
+ __asm__ ("movl %edi, registers+28"); \
+ __asm__ ("movw $0, %ax"); \
+ __asm__ ("movw %ds, registers+48"); \
+ __asm__ ("movw %ax, registers+50"); \
+ __asm__ ("movw %es, registers+52"); \
+ __asm__ ("movw %ax, registers+54"); \
+ __asm__ ("movw %fs, registers+56"); \
+ __asm__ ("movw %ax, registers+58"); \
+ __asm__ ("movw %gs, registers+60"); \
+ __asm__ ("movw %ax, registers+62");
#define SAVE_ERRCODE() \
- asm ("popl %ebx"); \
- asm ("movl %ebx, gdb_i386errcode");
+ __asm__ ("popl %ebx"); \
+ __asm__ ("movl %ebx, gdb_i386errcode");
#define SAVE_REGISTERS2() \
- asm ("popl %ebx"); /* old eip */ \
- asm ("movl %ebx, registers+32"); \
- asm ("popl %ebx"); /* old cs */ \
- asm ("movl %ebx, registers+40"); \
- asm ("movw %ax, registers+42"); \
- asm ("popl %ebx"); /* old eflags */ \
- asm ("movl %ebx, registers+36"); \
+ __asm__ ("popl %ebx"); /* old eip */ \
+ __asm__ ("movl %ebx, registers+32"); \
+ __asm__ ("popl %ebx"); /* old cs */ \
+ __asm__ ("movl %ebx, registers+40"); \
+ __asm__ ("movw %ax, registers+42"); \
+ __asm__ ("popl %ebx"); /* old eflags */ \
+ __asm__ ("movl %ebx, registers+36"); \
/* Now that we've done the pops, we can save the stack pointer."); */ \
- asm ("movw %ss, registers+44"); \
- asm ("movw %ax, registers+46"); \
- asm ("movl %esp, registers+16");
+ __asm__ ("movw %ss, registers+44"); \
+ __asm__ ("movw %ax, registers+46"); \
+ __asm__ ("movl %esp, registers+16");
/* See if mem_fault_routine is set, if so just IRET to that address. */
#define CHECK_FAULT() \
- asm ("cmpl $0, mem_fault_routine"); \
- asm ("jne mem_fault");
+ __asm__ ("cmpl $0, mem_fault_routine"); \
+ __asm__ ("jne mem_fault");
-asm (".text");
-asm ("mem_fault:");
+__asm__ (".text");
+__asm__ ("mem_fault:");
/* OK to clobber temp registers; we're just going to end up in set_mem_err. */
/* Pop error code from the stack and save it. */
-asm (" popl %eax");
-asm (" movl %eax, gdb_i386errcode");
+__asm__ (" popl %eax");
+__asm__ (" movl %eax, gdb_i386errcode");
-asm (" popl %eax"); /* eip */
+__asm__ (" popl %eax"); /* eip */
/* We don't want to return there, we want to return to the function
pointed to by mem_fault_routine instead. */
-asm (" movl mem_fault_routine, %eax");
-asm (" popl %ecx"); /* cs (low 16 bits; junk in hi 16 bits). */
-asm (" popl %edx"); /* eflags */
+__asm__ (" movl mem_fault_routine, %eax");
+__asm__ (" popl %ecx"); /* cs (low 16 bits; junk in hi 16 bits). */
+__asm__ (" popl %edx"); /* eflags */
/* Remove this stack frame; when we do the iret, we will be going to
the start of a function, so we want the stack to look just like it
would after a "call" instruction. */
-asm (" leave");
+__asm__ (" leave");
/* Push the stuff that iret wants. */
-asm (" pushl %edx"); /* eflags */
-asm (" pushl %ecx"); /* cs */
-asm (" pushl %eax"); /* eip */
+__asm__ (" pushl %edx"); /* eflags */
+__asm__ (" pushl %ecx"); /* cs */
+__asm__ (" pushl %eax"); /* eip */
/* Zero mem_fault_routine. */
-asm (" movl $0, %eax");
-asm (" movl %eax, mem_fault_routine");
+__asm__ (" movl $0, %eax");
+__asm__ (" movl %eax, mem_fault_routine");
-asm ("iret");
+__asm__ ("iret");
-#define CALL_HOOK() asm("call _remcomHandler");
+#define CALL_HOOK() __asm__ ("call _remcomHandler");
/* This function is called when a i386 exception occurs. It saves
* all the cpu regs in the registers array, munges the stack a bit,
@@ -277,163 +277,163 @@
*
*/
extern void _catchException3 (void);
-asm (".text");
-asm (".globl _catchException3");
-asm ("_catchException3:");
+__asm__ (".text");
+__asm__ (".globl _catchException3");
+__asm__ ("_catchException3:");
SAVE_REGISTERS1 ();
SAVE_REGISTERS2 ();
-asm ("pushl $3");
+__asm__ ("pushl $3");
CALL_HOOK ();
/* Same thing for exception 1. */
extern void _catchException1 (void);
-asm (".text");
-asm (".globl _catchException1");
-asm ("_catchException1:");
+__asm__ (".text");
+__asm__ (".globl _catchException1");
+__asm__ ("_catchException1:");
SAVE_REGISTERS1 ();
SAVE_REGISTERS2 ();
-asm ("pushl $1");
+__asm__ ("pushl $1");
CALL_HOOK ();
/* Same thing for exception 0. */
extern void _catchException0 (void);
-asm (".text");
-asm (".globl _catchException0");
-asm ("_catchException0:");
+__asm__ (".text");
+__asm__ (".globl _catchException0");
+__asm__ ("_catchException0:");
SAVE_REGISTERS1 ();
SAVE_REGISTERS2 ();
-asm ("pushl $0");
+__asm__ ("pushl $0");
CALL_HOOK ();
/* Same thing for exception 4. */
extern void _catchException4 (void);
-asm (".text");
-asm (".globl _catchException4");
-asm ("_catchException4:");
+__asm__ (".text");
+__asm__ (".globl _catchException4");
+__asm__ ("_catchException4:");
SAVE_REGISTERS1 ();
SAVE_REGISTERS2 ();
-asm ("pushl $4");
+__asm__ ("pushl $4");
CALL_HOOK ();
/* Same thing for exception 5. */
extern void _catchException5 (void);
-asm (".text");
-asm (".globl _catchException5");
-asm ("_catchException5:");
+__asm__ (".text");
+__asm__ (".globl _catchException5");
+__asm__ ("_catchException5:");
SAVE_REGISTERS1 ();
SAVE_REGISTERS2 ();
-asm ("pushl $5");
+__asm__ ("pushl $5");
CALL_HOOK ();
/* Same thing for exception 6. */
extern void _catchException6 (void);
-asm (".text");
-asm (".globl _catchException6");
-asm ("_catchException6:");
+__asm__ (".text");
+__asm__ (".globl _catchException6");
+__asm__ ("_catchException6:");
SAVE_REGISTERS1 ();
SAVE_REGISTERS2 ();
-asm ("pushl $6");
+__asm__ ("pushl $6");
CALL_HOOK ();
/* Same thing for exception 7. */
extern void _catchException7 (void);
-asm (".text");
-asm (".globl _catchException7");
-asm ("_catchException7:");
+__asm__ (".text");
+__asm__ (".globl _catchException7");
+__asm__ ("_catchException7:");
SAVE_REGISTERS1 ();
SAVE_REGISTERS2 ();
-asm ("pushl $7");
+__asm__ ("pushl $7");
CALL_HOOK ();
/* Same thing for exception 8. */
extern void _catchException8 (void);
-asm (".text");
-asm (".globl _catchException8");
-asm ("_catchException8:");
+__asm__ (".text");
+__asm__ (".globl _catchException8");
+__asm__ ("_catchException8:");
SAVE_REGISTERS1 ();
SAVE_ERRCODE ();
SAVE_REGISTERS2 ();
-asm ("pushl $8");
+__asm__ ("pushl $8");
CALL_HOOK ();
/* Same thing for exception 9. */
extern void _catchException9 (void);
-asm (".text");
-asm (".globl _catchException9");
-asm ("_catchException9:");
+__asm__ (".text");
+__asm__ (".globl _catchException9");
+__asm__ ("_catchException9:");
SAVE_REGISTERS1 ();
SAVE_REGISTERS2 ();
-asm ("pushl $9");
+__asm__ ("pushl $9");
CALL_HOOK ();
/* Same thing for exception 10. */
extern void _catchException10 (void);
-asm (".text");
-asm (".globl _catchException10");
-asm ("_catchException10:");
+__asm__ (".text");
+__asm__ (".globl _catchException10");
+__asm__ ("_catchException10:");
SAVE_REGISTERS1 ();
SAVE_ERRCODE ();
SAVE_REGISTERS2 ();
-asm ("pushl $10");
+__asm__ ("pushl $10");
CALL_HOOK ();
/* Same thing for exception 12. */
extern void _catchException12 (void);
-asm (".text");
-asm (".globl _catchException12");
-asm ("_catchException12:");
+__asm__ (".text");
+__asm__ (".globl _catchException12");
+__asm__ ("_catchException12:");
SAVE_REGISTERS1 ();
SAVE_ERRCODE ();
SAVE_REGISTERS2 ();
-asm ("pushl $12");
+__asm__ ("pushl $12");
CALL_HOOK ();
/* Same thing for exception 16. */
extern void _catchException16 (void);
-asm (".text");
-asm (".globl _catchException16");
-asm ("_catchException16:");
+__asm__ (".text");
+__asm__ (".globl _catchException16");
+__asm__ ("_catchException16:");
SAVE_REGISTERS1 ();
SAVE_REGISTERS2 ();
-asm ("pushl $16");
+__asm__ ("pushl $16");
CALL_HOOK ();
/* For 13, 11, and 14 we have to deal with the CHECK_FAULT stuff. */
/* Same thing for exception 13. */
extern void _catchException13 (void);
-asm (".text");
-asm (".globl _catchException13");
-asm ("_catchException13:");
+__asm__ (".text");
+__asm__ (".globl _catchException13");
+__asm__ ("_catchException13:");
CHECK_FAULT ();
SAVE_REGISTERS1 ();
SAVE_ERRCODE ();
SAVE_REGISTERS2 ();
-asm ("pushl $13");
+__asm__ ("pushl $13");
CALL_HOOK ();
/* Same thing for exception 11. */
extern void _catchException11 (void);
-asm (".text");
-asm (".globl _catchException11");
-asm ("_catchException11:");
+__asm__ (".text");
+__asm__ (".globl _catchException11");
+__asm__ ("_catchException11:");
CHECK_FAULT ();
SAVE_REGISTERS1 ();
SAVE_ERRCODE ();
SAVE_REGISTERS2 ();
-asm ("pushl $11");
+__asm__ ("pushl $11");
CALL_HOOK ();
/* Same thing for exception 14. */
extern void _catchException14 (void);
-asm (".text");
-asm (".globl _catchException14");
-asm ("_catchException14:");
+__asm__ (".text");
+__asm__ (".globl _catchException14");
+__asm__ ("_catchException14:");
CHECK_FAULT ();
SAVE_REGISTERS1 ();
SAVE_ERRCODE ();
SAVE_REGISTERS2 ();
-asm ("pushl $14");
+__asm__ ("pushl $14");
CALL_HOOK ();
/*
@@ -441,12 +441,12 @@
* stack pointer into an area reserved for debugger use.
*/
extern void remcomHandler (void);
-asm ("_remcomHandler:");
-asm (" popl %eax"); /* pop off return address */
-asm (" popl %eax"); /* get the exception number */
-asm (" movl stackPtr, %esp"); /* move to remcom stack area */
-asm (" pushl %eax"); /* push exception onto stack */
-asm (" call handle_exception"); /* this never returns */
+__asm__ ("_remcomHandler:");
+__asm__ (" popl %eax"); /* pop off return address */
+__asm__ (" popl %eax"); /* get the exception number */
+__asm__ (" movl stackPtr, %esp"); /* move to remcom stack area */
+__asm__ (" pushl %eax"); /* push exception onto stack */
+__asm__ (" call handle_exception"); /* this never returns */
void
_returnFromException (void)
diff -u rtems/c/src/lib/libbsp/i386/shared/comm/i386_io.h:1.5 rtems/c/src/lib/libbsp/i386/shared/comm/i386_io.h:1.6
--- rtems/c/src/lib/libbsp/i386/shared/comm/i386_io.h:1.5 Mon Sep 11 16:46:47 2006
+++ rtems/c/src/lib/libbsp/i386/shared/comm/i386_io.h Fri Feb 11 06:06:31 2011
@@ -19,7 +19,7 @@
({ \
register int _inb_result; \
\
- asm volatile ("xorl %%eax,%%eax; inb %%dx,%%al" : \
+ __asm__ volatile ("xorl %%eax,%%eax; inb %%dx,%%al" : \
"=a" (_inb_result) : "d" (port)); \
_inb_result; \
})
@@ -28,16 +28,16 @@
({ \
register int _inbw_result; \
\
- asm volatile ("xorl %%eax,%%eax; inw %%dx,%%ax" : \
+ __asm__ volatile ("xorl %%eax,%%eax; inw %%dx,%%ax" : \
"=a" (_inbw_result) : "d" (port)); \
_inbw_result; \
})
#define rtems_outb(port, data) \
- asm volatile ("outb %%al,%%dx" : : "a" (data), "d" (port))
+ __asm__ volatile ("outb %%al,%%dx" : : "a" (data), "d" (port))
#define rtems_outw(port, data) \
- asm volatile ("outw %%ax,%%dx" : : "a" (data), "d" (port))
+ __asm__ volatile ("outw %%ax,%%dx" : : "a" (data), "d" (port))
#define outp(port, val) rtems_outb(port,val)
#define inp(port) rtems_inb(port)
diff -u rtems/c/src/lib/libbsp/i386/shared/comm/uart.c:1.19 rtems/c/src/lib/libbsp/i386/shared/comm/uart.c:1.20
--- rtems/c/src/lib/libbsp/i386/shared/comm/uart.c:1.19 Mon Apr 12 11:34:31 2010
+++ rtems/c/src/lib/libbsp/i386/shared/comm/uart.c Fri Feb 11 06:06:31 2011
@@ -841,75 +841,75 @@
* handler
*/
-asm (".p2align 4");
-asm (".text");
-asm (".globl BSP_uart_dbgisr_com1");
-asm ("BSP_uart_dbgisr_com1:");
-asm (" movl %eax, BSP_uart_dbgisr_com_regsav"); /* Save eax */
-asm (" movl %ebx, BSP_uart_dbgisr_com_regsav + 4"); /* Save ebx */
-asm (" movl %edx, BSP_uart_dbgisr_com_regsav + 8"); /* Save edx */
+__asm__ (".p2align 4");
+__asm__ (".text");
+__asm__ (".globl BSP_uart_dbgisr_com1");
+__asm__ ("BSP_uart_dbgisr_com1:");
+__asm__ (" movl %eax, BSP_uart_dbgisr_com_regsav"); /* Save eax */
+__asm__ (" movl %ebx, BSP_uart_dbgisr_com_regsav + 4"); /* Save ebx */
+__asm__ (" movl %edx, BSP_uart_dbgisr_com_regsav + 8"); /* Save edx */
-asm (" movl $0, %ebx"); /* Clear flag */
+__asm__ (" movl $0, %ebx"); /* Clear flag */
/*
* We know that only receive related interrupts
* are available, eat chars
*/
-asm ("uart_dbgisr_com1_1:");
-asm (" movw $0x3FD, %dx");
-asm (" inb %dx, %al"); /* Read LSR */
-asm (" andb $1, %al");
-asm (" cmpb $0, %al");
-asm (" je uart_dbgisr_com1_2");
-asm (" movw $0x3F8, %dx");
-asm (" inb %dx, %al"); /* Get input character */
-asm (" cmpb $3, %al");
-asm (" jne uart_dbgisr_com1_1");
+__asm__ ("uart_dbgisr_com1_1:");
+__asm__ (" movw $0x3FD, %dx");
+__asm__ (" inb %dx, %al"); /* Read LSR */
+__asm__ (" andb $1, %al");
+__asm__ (" cmpb $0, %al");
+__asm__ (" je uart_dbgisr_com1_2");
+__asm__ (" movw $0x3F8, %dx");
+__asm__ (" inb %dx, %al"); /* Get input character */
+__asm__ (" cmpb $3, %al");
+__asm__ (" jne uart_dbgisr_com1_1");
/* ^C received, set flag */
-asm (" movl $1, %ebx");
-asm (" jmp uart_dbgisr_com1_1");
+__asm__ (" movl $1, %ebx");
+__asm__ (" jmp uart_dbgisr_com1_1");
/* All chars read */
-asm ("uart_dbgisr_com1_2:");
+__asm__ ("uart_dbgisr_com1_2:");
/* If flag is set we have to tweak TF */
-asm (" cmpl $0, %ebx");
-asm (" je uart_dbgisr_com1_3");
+__asm__ (" cmpl $0, %ebx");
+__asm__ (" je uart_dbgisr_com1_3");
/* Flag is set */
-asm (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */
-asm (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */
/* Set TF bit */
-asm (" popl %eax"); /* Pop eip */
-asm (" movl %eax, BSP_uart_dbgisr_com_regsav + 4"); /* Save it */
-asm (" popl %eax"); /* Pop cs */
-asm (" movl %eax, BSP_uart_dbgisr_com_regsav + 8"); /* Save it */
-asm (" popl %eax"); /* Pop flags */
-asm (" orl $0x100, %eax"); /* Modify it */
-asm (" pushl %eax"); /* Push it back */
-asm (" movl BSP_uart_dbgisr_com_regsav+8, %eax"); /* Put back cs */
-asm (" pushl %eax");
-asm (" movl BSP_uart_dbgisr_com_regsav+4, %eax"); /* Put back eip */
-asm (" pushl %eax");
+__asm__ (" popl %eax"); /* Pop eip */
+__asm__ (" movl %eax, BSP_uart_dbgisr_com_regsav + 4"); /* Save it */
+__asm__ (" popl %eax"); /* Pop cs */
+__asm__ (" movl %eax, BSP_uart_dbgisr_com_regsav + 8"); /* Save it */
+__asm__ (" popl %eax"); /* Pop flags */
+__asm__ (" orl $0x100, %eax"); /* Modify it */
+__asm__ (" pushl %eax"); /* Push it back */
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+8, %eax"); /* Put back cs */
+__asm__ (" pushl %eax");
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+4, %eax"); /* Put back eip */
+__asm__ (" pushl %eax");
/* Acknowledge IRQ */
-asm (" movb $0x20, %al");
-asm (" outb %al, $0x20");
-asm (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */
-asm (" iret"); /* Done */
+__asm__ (" movb $0x20, %al");
+__asm__ (" outb %al, $0x20");
+__asm__ (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */
+__asm__ (" iret"); /* Done */
/* Flag is not set */
-asm("uart_dbgisr_com1_3:");
-asm (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */
-asm (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */
+__asm__ ("uart_dbgisr_com1_3:");
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */
/* Acknowledge irq */
-asm (" movb $0x20, %al");
-asm (" outb %al, $0x20");
-asm (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */
-asm (" iret"); /* Done */
+__asm__ (" movb $0x20, %al");
+__asm__ (" outb %al, $0x20");
+__asm__ (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */
+__asm__ (" iret"); /* Done */
/*
* Interrupt service routine for COM2 - all,
@@ -918,72 +918,72 @@
* Note: it has to be installed as raw interrupt
* handler
*/
-asm (".p2align 4");
-asm (".text");
-asm (".globl BSP_uart_dbgisr_com2");
-asm ("BSP_uart_dbgisr_com2:");
-asm (" movl %eax, BSP_uart_dbgisr_com_regsav"); /* Save eax */
-asm (" movl %ebx, BSP_uart_dbgisr_com_regsav + 4"); /* Save ebx */
-asm (" movl %edx, BSP_uart_dbgisr_com_regsav + 8"); /* Save edx */
+__asm__ (".p2align 4");
+__asm__ (".text");
+__asm__ (".globl BSP_uart_dbgisr_com2");
+__asm__ ("BSP_uart_dbgisr_com2:");
+__asm__ (" movl %eax, BSP_uart_dbgisr_com_regsav"); /* Save eax */
+__asm__ (" movl %ebx, BSP_uart_dbgisr_com_regsav + 4"); /* Save ebx */
+__asm__ (" movl %edx, BSP_uart_dbgisr_com_regsav + 8"); /* Save edx */
-asm (" movl $0, %ebx"); /* Clear flag */
+__asm__ (" movl $0, %ebx"); /* Clear flag */
/*
* We know that only receive related interrupts
* are available, eat chars
*/
-asm ("uart_dbgisr_com2_1:");
-asm (" movw $0x2FD, %dx");
-asm (" inb %dx, %al"); /* Read LSR */
-asm (" andb $1, %al");
-asm (" cmpb $0, %al");
-asm (" je uart_dbgisr_com2_2");
-asm (" movw $0x2F8, %dx");
-asm (" inb %dx, %al"); /* Get input character */
-asm (" cmpb $3, %al");
-asm (" jne uart_dbgisr_com2_1");
+__asm__ ("uart_dbgisr_com2_1:");
+__asm__ (" movw $0x2FD, %dx");
+__asm__ (" inb %dx, %al"); /* Read LSR */
+__asm__ (" andb $1, %al");
+__asm__ (" cmpb $0, %al");
+__asm__ (" je uart_dbgisr_com2_2");
+__asm__ (" movw $0x2F8, %dx");
+__asm__ (" inb %dx, %al"); /* Get input character */
+__asm__ (" cmpb $3, %al");
+__asm__ (" jne uart_dbgisr_com2_1");
/* ^C received, set flag */
-asm (" movl $1, %ebx");
-asm (" jmp uart_dbgisr_com2_1");
+__asm__ (" movl $1, %ebx");
+__asm__ (" jmp uart_dbgisr_com2_1");
/* All chars read */
-asm ("uart_dbgisr_com2_2:");
+__asm__ ("uart_dbgisr_com2_2:");
/* If flag is set we have to tweak TF */
-asm (" cmpl $0, %ebx");
-asm (" je uart_dbgisr_com2_3");
+__asm__ (" cmpl $0, %ebx");
+__asm__ (" je uart_dbgisr_com2_3");
/* Flag is set */
-asm (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */
-asm (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */
/* Set TF bit */
-asm (" popl %eax"); /* Pop eip */
-asm (" movl %eax, BSP_uart_dbgisr_com_regsav + 4"); /* Save it */
-asm (" popl %eax"); /* Pop cs */
-asm (" movl %eax, BSP_uart_dbgisr_com_regsav + 8"); /* Save it */
-asm (" popl %eax"); /* Pop flags */
-asm (" orl $0x100, %eax"); /* Modify it */
-asm (" pushl %eax"); /* Push it back */
-asm (" movl BSP_uart_dbgisr_com_regsav+8, %eax"); /* Put back cs */
-asm (" pushl %eax");
-asm (" movl BSP_uart_dbgisr_com_regsav+4, %eax"); /* Put back eip */
-asm (" pushl %eax");
+__asm__ (" popl %eax"); /* Pop eip */
+__asm__ (" movl %eax, BSP_uart_dbgisr_com_regsav + 4"); /* Save it */
+__asm__ (" popl %eax"); /* Pop cs */
+__asm__ (" movl %eax, BSP_uart_dbgisr_com_regsav + 8"); /* Save it */
+__asm__ (" popl %eax"); /* Pop flags */
+__asm__ (" orl $0x100, %eax"); /* Modify it */
+__asm__ (" pushl %eax"); /* Push it back */
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+8, %eax"); /* Put back cs */
+__asm__ (" pushl %eax");
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+4, %eax"); /* Put back eip */
+__asm__ (" pushl %eax");
/* Acknowledge IRQ */
-asm (" movb $0x20, %al");
-asm (" outb %al, $0x20");
-asm (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */
-asm (" iret"); /* Done */
+__asm__ (" movb $0x20, %al");
+__asm__ (" outb %al, $0x20");
+__asm__ (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */
+__asm__ (" iret"); /* Done */
/* Flag is not set */
-asm("uart_dbgisr_com2_3:");
-asm (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */
-asm (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */
+__asm__ ("uart_dbgisr_com2_3:");
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */
+__asm__ (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */
/* Acknowledge irq */
-asm (" movb $0x20, %al");
-asm (" outb %al, $0x20");
-asm (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */
-asm (" iret"); /* Done */
+__asm__ (" movb $0x20, %al");
+__asm__ (" outb %al, $0x20");
+__asm__ (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */
+__asm__ (" iret"); /* Done */
diff -u rtems/c/src/lib/libbsp/i386/shared/irq/idt.c:1.15 rtems/c/src/lib/libbsp/i386/shared/irq/idt.c:1.16
--- rtems/c/src/lib/libbsp/i386/shared/irq/idt.c:1.15 Fri Jan 28 14:35:38 2011
+++ rtems/c/src/lib/libbsp/i386/shared/irq/idt.c Fri Feb 11 06:06:31 2011
@@ -275,7 +275,7 @@
* Now, reload all segment registers so the limit takes effect.
*/
- asm volatile( "movw %%ds,%0 ; movw %0,%%ds\n\t"
+ __asm__ volatile( "movw %%ds,%0 ; movw %0,%%ds\n\t"
"movw %%es,%0 ; movw %0,%%es\n\t"
"movw %%fs,%0 ; movw %0,%%fs\n\t"
"movw %%gs,%0 ; movw %0,%%gs\n\t"
diff -u rtems/c/src/lib/libbsp/i386/shared/pci/pcibios.c:1.20 rtems/c/src/lib/libbsp/i386/shared/pci/pcibios.c:1.21
--- rtems/c/src/lib/libbsp/i386/shared/pci/pcibios.c:1.20 Fri Dec 11 06:55:25 2009
+++ rtems/c/src/lib/libbsp/i386/shared/pci/pcibios.c Fri Feb 11 06:06:31 2011
@@ -23,8 +23,8 @@
static unsigned int pcibEntry;
/*
- * Array to pass data between c and asm parts, at the time of
- * writing I am not yet that familiar with extended asm feature
+ * Array to pass data between c and __asm__ parts, at the time of
+ * writing I am not yet that familiar with extended __asm__ feature
* of gcc. This code is not on performance path, so we can care
* relatively little about performance here
*/
@@ -80,17 +80,17 @@
pcibExchg[0] = *(unsigned int *)ucp;
- asm (" pusha"); /* Push all registers */
- asm (" movl pcibExchg, %edi"); /* Move entry point to esi */
- asm (" movl $0x49435024, %eax"); /* Move signature to eax */
- asm (" xorl %ebx, %ebx"); /* Zero ebx */
- asm (" pushl %cs");
- asm (" call *%edi"); /* Call entry */
- asm (" movl %eax, pcibExchg");
- asm (" movl %ebx, pcibExchg+4");
- asm (" movl %ecx, pcibExchg+8");
- asm (" movl %edx, pcibExchg+12");
- asm (" popa");
+ __asm__ (" pusha"); /* Push all registers */
+ __asm__ (" movl pcibExchg, %edi"); /* Move entry point to esi */
+ __asm__ (" movl $0x49435024, %eax"); /* Move signature to eax */
+ __asm__ (" xorl %ebx, %ebx"); /* Zero ebx */
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%edi"); /* Call entry */
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" movl %ebx, pcibExchg+4");
+ __asm__ (" movl %ecx, pcibExchg+8");
+ __asm__ (" movl %edx, pcibExchg+12");
+ __asm__ (" popa");
if ((pcibExchg[0] & 0xff) != 0) {
/* Not found */
@@ -103,17 +103,17 @@
/* Let us check whether PCI bios is present */
pcibExchg[0] = pcibEntry;
- asm(" pusha");
- asm(" movl pcibExchg, %edi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x01, %al");
- asm(" pushl %cs");
- asm(" call *%edi");
- asm(" movl %eax, pcibExchg");
- asm(" movl %ebx, pcibExchg+4");
- asm(" movl %ecx, pcibExchg+8");
- asm(" movl %edx, pcibExchg+12");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %edi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x01, %al");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%edi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" movl %ebx, pcibExchg+4");
+ __asm__ (" movl %ecx, pcibExchg+8");
+ __asm__ (" movl %edx, pcibExchg+12");
+ __asm__ (" popa");
if ((pcibExchg[0] & 0xff00) != 0) {
/* Not found */
@@ -147,18 +147,18 @@
pcibExchg[2] = devId;
pcibExchg[3] = idx;
- asm(" pusha");
- asm(" movl pcibExchg, %edi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x02, %al");
- asm(" movl pcibExchg+4, %edx");
- asm(" movl pcibExchg+8, %ecx");
- asm(" movl pcibExchg+12, %esi");
- asm(" pushl %cs");
- asm(" call *%edi");
- asm(" movl %eax, pcibExchg");
- asm(" movl %ebx, pcibExchg+4");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %edi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x02, %al");
+ __asm__ (" movl pcibExchg+4, %edx");
+ __asm__ (" movl pcibExchg+8, %ecx");
+ __asm__ (" movl pcibExchg+12, %esi");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%edi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" movl %ebx, pcibExchg+4");
+ __asm__ (" popa");
*sig = pcibExchg[1] & 0xffff;
@@ -201,17 +201,17 @@
pcibExchg[1] = classCode;
pcibExchg[2] = idx;
- asm(" pusha");
- asm(" movl pcibExchg, %edi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x03, %al");
- asm(" movl pcibExchg+4, %ecx");
- asm(" movl pcibExchg+8, %esi");
- asm(" pushl %cs");
- asm(" call *%edi");
- asm(" movl %eax, pcibExchg");
- asm(" movl %ebx, pcibExchg+4");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %edi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x03, %al");
+ __asm__ (" movl pcibExchg+4, %ecx");
+ __asm__ (" movl pcibExchg+8, %esi");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%edi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" movl %ebx, pcibExchg+4");
+ __asm__ (" popa");
if ((pcibExchg[0] & 0xff00) != 0) {
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
@@ -300,17 +300,17 @@
pcibExchg[1] = busNo << 8;
pcibExchg[2] = data;
- asm(" pusha");
- asm(" movl pcibExchg, %edi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x06, %al");
- asm(" movl pcibExchg+4, %ebx");
- asm(" movl pcibExchg+8, %edx");
- asm(" pushl %cs");
- asm(" call *%edi");
- asm(" movl %eax, pcibExchg");
- asm(" movl %ebx, pcibExchg+4");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %edi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x06, %al");
+ __asm__ (" movl pcibExchg+4, %ebx");
+ __asm__ (" movl pcibExchg+8, %edx");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%edi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" movl %ebx, pcibExchg+4");
+ __asm__ (" popa");
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
}
@@ -330,17 +330,17 @@
pcibExchg[1] = sig;
pcibExchg[2] = off;
- asm(" pusha");
- asm(" movl pcibExchg, %esi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x08, %al");
- asm(" movl pcibExchg+4, %ebx");
- asm(" movl pcibExchg+8, %edi");
- asm(" pushl %cs");
- asm(" call *%esi");
- asm(" movl %eax, pcibExchg");
- asm(" movl %ecx, pcibExchg+4");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %esi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x08, %al");
+ __asm__ (" movl pcibExchg+4, %ebx");
+ __asm__ (" movl pcibExchg+8, %edi");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%esi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" movl %ecx, pcibExchg+4");
+ __asm__ (" popa");
if ((pcibExchg[0] & 0xff00) != 0) {
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
@@ -366,17 +366,17 @@
pcibExchg[1] = sig;
pcibExchg[2] = off;
- asm(" pusha");
- asm(" movl pcibExchg, %esi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x09, %al");
- asm(" movl pcibExchg+4, %ebx");
- asm(" movl pcibExchg+8, %edi");
- asm(" pushl %cs");
- asm(" call *%esi");
- asm(" movl %eax, pcibExchg");
- asm(" movl %ecx, pcibExchg+4");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %esi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x09, %al");
+ __asm__ (" movl pcibExchg+4, %ebx");
+ __asm__ (" movl pcibExchg+8, %edi");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%esi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" movl %ecx, pcibExchg+4");
+ __asm__ (" popa");
if ((pcibExchg[0] & 0xff00) != 0) {
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
@@ -402,17 +402,17 @@
pcibExchg[1] = sig;
pcibExchg[2] = off;
- asm(" pusha");
- asm(" movl pcibExchg, %esi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x0a, %al");
- asm(" movl pcibExchg+4, %ebx");
- asm(" movl pcibExchg+8, %edi");
- asm(" pushl %cs");
- asm(" call *%esi");
- asm(" movl %eax, pcibExchg");
- asm(" movl %ecx, pcibExchg+4");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %esi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x0a, %al");
+ __asm__ (" movl pcibExchg+4, %ebx");
+ __asm__ (" movl pcibExchg+8, %edi");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%esi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" movl %ecx, pcibExchg+4");
+ __asm__ (" popa");
if ((pcibExchg[0] & 0xff00) != 0) {
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
@@ -439,17 +439,17 @@
pcibExchg[2] = off;
pcibExchg[3] = data & 0xff;
- asm(" pusha");
- asm(" movl pcibExchg, %esi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x0b, %al");
- asm(" movl pcibExchg+4, %ebx");
- asm(" movl pcibExchg+8, %edi");
- asm(" movl pcibExchg+12, %ecx");
- asm(" pushl %cs");
- asm(" call *%esi");
- asm(" movl %eax, pcibExchg");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %esi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x0b, %al");
+ __asm__ (" movl pcibExchg+4, %ebx");
+ __asm__ (" movl pcibExchg+8, %edi");
+ __asm__ (" movl pcibExchg+12, %ecx");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%esi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" popa");
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
}
@@ -469,17 +469,17 @@
pcibExchg[2] = off;
pcibExchg[3] = data & 0xffff;
- asm(" pusha");
- asm(" movl pcibExchg, %esi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x0c, %al");
- asm(" movl pcibExchg+4, %ebx");
- asm(" movl pcibExchg+8, %edi");
- asm(" movl pcibExchg+12, %ecx");
- asm(" pushl %cs");
- asm(" call *%esi");
- asm(" movl %eax, pcibExchg");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %esi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x0c, %al");
+ __asm__ (" movl pcibExchg+4, %ebx");
+ __asm__ (" movl pcibExchg+8, %edi");
+ __asm__ (" movl pcibExchg+12, %ecx");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%esi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" popa");
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
}
@@ -501,17 +501,17 @@
pcibExchg[2] = off;
pcibExchg[3] = data;
- asm(" pusha");
- asm(" movl pcibExchg, %esi");
- asm(" movb $0xb1, %ah");
- asm(" movb $0x0d, %al");
- asm(" movl pcibExchg+4, %ebx");
- asm(" movl pcibExchg+8, %edi");
- asm(" movl pcibExchg+12, %ecx");
- asm(" pushl %cs");
- asm(" call *%esi");
- asm(" movl %eax, pcibExchg");
- asm(" popa");
+ __asm__ (" pusha");
+ __asm__ (" movl pcibExchg, %esi");
+ __asm__ (" movb $0xb1, %ah");
+ __asm__ (" movb $0x0d, %al");
+ __asm__ (" movl pcibExchg+4, %ebx");
+ __asm__ (" movl pcibExchg+8, %edi");
+ __asm__ (" movl pcibExchg+12, %ecx");
+ __asm__ (" pushl %cs");
+ __asm__ (" call *%esi");
+ __asm__ (" movl %eax, pcibExchg");
+ __asm__ (" popa");
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
}
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110211/d9395a56/attachment-0001.html>
More information about the vc
mailing list