From 294a609e9f7b5ff5cc05057c6f3cacbd23fd6bae Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 9 Nov 2011 18:51:29 +0000 Subject: 2011-11-09 Werner Almesberger PR 1954/cpukit * rtems/score/lm32.h: Protect against macro expansion. --- cpukit/score/cpu/lm32/ChangeLog | 5 +++++ cpukit/score/cpu/lm32/rtems/score/lm32.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'cpukit') diff --git a/cpukit/score/cpu/lm32/ChangeLog b/cpukit/score/cpu/lm32/ChangeLog index 873f24bbab..81b87ba774 100644 --- a/cpukit/score/cpu/lm32/ChangeLog +++ b/cpukit/score/cpu/lm32/ChangeLog @@ -1,3 +1,8 @@ +2011-11-09 Werner Almesberger + + PR 1954/cpukit + * rtems/score/lm32.h: Protect against macro expansion. + 2011-11-09 Werner Almesberger PR 1955/cpukit diff --git a/cpukit/score/cpu/lm32/rtems/score/lm32.h b/cpukit/score/cpu/lm32/rtems/score/lm32.h index 06ad7eb398..37f211edb8 100644 --- a/cpukit/score/cpu/lm32/rtems/score/lm32.h +++ b/cpukit/score/cpu/lm32/rtems/score/lm32.h @@ -71,7 +71,7 @@ extern "C" { #define lm32_disable_interrupts( _level ) \ 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)); \ } while (0) @@ -82,7 +82,7 @@ extern "C" { #define lm32_flash_interrupts( _level ) \ 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) -- cgit v1.2.3