2007-11-30 Glenn Humphrey <glenn.humphrey@OARcorp.com>

	* posix/include/rtems/posix/mutex.h,
	posix/include/rtems/posix/semaphore.h, posix/src/cancel.c,
	posix/src/conddestroy.c, posix/src/condsignalsupp.c,
	posix/src/condwaitsupp.c, posix/src/keydelete.c,
	posix/src/keygetspecific.c, posix/src/keysetspecific.c,
	posix/src/mqueueclose.c, posix/src/mqueuegetattr.c,
	posix/src/mqueuenotify.c, posix/src/mqueuerecvsupp.c,
	posix/src/mqueuesendsupp.c, posix/src/mqueuesetattr.c,
	posix/src/mqueuetranslatereturncode.c, posix/src/mutexdestroy.c,
	posix/src/mutexgetprioceiling.c, posix/src/mutexinit.c,
	posix/src/mutexlocksupp.c, posix/src/mutexsetprioceiling.c,
	posix/src/mutexunlock.c, posix/src/pbarrierdestroy.c,
	posix/src/pbarriertranslatereturncode.c, posix/src/pbarrierwait.c,
	posix/src/prwlockdestroy.c, posix/src/prwlockrdlock.c,
	posix/src/prwlocktimedrdlock.c, posix/src/prwlocktimedwrlock.c,
	posix/src/prwlocktranslatereturncode.c, posix/src/prwlocktryrdlock.c,
	posix/src/prwlocktrywrlock.c, posix/src/prwlockunlock.c,
	posix/src/prwlockwrlock.c, posix/src/pspindestroy.c,
	posix/src/pspinlock.c, posix/src/pspinlocktranslatereturncode.c,
	posix/src/pspintrylock.c, posix/src/pspinunlock.c,
	posix/src/pthreaddetach.c, posix/src/pthreadequal.c,
	posix/src/pthreadgetschedparam.c, posix/src/pthreadjoin.c,
	posix/src/pthreadkill.c, posix/src/pthreadsetschedparam.c,
	posix/src/ptimer1.c, posix/src/semaphorewaitsupp.c,
	posix/src/semclose.c, posix/src/semdestroy.c,
	posix/src/semgetvalue.c, posix/src/sempost.c, posix/src/types.c,
	rtems/src/msgqtranslatereturncode.c, rtems/src/semobtain.c,
	rtems/src/timerfireafter.c, score/include/rtems/system.h,
	score/include/rtems/score/corebarrier.h,
	score/include/rtems/score/coremsg.h,
	score/include/rtems/score/coremutex.h,
	score/include/rtems/score/coresem.h: Restructed to move the
	OBJECTS_LOCAL case to the top of the switch statement and
        eliminate the fall-through return of POSIX_BOTTOM_REACHED.  These
	changes produced simplier assembly code and allowed for complete
	test coverage.  Also applied some consistency to the functions
	that translate the core status codes to POSIX status codes.
	* posix/src/mutextranslatereturncode.c,
	posix/src/semaphoretranslatereturncode.c: New files.
	* posix/src/mutexfromcorestatus.c: Removed.

1 files changed, 11 insertions, 7 deletions

diff --git a/cpukit/posix/src/pspinlocktranslatereturncode.c b/cpukit/posix/src/pspinlocktranslatereturncode.c
index 3b45d72e6b..fbce440010 100644
--- a/cpukit/posix/src/pspinlocktranslatereturncode.c
+++ b/cpukit/posix/src/pspinlocktranslatereturncode.c
@@ -1,7 +1,7 @@
 /*
  *  Spinlock Manager -- Translate SuperCore Status
  *
- *  COPYRIGHT (c) 1989-2006.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -19,7 +19,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/spinlock.h>
+#include <rtems/score/corespinlock.h>
 
 /*
  *  _POSIX_Spinlock_Translate_core_spinlock_return_code
@@ -32,8 +32,7 @@
  *
  */
 
-/* XXX fix me */
-static int _POSIX_Spinlock_Return_codes[] = {
+static int _POSIX_Spinlock_Return_codes[CORE_SPINLOCK_STATUS_LAST + 1] = {
   0,                        /* CORE_SPINLOCK_SUCCESSFUL */
   EDEADLK,                  /* CORE_SPINLOCK_HOLDER_RELOCKING */
   EPERM,                    /* CORE_SPINLOCK_NOT_HOLDER */
@@ -48,7 +47,12 @@ int _POSIX_Spinlock_Translate_core_spinlock_return_code(
   CORE_spinlock_Status  the_spinlock_status
 )
 {
-  if ( the_spinlock_status <= CORE_SPINLOCK_STATUS_LAST )
-    return _POSIX_Spinlock_Return_codes[the_spinlock_status];
-  return POSIX_BOTTOM_REACHED();
+  /*
+   *  Internal consistency check for bad status from SuperCore
+   */
+  #if defined(RTEMS_DEBUG)
+    if ( the_spinlock_status > CORE_SPINLOCK_STATUS_LAST )
+      return EINVAL;
+  #endif
+  return _POSIX_Spinlock_Return_codes[the_spinlock_status];
 }