/*
- * Copyright (c) 1999-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_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.
+ * 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.
*
- * 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
+ * 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
#ifndef _OS_OSBYTEORDERI386_H
#include <stdint.h>
#if !defined(OS_INLINE)
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-# define OS_INLINE static inline
-# elif defined(__MWERKS__) || defined(__cplusplus)
# define OS_INLINE static inline
-# else
-# define OS_INLINE static __inline__
-# endif
#endif
/* Generic byte swapping functions. */
uint16_t data
)
{
- return ((data << 8) | (data >> 8));
+ __asm__ ("xchgb %b0, %h0" : "+q" (data));
+ return data;
}
OS_INLINE
uint32_t data
)
{
- __asm__ ("bswap %0" : "+r" (data));
+ __asm__ ("bswap %0" : "+r" (data));
return data;
}
-#if defined(__i386__)
-OS_INLINE
-uint64_t
-_OSSwapInt64(
- uint64_t data
-)
-{
- __asm__ ("bswap %%eax\n\t"
- "bswap %%edx\n\t"
- "xchgl %%eax, %%edx"
- : "+A" (data));
- return data;
-}
-#elif defined(__x86_64__)
OS_INLINE
uint64_t
_OSSwapInt64(
uint64_t data
)
{
- __asm__ ("bswap %0" : "+r" (data));
- return data;
+ union {
+ uint64_t ull;
+ uint32_t ul[2];
+ } u;
+
+ /* This actually generates the best code */
+ u.ul[0] = data >> 32;
+ u.ul[1] = data & 0xffffffff;
+ u.ul[0] = _OSSwapInt32(u.ul[0]);
+ u.ul[1] = _OSSwapInt32(u.ul[1]);
+ return u.ull;
}
-#else
-#error Unknown architecture
-#endif
/* Functions for byte reversed loads. */
uint16_t
OSReadSwapInt16(
const volatile void * base,
- uintptr_t byteOffset
+ uintptr_t offset
)
{
uint16_t result;
- result = *(volatile uint16_t *)((uintptr_t)base + byteOffset);
+ result = *(volatile uint16_t *)((uintptr_t)base + offset);
return _OSSwapInt16(result);
}
uint32_t
OSReadSwapInt32(
const volatile void * base,
- uintptr_t byteOffset
+ uintptr_t offset
)
{
uint32_t result;
- result = *(volatile uint32_t *)((uintptr_t)base + byteOffset);
+ result = *(volatile uint32_t *)((uintptr_t)base + offset);
return _OSSwapInt32(result);
}
uint64_t
OSReadSwapInt64(
const volatile void * base,
- uintptr_t byteOffset
+ uintptr_t offset
)
{
- uint64_t result;
-
- result = *(volatile uint64_t *)((uintptr_t)base + byteOffset);
- return _OSSwapInt64(result);
+ const volatile uint32_t * inp;
+ union ullc {
+ uint64_t ull;
+ uint32_t ul[2];
+ } outv;
+
+ inp = (const volatile uint32_t *)((uintptr_t)base + offset);
+ outv.ul[0] = inp[1];
+ outv.ul[1] = inp[0];
+ outv.ul[0] = _OSSwapInt32(outv.ul[0]);
+ outv.ul[1] = _OSSwapInt32(outv.ul[1]);
+ return outv.ull;
}
/* Functions for byte reversed stores. */
void
OSWriteSwapInt16(
volatile void * base,
- uintptr_t byteOffset,
+ uintptr_t offset,
uint16_t data
)
{
- *(volatile uint16_t *)((uintptr_t)base + byteOffset) = _OSSwapInt16(data);
+ *(volatile uint16_t *)((uintptr_t)base + offset) = _OSSwapInt16(data);
}
OS_INLINE
void
OSWriteSwapInt32(
volatile void * base,
- uintptr_t byteOffset,
+ uintptr_t offset,
uint32_t data
)
{
- *(volatile uint32_t *)((uintptr_t)base + byteOffset) = _OSSwapInt32(data);
+ *(volatile uint32_t *)((uintptr_t)base + offset) = _OSSwapInt32(data);
}
OS_INLINE
void
OSWriteSwapInt64(
volatile void * base,
- uintptr_t byteOffset,
+ uintptr_t offset,
uint64_t data
)
{
- *(volatile uint64_t *)((uintptr_t)base + byteOffset) = _OSSwapInt64(data);
+ *(volatile uint64_t *)((uintptr_t)base + offset) = _OSSwapInt64(data);
}
#endif /* ! _OS_OSBYTEORDERI386_H */
projects / apple / xnu.git / blobdiff