Loading...
--- xnu/xnu-12377.101.15/libkern/c++/OSNumber.cpp
+++ xnu/xnu-792/libkern/c++/OSNumber.cpp
@@ -1,48 +1,42 @@
/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
- * 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. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- *
- * 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
+ * @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.
+ *
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
*/
/* IOOffset.m created by rsulack on Wed 17-Sep-1997 */
-#define IOKIT_ENABLE_SHARED_PTR
+#include <sys/cdefs.h>
-#include <sys/cdefs.h>
+__BEGIN_DECLS
+extern unsigned long strtoul(const char *, char **, int);
+__END_DECLS
#include <libkern/c++/OSNumber.h>
#include <libkern/c++/OSString.h>
#include <libkern/c++/OSSerialize.h>
-#include <libkern/c++/OSSharedPtr.h>
#include <libkern/c++/OSLib.h>
#define sizeMask (~0ULL >> (64 - size))
#define super OSObject
-OSDefineMetaClassAndStructorsWithZone(OSNumber, OSObject,
- (zone_create_flags_t) (ZC_CACHING | ZC_ZFREE_CLEARMEM))
+OSDefineMetaClassAndStructors(OSNumber, OSObject)
OSMetaClassDefineReservedUnused(OSNumber, 0);
OSMetaClassDefineReservedUnused(OSNumber, 1);
@@ -53,217 +47,115 @@
OSMetaClassDefineReservedUnused(OSNumber, 6);
OSMetaClassDefineReservedUnused(OSNumber, 7);
-bool
-OSNumber::init(unsigned long long inValue, unsigned int newNumberOfBits)
+bool OSNumber::init(unsigned long long inValue, unsigned int numberOfBits)
{
- if (!super::init()) {
- return false;
- }
- if (newNumberOfBits > 64) {
- return false;
- }
+ if (!super::init())
+ return false;
- size = newNumberOfBits;
- value = (inValue & sizeMask);
+ size = numberOfBits;
+ value = (inValue & sizeMask);
- return true;
+ return true;
}
-bool
-OSNumber::init(const char *newValue, unsigned int newNumberOfBits)
+bool OSNumber::init(const char *value, unsigned int numberOfBits)
{
- return init((unsigned long long)strtoul(newValue, NULL, 0), newNumberOfBits);
+ return init((unsigned long long)strtoul(value, NULL, 0), numberOfBits);
}
-void
-OSNumber::free()
+void OSNumber::free() { super::free(); }
+
+OSNumber *OSNumber::withNumber(unsigned long long value,
+ unsigned int numberOfBits)
{
- super::free();
+ OSNumber *me = new OSNumber;
+
+ if (me && !me->init(value, numberOfBits)) {
+ me->release();
+ return 0;
+ }
+
+ return me;
}
-OSSharedPtr<OSNumber>
-OSNumber::withNumber(unsigned long long value,
- unsigned int newNumberOfBits)
+OSNumber *OSNumber::withNumber(const char *value, unsigned int numberOfBits)
{
- OSSharedPtr<OSNumber> me = OSMakeShared<OSNumber>();
+ OSNumber *me = new OSNumber;
- if (me && !me->init(value, newNumberOfBits)) {
- return nullptr;
- }
+ if (me && !me->init(value, numberOfBits)) {
+ me->release();
+ return 0;
+ }
- return me;
+ return me;
}
-OSSharedPtr<OSNumber>
-OSNumber::withNumber(const char *value, unsigned int newNumberOfBits)
+unsigned int OSNumber::numberOfBits() const { return size; }
+
+unsigned int OSNumber::numberOfBytes() const { return (size + 7) / 8; }
+
+
+unsigned char OSNumber::unsigned8BitValue() const
{
- OSSharedPtr<OSNumber> me = OSMakeShared<OSNumber>();
-
- if (me && !me->init(value, newNumberOfBits)) {
- return nullptr;
- }
-
- return me;
+ return (unsigned char) value;
}
-OSSharedPtr<OSNumber>
-OSNumber::withDouble(
- double value)
+unsigned short OSNumber::unsigned16BitValue() const
{
- OSSharedPtr<OSNumber> me = OSMakeShared<OSNumber>();
-
- if (me && !me->OSObject::init()) {
- return nullptr;
- }
- me->size = 63;
- me->fpValue = value;
-
- return me;
+ return (unsigned short) value;
}
-OSSharedPtr<OSNumber>
-OSNumber::withFloat(
- float value)
+unsigned int OSNumber::unsigned32BitValue() const
{
- OSSharedPtr<OSNumber> me = OSMakeShared<OSNumber>();
-
- if (me && !me->OSObject::init()) {
- return nullptr;
- }
- me->size = 31;
- me->fpValue = (double) value;
-
- return me;
+ return (unsigned int) value;
}
-double
-OSNumber::doubleValue() const
+unsigned long long OSNumber::unsigned64BitValue() const
{
- if ((size != 63) && (size != 31)) {
- return (double) value;
- }
- return fpValue;
+ return value;
}
-float
-OSNumber::floatValue() const
+void OSNumber::addValue(signed long long inValue)
{
- if ((size != 63) && (size != 31)) {
- return (float) value;
- }
- return (float) fpValue;
+ value = ((value + inValue) & sizeMask);
}
-unsigned int
-OSNumber::numberOfBits() const
+void OSNumber::setValue(unsigned long long inValue)
{
- return size;
+ value = (inValue & sizeMask);
}
-unsigned int
-OSNumber::numberOfBytes() const
+bool OSNumber::isEqualTo(const OSNumber *integer) const
{
- return (size + 7) / 8;
+ return((value == integer->value));
}
-
-unsigned char
-OSNumber::unsigned8BitValue() const
+bool OSNumber::isEqualTo(const OSMetaClassBase *obj) const
{
- if ((size == 63) || (size == 31)) {
- return (unsigned char) fpValue;
- }
- return (unsigned char) value;
+ OSNumber * offset;
+ if ((offset = OSDynamicCast(OSNumber, obj)))
+ return isEqualTo(offset);
+ else
+ return false;
}
-unsigned short
-OSNumber::unsigned16BitValue() const
+bool OSNumber::serialize(OSSerialize *s) const
{
- if ((size == 63) || (size == 31)) {
- return (unsigned short) fpValue;
- }
- return (unsigned short) value;
+ char temp[32];
+
+ if (s->previouslySerialized(this)) return true;
+
+ sprintf(temp, "integer size=\"%d\"", size);
+ if (!s->addXMLStartTag(this, temp)) return false;
+
+ //XXX sprintf(temp, "0x%qx", value);
+ if ((value >> 32)) {
+ sprintf(temp, "0x%lx%08lx", (unsigned long)(value >> 32),
+ (unsigned long)(value & 0xFFFFFFFF));
+ } else {
+ sprintf(temp, "0x%lx", (unsigned long)value);
+ }
+ if (!s->addString(temp)) return false;
+
+ return s->addXMLEndTag("integer");
}
-
-unsigned int
-OSNumber::unsigned32BitValue() const
-{
- if ((size == 63) || (size == 31)) {
- return (unsigned int) fpValue;
- }
- return (unsigned int) value;
-}
-
-unsigned long long
-OSNumber::unsigned64BitValue() const
-{
- if ((size == 63) || (size == 31)) {
- return (unsigned long long) fpValue;
- }
- return value;
-}
-
-void
-OSNumber::addValue(signed long long inValue)
-{
- if ((size == 63) || (size == 31)) {
- fpValue += inValue;
- } else {
- value = ((value + inValue) & sizeMask);
- }
-}
-
-void
-OSNumber::setValue(unsigned long long inValue)
-{
- if ((size == 63) || (size == 31)) {
- fpValue = (double) inValue;
- } else {
- value = (inValue & sizeMask);
- }
-}
-
-bool
-OSNumber::isEqualTo(const OSNumber *integer) const
-{
- return unsigned64BitValue() == integer->unsigned64BitValue();
-}
-
-bool
-OSNumber::isEqualTo(const OSMetaClassBase *obj) const
-{
- OSNumber * offset;
- if ((offset = OSDynamicCast(OSNumber, obj))) {
- return isEqualTo(offset);
- } else {
- return false;
- }
-}
-
-bool
-OSNumber::serialize(OSSerialize *s) const
-{
- char temp[32];
-
- if (s->previouslySerialized(this)) {
- return true;
- }
-
- snprintf(temp, sizeof(temp), "integer size=\"%d\"", size);
- if (!s->addXMLStartTag(this, temp)) {
- return false;
- }
-
- //XXX sprintf(temp, "0x%qx", value);
- if ((value >> 32)) {
- snprintf(temp, sizeof(temp), "0x%lx%08lx", (unsigned long)(value >> 32),
- (unsigned long)(value & 0xFFFFFFFF));
- } else {
- snprintf(temp, sizeof(temp), "0x%lx", (unsigned long)value);
- }
- if (!s->addString(temp)) {
- return false;
- }
-
- return s->addXMLEndTag("integer");
-}