--- xnu/xnu-124.7/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-344.21.74/libkern/c++/OSMetaClass.cpp
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -46,6 +49,7 @@
 #include <kern/lock.h>
 #include <kern/clock.h>
 #include <kern/thread_call.h>
+#include <kern/host.h>
 #include <mach/kmod.h>
 #include <mach/mach_interface.h>
 
@@ -84,12 +88,16 @@
 static const char OSMetaClassBasePanicMsg[] =
     "OSMetaClassBase::_RESERVEDOSMetaClassBase%d called\n";
 
+#if SLOT_USED
 void OSMetaClassBase::_RESERVEDOSMetaClassBase0()
     { panic(OSMetaClassBasePanicMsg, 0); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase1()
     { panic(OSMetaClassBasePanicMsg, 1); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase2()
     { panic(OSMetaClassBasePanicMsg, 2); }
+#endif /* SLOT_USED */
+
+// As these slots are used move them up inside the #if above
 void OSMetaClassBase::_RESERVEDOSMetaClassBase3()
     { panic(OSMetaClassBasePanicMsg, 3); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase4()
@@ -98,6 +106,28 @@
     { panic(OSMetaClassBasePanicMsg, 5); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase6()
     { panic(OSMetaClassBasePanicMsg, 6); }
+    
+/*
+ * These used to be inline in the header but gcc didn't believe us
+ * Now we MUST pull the inline out at least until the compiler is
+ * repaired.
+ */
+// Helper inlines for runtime type preprocessor macros
+OSMetaClassBase *OSMetaClassBase::
+safeMetaCast(const OSMetaClassBase *me, const OSMetaClass *toType)
+    { return (me)? me->metaCast(toType) : 0; }
+
+bool OSMetaClassBase::
+checkTypeInst(const OSMetaClassBase *inst, const OSMetaClassBase *typeinst)
+{
+    const OSMetaClass *toType = OSTypeIDInst(typeinst);
+    return typeinst && inst && (0 != inst->metaCast(toType));
+}
+
+
+// If you need this slot you had better setup an IOCTL style interface.
+// 'Cause the whole kernel world depends on OSMetaClassBase and YOU
+// CANT change the VTABLE size ever.
 void OSMetaClassBase::_RESERVEDOSMetaClassBase7()
     { panic(OSMetaClassBasePanicMsg, 7); }
 
@@ -141,7 +171,7 @@
 
 OSMetaClassBase *OSMetaClassBase::metaCast(const char *toMetaCStr) const
 {
-    const OSSymbol *tempSymb = OSSymbol::withCStringNoCopy(toMetaCStr);
+    const OSSymbol *tempSymb = OSSymbol::withCString(toMetaCStr);
     OSMetaClassBase *ret = 0;
     if (tempSymb) {
         ret = metaCast(tempSymb);
@@ -296,12 +326,13 @@
     }
 }
 
-// Don't do anything as these classes must be statically allocated
 void *OSMetaClass::operator new(size_t size) { return 0; }
-void OSMetaClass::operator delete(void *mem, size_t size) { }
 void OSMetaClass::retain() const { }
 void OSMetaClass::release() const { }
-void OSMetaClass::release(int when) const { };
+void OSMetaClass::release(int when) const { }
+void OSMetaClass::taggedRetain(const void *tag) const { }
+void OSMetaClass::taggedRelease(const void *tag) const { }
+void OSMetaClass::taggedRelease(const void *tag, const int when) const { }
 int  OSMetaClass::getRetainCount() const { return 0; }
 
 const char *OSMetaClass::getClassName() const
@@ -318,10 +349,10 @@
 {
     if (!loadLock) {
         loadLock = mutex_alloc(ETAP_IO_AHA);
-	_mutex_lock(loadLock);
+	mutex_lock(loadLock);
     }
     else
-	_mutex_lock(loadLock);
+	mutex_lock(loadLock);
 
     sStalled = (StalledData *) kalloc(sizeof(*sStalled));
     if (sStalled) {
@@ -464,10 +495,10 @@
 
     if (!loadLock) {
         loadLock = mutex_alloc(ETAP_IO_AHA);
-	_mutex_lock(loadLock);
+	mutex_lock(loadLock);
     }
     else
-	_mutex_lock(loadLock);
+	mutex_lock(loadLock);
 
     do {
 	OSSet *kmodClasses;
@@ -531,11 +562,11 @@
     OSCollectionIterator *kmods;
     OSCollectionIterator *classes;
     OSMetaClass *checkClass;
-    kmod_info_t *ki;
+    kmod_info_t *ki = 0;
     kern_return_t ret;
     bool didUnload;
 
-    _mutex_lock(loadLock);
+    mutex_lock(loadLock);
 
     do {
 
@@ -546,12 +577,18 @@
         didUnload = false;
         while ( (kmodName = (OSSymbol *) kmods->getNextObject()) ) {
 
-            ki = kmod_lookupbyname((char *)kmodName->getCStringNoCopy());
+            if (ki) {
+                kfree(ki, sizeof(kmod_info_t));
+                ki = 0;
+            }
+
+            ki = kmod_lookupbyname_locked((char *)kmodName->getCStringNoCopy());
             if (!ki)
                 continue;
 
-            if (ki->reference_count)
-                continue;
+            if (ki->reference_count) {
+                 continue;
+            }
 
             kmodClasses = OSDynamicCast(OSSet,
                                 sKModClassesDict->getObject(kmodName));
@@ -570,7 +607,7 @@
                 didUnload = true;
             }
 
-        } while (false);
+        }
 
         kmods->release();
 
@@ -584,7 +621,7 @@
     static thread_call_t unloadCallout;
     AbsoluteTime when;
 
-    _mutex_lock(loadLock);
+    mutex_lock(loadLock);
 
     if (!unloadCallout)
         unloadCallout = thread_call_allocate(&_OSMetaClassConsiderUnloads, 0);
@@ -630,7 +667,7 @@
 OSObject *OSMetaClass::allocClassWithName(const OSSymbol *name)
 {
     OSObject * result;
-    _mutex_lock(loadLock);
+    mutex_lock(loadLock);
 
     const OSMetaClass * const meta = getMetaClassWithName(name);
 
@@ -665,7 +702,7 @@
 checkMetaCastWithName(const OSSymbol *name, const OSMetaClassBase *in)
 {
     OSMetaClassBase * result;
-    _mutex_lock(loadLock);
+    mutex_lock(loadLock);
     const OSMetaClass * const meta = getMetaClassWithName(name);
 
     if (meta)