Changeset 4ff7e0f in rtems


Ignore:
Timestamp:
Jan 9, 2008, 8:49:44 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
b9e23917
Parents:
43fa4fc
Message:

2008-01-09 Joel Sherrill <joel.sherrill@…>

  • score/src/objectgetnoprotection.c: Eliminate duplicate exit path code when there is an error.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r43fa4fc r4ff7e0f  
     12008-01-09      Joel Sherrill <joel.sherrill@OARcorp.com>
     2
     3        * score/src/objectgetnoprotection.c: Eliminate duplicate exit path code
     4        when there is an error.
     5
    162008-01-09      Jennifer Averett <jennifer.averett@OARcorp.com>
    27
  • cpukit/score/src/objectgetnoprotection.c

    r43fa4fc r4ff7e0f  
    5858  uint32_t         index;
    5959
    60 #if defined(RTEMS_MULTIPROCESSING)
     60  /*
     61   * You can't just extract the index portion or you can get tricked
     62   * by a value between 1 and maximum.
     63   */
    6164  index = id - information->minimum_id + 1;
    62 #else
    63   /* index = _Objects_Get_index( id ); */
    64   index = id & 0x0000ffff;
    65   /* This should work but doesn't always :( */
    66   /* index = (uint16_t  ) id; */
    67 #endif
    6865
    69    if ( information->maximum >= index ) {
     66  if ( information->maximum >= index ) {
    7067    if ( (the_object = information->local_table[ index ]) != NULL ) {
    7168      *location = OBJECTS_LOCAL;
    7269      return the_object;
    7370    }
    74     *location = OBJECTS_ERROR;
    75     return NULL;
    7671  }
     72
     73  /*
     74   *  This isn't supported or required yet for Global objects so
     75   *  if it isn't local, we don't find it.
     76   */
    7777  *location = OBJECTS_ERROR;
    78 
    79 /*
    80  *  Not supported for multiprocessing
    81  */
    8278  return NULL;
    8379}
Note: See TracChangeset for help on using the changeset viewer.