From b804d632c02ceb4414411f1ca5ab909c6d2ea91c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 20 Dec 2001 17:30:18 +0000 Subject: 2001-12-19 Ralf Corsepius * inline/rtems/score/object.inl, macros/rtems/score/object.inl: Add add casts to Objects_Id in _Objects_Build_ids to avoid implicit typecasts from enum to int16 on bit16 targets (here: h8300). --- cpukit/score/ChangeLog | 6 ++++++ cpukit/score/inline/rtems/score/object.inl | 6 +++--- cpukit/score/macros/rtems/score/object.inl | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'cpukit') diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog index 6d0cdb845b..e9080fa295 100644 --- a/cpukit/score/ChangeLog +++ b/cpukit/score/ChangeLog @@ -1,3 +1,9 @@ +2001-12-19 Ralf Corsepius + + * inline/rtems/score/object.inl, macros/rtems/score/object.inl: Add + add casts to Objects_Id in _Objects_Build_ids to avoid implicit + typecasts from enum to int16 on bit16 targets (here: h8300). + 2001-12-19 Ralf Corsepius * src/Makefile.am: Add multilib support. diff --git a/cpukit/score/inline/rtems/score/object.inl b/cpukit/score/inline/rtems/score/object.inl index 82a59b03d0..c24e43f276 100644 --- a/cpukit/score/inline/rtems/score/object.inl +++ b/cpukit/score/inline/rtems/score/object.inl @@ -32,9 +32,9 @@ RTEMS_INLINE_ROUTINE Objects_Id _Objects_Build_id( unsigned32 index ) { - return (the_class << OBJECTS_CLASS_START_BIT) | - (node << OBJECTS_NODE_START_BIT) | - (index << OBJECTS_INDEX_START_BIT); + return (( (Objects_Id) the_class ) << OBJECTS_CLASS_START_BIT) | + (( (Objects_Id) node ) << OBJECTS_NODE_START_BIT) | + (( (Objects_Id) index ) << OBJECTS_INDEX_START_BIT); } /*PAGE diff --git a/cpukit/score/macros/rtems/score/object.inl b/cpukit/score/macros/rtems/score/object.inl index bb0070f269..f806cadafc 100644 --- a/cpukit/score/macros/rtems/score/object.inl +++ b/cpukit/score/macros/rtems/score/object.inl @@ -23,9 +23,9 @@ */ #define _Objects_Build_id( _the_class, _node, _index ) \ - ( ((_the_class) << OBJECTS_CLASS_START_BIT) | \ - ((_node) << OBJECTS_NODE_START_BIT) | \ - ((_index) << OBJECTS_INDEX_START_BIT) ) + ( (( (Objects_Id) the_class ) << OBJECTS_CLASS_START_BIT) | \ + (( (Objects_Id) node ) << OBJECTS_NODE_START_BIT) | \ + (( (Objects_Id) index ) << OBJECTS_INDEX_START_BIT) ) /*PAGE * -- cgit v1.2.3