Index: ChangeLog

===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libcpu/powerpc/ChangeLog,v
retrieving revision 1.309
diff -u -r1.309 ChangeLog
--- ChangeLog	20 Aug 2008 17:29:18 -0000	1.309
+++ ChangeLog	22 Aug 2008 13:35:03 -0000
@@ -1,3 +1,8 @@
+2008-08-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* shared/include/powerpc-utility.h: Fixed parameter evaluation in
+	special purpose register macros.
+
 2008-08-20	Sebastian Huber <sebastian.huber@embedded-brains.de>

 	* mpc55xx/fec/fec.c: Added copyright information.
This commit is contained in:
Joel Sherrill
2008-08-22 13:35:08 +00:00
parent 5dfb320c55
commit a78df7ba0c
2 changed files with 21 additions and 8 deletions

View File

@@ -1,3 +1,8 @@
2008-08-22 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/include/powerpc-utility.h: Fixed parameter evaluation in
special purpose register macros.
2008-08-20 Sebastian Huber <sebastian.huber@embedded-brains.de> 2008-08-20 Sebastian Huber <sebastian.huber@embedded-brains.de>
* mpc55xx/fec/fec.c: Added copyright information. * mpc55xx/fec/fec.c: Added copyright information.

View File

@@ -282,9 +282,10 @@ static inline void ppc_set_decrementer_register( uint32_t dec)
do { \ do { \
rtems_interrupt_level level; \ rtems_interrupt_level level; \
uint32_t val; \ uint32_t val; \
uint32_t mybits = bits; \
rtems_interrupt_disable( level); \ rtems_interrupt_disable( level); \
val = PPC_SPECIAL_PURPOSE_REGISTER( spr); \ val = PPC_SPECIAL_PURPOSE_REGISTER( spr); \
val |= bits; \ val |= mybits; \
PPC_SET_SPECIAL_PURPOSE_REGISTER( spr, val); \ PPC_SET_SPECIAL_PURPOSE_REGISTER( spr, val); \
rtems_interrupt_enable( level); \ rtems_interrupt_enable( level); \
} while (0) } while (0)
@@ -300,10 +301,12 @@ static inline void ppc_set_decrementer_register( uint32_t dec)
do { \ do { \
rtems_interrupt_level level; \ rtems_interrupt_level level; \
uint32_t val; \ uint32_t val; \
uint32_t mybits = bits; \
uint32_t mymask = mask; \
rtems_interrupt_disable( level); \ rtems_interrupt_disable( level); \
val = PPC_SPECIAL_PURPOSE_REGISTER( spr); \ val = PPC_SPECIAL_PURPOSE_REGISTER( spr); \
val &= ~mask; \ val &= ~mymask; \
val |= bits; \ val |= mybits; \
PPC_SET_SPECIAL_PURPOSE_REGISTER( spr, val); \ PPC_SET_SPECIAL_PURPOSE_REGISTER( spr, val); \
rtems_interrupt_enable( level); \ rtems_interrupt_enable( level); \
} while (0) } while (0)
@@ -318,9 +321,10 @@ static inline void ppc_set_decrementer_register( uint32_t dec)
do { \ do { \
rtems_interrupt_level level; \ rtems_interrupt_level level; \
uint32_t val; \ uint32_t val; \
uint32_t mybits = bits; \
rtems_interrupt_disable( level); \ rtems_interrupt_disable( level); \
val = PPC_SPECIAL_PURPOSE_REGISTER( spr); \ val = PPC_SPECIAL_PURPOSE_REGISTER( spr); \
val &= ~bits; \ val &= ~mybits; \
PPC_SET_SPECIAL_PURPOSE_REGISTER( spr, val); \ PPC_SET_SPECIAL_PURPOSE_REGISTER( spr, val); \
rtems_interrupt_enable( level); \ rtems_interrupt_enable( level); \
} while (0) } while (0)
@@ -367,9 +371,10 @@ static inline void ppc_set_decrementer_register( uint32_t dec)
do { \ do { \
rtems_interrupt_level level; \ rtems_interrupt_level level; \
uint32_t val; \ uint32_t val; \
uint32_t mybits = bits; \
rtems_interrupt_disable( level); \ rtems_interrupt_disable( level); \
val = PPC_DEVICE_CONTROL_REGISTER( dcr); \ val = PPC_DEVICE_CONTROL_REGISTER( dcr); \
val |= bits; \ val |= mybits; \
PPC_SET_DEVICE_CONTROL_REGISTER( dcr, val); \ PPC_SET_DEVICE_CONTROL_REGISTER( dcr, val); \
rtems_interrupt_enable( level); \ rtems_interrupt_enable( level); \
} while (0) } while (0)
@@ -385,10 +390,12 @@ static inline void ppc_set_decrementer_register( uint32_t dec)
do { \ do { \
rtems_interrupt_level level; \ rtems_interrupt_level level; \
uint32_t val; \ uint32_t val; \
uint32_t mybits = bits; \
uint32_t mymask = mask; \
rtems_interrupt_disable( level); \ rtems_interrupt_disable( level); \
val = PPC_DEVICE_CONTROL_REGISTER( dcr); \ val = PPC_DEVICE_CONTROL_REGISTER( dcr); \
val &= ~mask; \ val &= ~mymask; \
val |= bits; \ val |= mybits; \
PPC_SET_DEVICE_CONTROL_REGISTER( dcr, val); \ PPC_SET_DEVICE_CONTROL_REGISTER( dcr, val); \
rtems_interrupt_enable( level); \ rtems_interrupt_enable( level); \
} while (0) } while (0)
@@ -403,9 +410,10 @@ static inline void ppc_set_decrementer_register( uint32_t dec)
do { \ do { \
rtems_interrupt_level level; \ rtems_interrupt_level level; \
uint32_t val; \ uint32_t val; \
uint32_t mybits = bits; \
rtems_interrupt_disable( level); \ rtems_interrupt_disable( level); \
val = PPC_DEVICE_CONTROL_REGISTER( dcr); \ val = PPC_DEVICE_CONTROL_REGISTER( dcr); \
val &= ~bits; \ val &= ~mybits; \
PPC_SET_DEVICE_CONTROL_REGISTER( dcr, val); \ PPC_SET_DEVICE_CONTROL_REGISTER( dcr, val); \
rtems_interrupt_enable( level); \ rtems_interrupt_enable( level); \
} while (0) } while (0)