2007-11-09 Joel Sherrill <joel.sherrill@OARcorp.com>

	* sapi/src/exinit.c, score/Makefile.am,
	score/include/rtems/score/apimutex.h: API Mutex calls should never
	have been inlined. Inlining them lead to many inlined copies of core
	mutex lock. This lead to over 2K savings in the SPARC/ERC32
	minimum.exe.
	* score/src/apimutex.c, score/src/apimutexallocate.c,
	score/src/apimutexlock.c, score/src/apimutexunlock.c: New files.

4 files changed, 141 insertions, 0 deletions

diff --git a/cpukit/score/src/apimutex.c b/cpukit/score/src/apimutex.c
new file mode 100644
index 0000000000..48c25fbef2
--- /dev/null
+++ b/cpukit/score/src/apimutex.c
@@ -0,0 +1,37 @@
+/*
+ *  COPYRIGHT (c) 1989-2007.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/system.h>
+#include <rtems/score/apimutex.h>
+
+void _API_Mutex_Initialization(
+  uint32_t maximum_mutexes
+)
+{
+  _Objects_Initialize_information(
+    &_API_Mutex_Information,     /* object information table */
+    OBJECTS_INTERNAL_API,        /* object API */
+    OBJECTS_INTERNAL_MUTEXES,    /* object class */
+    maximum_mutexes,             /* maximum objects of this class */
+    sizeof( API_Mutex_Control ), /* size of this object's control block */
+    FALSE,                       /* TRUE if the name is a string */
+    0                            /* maximum length of an object name */
+#if defined(RTEMS_MULTIPROCESSING)
+    ,
+    TRUE,                        /* TRUE if this is a global object class */
+    NULL                         /* Proxy extraction support callout */
+#endif
+  );
+}
diff --git a/cpukit/score/src/apimutexallocate.c b/cpukit/score/src/apimutexallocate.c
new file mode 100644
index 0000000000..b346af42f2
--- /dev/null
+++ b/cpukit/score/src/apimutexallocate.c
@@ -0,0 +1,40 @@
+/*
+ *  COPYRIGHT (c) 1989-2007.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/system.h>
+#include <rtems/score/apimutex.h>
+
+void _API_Mutex_Allocate(
+  API_Mutex_Control **the_mutex
+)
+{
+  API_Mutex_Control *mutex;
+  CORE_mutex_Attributes attr =  {
+      CORE_MUTEX_NESTING_IS_ERROR,
+      FALSE,
+      CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT,
+      0
+    };
+
+  mutex = (API_Mutex_Control *) _Objects_Allocate( &_API_Mutex_Information );
+
+  _CORE_mutex_Initialize( 
+    &mutex->Mutex,
+    &attr,
+    CORE_MUTEX_UNLOCKED
+  );
+
+  *the_mutex = mutex;
+}
diff --git a/cpukit/score/src/apimutexlock.c b/cpukit/score/src/apimutexlock.c
new file mode 100644
index 0000000000..ca824a6e6c
--- /dev/null
+++ b/cpukit/score/src/apimutexlock.c
@@ -0,0 +1,30 @@
+/*
+ *  COPYRIGHT (c) 1989-2007.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/system.h>
+#include <rtems/score/apimutex.h>
+
+void _API_Mutex_Unlock(
+  API_Mutex_Control *the_mutex
+)
+{
+  _Thread_Disable_dispatch();
+    _CORE_mutex_Surrender(
+      &the_mutex->Mutex,
+      the_mutex->Object.id,
+      NULL
+   );
+  _Thread_Enable_dispatch();
+}
diff --git a/cpukit/score/src/apimutexunlock.c b/cpukit/score/src/apimutexunlock.c
new file mode 100644
index 0000000000..3618af1d8a
--- /dev/null
+++ b/cpukit/score/src/apimutexunlock.c
@@ -0,0 +1,34 @@
+/*
+ *  COPYRIGHT (c) 1989-2007.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/system.h>
+#include <rtems/score/apimutex.h>
+
+void _API_Mutex_Lock(
+  API_Mutex_Control *the_mutex
+)
+{
+  ISR_Level level; 
+
+  _ISR_Disable( level );
+
+  _CORE_mutex_Seize(
+    &the_mutex->Mutex,
+    the_mutex->Object.id,
+    TRUE,
+    0,
+    level
+  );
+}