From 3b4413c08f0e028f0095ec5b50f90e4169e6689b Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 6 Jul 2000 19:09:27 +0000
Subject: Directly index local table to avoid error check.

---
 cpukit/score/src/objectallocatebyindex.c |  2 +-
 cpukit/score/src/objectget.c             | 17 +++++++----------
 cpukit/score/src/objectgetbyindex.c      |  3 ++-
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'cpukit/score/src')

diff --git a/cpukit/score/src/objectallocatebyindex.c b/cpukit/score/src/objectallocatebyindex.c
index d46399c535..6de641ae0c 100644
--- a/cpukit/score/src/objectallocatebyindex.c
+++ b/cpukit/score/src/objectallocatebyindex.c
@@ -44,7 +44,7 @@ Objects_Control *_Objects_Allocate_by_index(
   Objects_Control *the_object;
 
   if ( index && information->maximum >= index ) {
-    the_object = _Objects_Get_local_object( information, index );
+    the_object = information->local_table[ index ];
     if ( the_object )
       return NULL;
 
diff --git a/cpukit/score/src/objectget.c b/cpukit/score/src/objectget.c
index 91e44d28cf..01d8683ca7 100644
--- a/cpukit/score/src/objectget.c
+++ b/cpukit/score/src/objectget.c
@@ -53,26 +53,23 @@ Objects_Control *_Objects_Get(
   Objects_Control *the_object;
   unsigned32       index;
 
-  index = _Objects_Get_index( id );
+  /* index = _Objects_Get_index( id ); */
+  index = (unsigned16) id;
 
   if ( information->maximum >= index ) {
     _Thread_Disable_dispatch();
-    if ( (the_object = _Objects_Get_local_object( information, index )) != NULL ) {
+    if ( (the_object = information->local_table[ index ]) != NULL ) {
       *location = OBJECTS_LOCAL;
-      return( the_object );
+      return the_object;
     }
     _Thread_Enable_dispatch();
     *location = OBJECTS_ERROR;
-    return( NULL );
+    return NULL;
   }
   *location = OBJECTS_ERROR;
+
 #if defined(RTEMS_MULTIPROCESSING)
-  _Objects_MP_Is_remote(
-    information,
-    _Objects_Build_id( information->the_class, _Objects_Local_node, index ),
-    location,
-    &the_object
-  );
+  _Objects_MP_Is_remote( information, id, location, &the_object );
   return the_object;
 #else
   return NULL;
diff --git a/cpukit/score/src/objectgetbyindex.c b/cpukit/score/src/objectgetbyindex.c
index 6cfc2b98cd..7c7c89c2af 100644
--- a/cpukit/score/src/objectgetbyindex.c
+++ b/cpukit/score/src/objectgetbyindex.c
@@ -54,7 +54,8 @@ Objects_Control *_Objects_Get_by_index(
 
   if ( information->maximum >= index ) {
     _Thread_Disable_dispatch();
-    if ( (the_object = _Objects_Get_local_object( information, index )) != NULL ) {
+    the_object = information->local_table[ index ];
+    if ( the_object ) {
       *location = OBJECTS_LOCAL;
       return( the_object );
     }
-- 
cgit v1.2.3