Changeset 634b14e in rtems

Timestamp:

11/09/11 18:51:13 (12 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, 5, master

Children:

529aa9d4

Parents:

0f7afe50

Message:

2011-11-09 Werner Almesberger <werner@…>

PR 1954/cpukit

• score/cpu/lm32/rtems/score/lm32.h: Protect against macro expansion.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• score/cpu/lm32/rtems/score/lm32.h (modified) (3 diffs)

cpukit/ChangeLog

@@ +1 @@
+2011-11-09      Werner Almesberger <werner@almesberger.net>
+
+        PR 1954/cpukit
+        * score/cpu/lm32/rtems/score/lm32.h: Protect against macro expansion.
+
 2011-11-09      Werner Almesberger <werner@almesberger.net>
 

cpukit/score/cpu/lm32/rtems/score/lm32.h

@@ -75 +75 @@
   do { register uint32_t ie; \
     __asm__ volatile ("rcsr %0,ie":"=r"(ie)); \
-    _level = ie; \
+    (_level) = ie; \
     ie &= (~0x0001); \
     __asm__ volatile ("wcsr ie,%0"::"r"(ie)); \
@@ -86 +86 @@
   do { register uint32_t ie; \
     __asm__ volatile ("wcsr ie,%0"::"r"(_level)); \
-    ie = _level & (~0x0001); \
+    ie = (_level) & (~0x0001); \
     __asm__ volatile ("wcsr ie,%0"::"r"(ie)); \
   } while (0)
@@ -100 +100 @@
   do { register uint32_t im; \
     __asm__ volatile ("rcsr %0,im":"=r"(im)); \
-    im &= ~_mask; \
+    im &= ~(_mask); \
     __asm__ volatile ("wcsr im,%0"::"r"(im)); \
   } while (0)