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

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

Browse Source 
* shared/console/polled_io.c, shared/flash/spansionFlash.c,
	shared/startup/bspidle.c, shared/startup/probeMemEnd.c:
	Use "__asm__" instead of "asm" for improved c99-compliance.
This commit is contained in:
Ralf Corsepius
2011-02-11 12:19:29 +00:00
parent bd6cbca33b
commit bd918ff702
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/powerpc/ChangeLog
View File

@@ -1,3 +1,9 @@
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* shared/console/polled_io.c, shared/flash/spansionFlash.c,
shared/startup/bspidle.c, shared/startup/probeMemEnd.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> 2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1. * configure.ac: Require autoconf-2.68, automake-1.11.1.

2
c/src/lib/libbsp/powerpc/shared/console/polled_io.c
View File

@@ -909,7 +909,7 @@ void printk(const char *fmt, ...) {
/* Necessary to avoid including a library, and GCC won't do this inline. */ /* Necessary to avoid including a library, and GCC won't do this inline. */
#define div10(num, rmd) \ #define div10(num, rmd) \
do { uint32_t t1, t2, t3; \ do { uint32_t t1, t2, t3; \
asm("lis %4,0xcccd; " \ __asm__ ("lis %4,0xcccd; " \
"addi %4,%4,0xffffcccd; " /* Build 0xcccccccd */ \ "addi %4,%4,0xffffcccd; " /* Build 0xcccccccd */ \
"mulhwu %3,%0+1,%4; " /* (num.l*cst.l).h */ \ "mulhwu %3,%0+1,%4; " /* (num.l*cst.l).h */ \
"mullw %2,%0,%4; " /* (num.h*cst.l).l */ \ "mullw %2,%0,%4; " /* (num.h*cst.l).l */ \

2
c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c
View File

@@ -77,7 +77,7 @@
/* Assume flash-endianness == CPU endianness */ /* Assume flash-endianness == CPU endianness */
#ifdef __PPC__ #ifdef __PPC__
#define IOSYNC(mem) do { asm volatile("eieio"); } while (0) #define IOSYNC(mem) do { __asm__ volatile("eieio"); } while (0)
#else #else
#define IOSYNC(mem) do { } while (0) #define IOSYNC(mem) do { } while (0)
#endif #endif

2
c/src/lib/libbsp/powerpc/shared/startup/bspidle.c
View File

@@ -27,7 +27,7 @@
void *bsp_idle_thread( uintptr_t ignored ) void *bsp_idle_thread( uintptr_t ignored )
{ {
for( ; ; ) { for( ; ; ) {
asm volatile( __asm__ volatile(
"mfmsr 3; oris 3,3,4; sync; mtmsr 3; isync; ori 3,3,0; ori 3,3,0" "mfmsr 3; oris 3,3,4; sync; mtmsr 3; isync; ori 3,3,0; ori 3,3,0"
); );
} }

2
c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c
View File

@@ -123,7 +123,7 @@ CPU_lockUnlockCaches(register int doLock)
register uint32_t v, x; register uint32_t v, x;
if ( _read_MSR() & MSR_VE ) { if ( _read_MSR() & MSR_VE ) {
#define DSSALL 0x7e00066c /* dssall opcode */ #define DSSALL 0x7e00066c /* dssall opcode */
asm volatile(" .long %0"::"i"(DSSALL)); __asm__ volatile(" .long %0"::"i"(DSSALL));
#undef DSSALL #undef DSSALL
} }
asm volatile("sync"); asm volatile("sync");