From f4a8ee1c55788aeb053ede7571b07906a9847a45 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 17 Mar 1999 16:01:03 +0000
Subject: Unlimited objects patch from Chris Johns <ccj@acm.org>.  Email
 follows:

    First, the unlimited patch. I have compiled the unlmited patch for the
    Linux posix BSP only and it seems to work cleanly. I would like a really
    major application run on this change before commiting as the changes are
    very core and significant. I am currently building all the tests to run.

    I have no targets suitable to test on at the moment.

    I have tested the patch for inline functions and macros.

    Turning macros on has found some core bugs. I have fixed these but have
    not run all the tests. Please review the patch for these changes. They
    are:

    1) The conditional compilation for MP support broke the core messages
    code. You cannot embed a conditional macro in another macro. The Send
    and Urgent Send calls are macros.

    2) User extensions handler initialisation now has two parameters. I have
    updated the macros to support the extra parameter.

    The patch also contains the gcc-target-default.cfg fix required to build
    the kernel. More of a by product than a fix for you.
---
 cpukit/score/inline/rtems/score/coremsg.inl |  8 +++++
 cpukit/score/inline/rtems/score/object.inl  | 56 ++++++++++++++++++++++-------
 2 files changed, 51 insertions(+), 13 deletions(-)

(limited to 'cpukit/score/inline')

diff --git a/cpukit/score/inline/rtems/score/coremsg.inl b/cpukit/score/inline/rtems/score/coremsg.inl
index a43b0e7b06..d4dafd8fdc 100644
--- a/cpukit/score/inline/rtems/score/coremsg.inl
+++ b/cpukit/score/inline/rtems/score/coremsg.inl
@@ -41,7 +41,11 @@ RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Send(
     buffer,
     size,
     id,
+#if defined(RTEMS_MULTIPROCESSING)
     api_message_queue_mp_support,
+#else
+    NULL,
+#endif
     CORE_MESSAGE_QUEUE_SEND_REQUEST
   );
 }
@@ -68,7 +72,11 @@ RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Urgent(
     buffer,
     size,
     id,
+#if defined(RTEMS_MULTIPROCESSING)
     api_message_queue_mp_support,
+#else
+    NULL,
+#endif
     CORE_MESSAGE_QUEUE_URGENT_REQUEST
  );
 }
diff --git a/cpukit/score/inline/rtems/score/object.inl b/cpukit/score/inline/rtems/score/object.inl
index 7e4d12aeec..ce149f33d8 100644
--- a/cpukit/score/inline/rtems/score/object.inl
+++ b/cpukit/score/inline/rtems/score/object.inl
@@ -158,37 +158,67 @@ RTEMS_INLINE_ROUTINE boolean _Objects_Are_ids_equal(
 
 /*PAGE
  *
- *  _Objects_Allocate
+ *  _Objects_Get_local_object
  *
  *  DESCRIPTION:
  *
- *  This function allocates a object control block from
- *  the inactive chain of free object control blocks.
+ *  This function returns a pointer to the local_table object
+ *  referenced by the index.
  */
 
-RTEMS_INLINE_ROUTINE Objects_Control *_Objects_Allocate(
-  Objects_Information *information
+RTEMS_INLINE_ROUTINE Objects_Control *_Objects_Get_local_object(
+  Objects_Information *information,
+  unsigned32           index
 )
 {
-  return (Objects_Control *) _Chain_Get( &information->Inactive );
+  if ( index > information->maximum)
+    return NULL;
+  return ( information->local_table[ index ] );
 }
 
 /*PAGE
  *
- *  _Objects_Free
+ *  _Objects_Set_local_object
  *
  *  DESCRIPTION:
  *
- *  This function frees a object control block to the
- *  inactive chain of free object control blocks.
+ *  This function sets the pointer to the local_table object
+ *  referenced by the index.
  */
 
-RTEMS_INLINE_ROUTINE void _Objects_Free(
+RTEMS_INLINE_ROUTINE void _Objects_Set_local_object(
   Objects_Information *information,
+  unsigned32           index,
   Objects_Control     *the_object
 )
 {
-  _Chain_Append( &information->Inactive, &the_object->Node );
+  if ( index <= information->maximum)
+    information->local_table[ index ] = the_object;
+}
+
+
+/*PAGE
+ *
+ *  _Objects_Get_information
+ *
+ *  DESCRIPTION:
+ *
+ *  This function return the information structure given
+ *  an id of an object.
+ */
+ 
+RTEMS_INLINE_ROUTINE Objects_Information *_Objects_Get_information(
+  Objects_Id  id
+)
+{
+  Objects_Classes  the_class;
+
+  the_class = _Objects_Get_class( id );
+
+  if ( !_Objects_Is_class_valid( the_class ) )
+    return NULL;
+
+  return _Objects_Information_table[ the_class ];
 }
 
 /*PAGE
@@ -210,7 +240,7 @@ RTEMS_INLINE_ROUTINE void _Objects_Open(
   unsigned32  index;
 
   index = _Objects_Get_index( the_object->id );
-  information->local_table[ index ] = the_object;
+  _Objects_Set_local_object( information, index, the_object );
 
   if ( information->is_string ) 
     _Objects_Copy_name_string( name, the_object->name );
@@ -236,7 +266,7 @@ RTEMS_INLINE_ROUTINE void _Objects_Close(
   unsigned32 index;
 
   index = _Objects_Get_index( the_object->id );
-  information->local_table[ index ] = (Objects_Control *) NULL;
+  _Objects_Set_local_object( information, index, NULL );
   _Objects_Clear_name( the_object->name, information->name_length );
 }
 
-- 
cgit v1.2.3