X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/316670eb35587141e969394ae8537d66b9211e80..3903760236c30e3b5ace7a4eefac3a269d68957c:/bsd/libkern/libkern.h

diff --git a/bsd/libkern/libkern.h b/bsd/libkern/libkern.h
index 223f3a526..4e6606007 100644
--- a/bsd/libkern/libkern.h
+++ b/bsd/libkern/libkern.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -73,6 +73,7 @@
 #include <stdint.h>
 #include <stdarg.h>	/* for platform-specific va_list */
 #include <string.h>
+#include <machine/limits.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <mach/vm_param.h>
@@ -139,16 +140,15 @@ ulmin(u_int32_t a, u_int32_t b)
 
 /* Prototypes for non-quad routines. */
 extern int	ffs(int);
-extern int	locc(int, char *, u_int);
 extern u_int32_t	random(void);
-extern char	*rindex(const char *, int);
 extern int	scanc(u_int, u_char *, const u_char *, int);
 extern int	skpc(int, int, char *);
 extern long	strtol(const char*, char **, int);
 extern u_long	strtoul(const char *, char **, int);
 extern quad_t	strtoq(const char *, char **, int);
 extern u_quad_t strtouq(const char *, char **, int);
-extern char	*strsep(char **stringp, const char *delim);
+extern char	*strsep(char **, const char *);
+extern void	*memchr(const void *, int, size_t);
 
 int	snprintf(char *, size_t, const char *, ...) __printflike(3,4);
 
@@ -169,6 +169,7 @@ int	_consume_printf_args(int, ...);
 #endif
 #endif
 
+uint16_t	crc16(uint16_t crc, const void *bufp, size_t len);
 uint32_t	crc32(uint32_t crc, const void *bufp, size_t len);
 
 int	copystr(const void *kfaddr, void *kdaddr, size_t len, size_t *done);
@@ -176,12 +177,21 @@ int	copyinstr(const user_addr_t uaddr, void *kaddr, size_t len, size_t *done);
 int	copyoutstr(const void *kaddr, user_addr_t udaddr, size_t len, size_t *done);
 int	copyin(const user_addr_t uaddr, void *kaddr, size_t len);
 int	copyout(const void *kaddr, user_addr_t udaddr, size_t len);
+#if XNU_KERNEL_PRIVATE
+extern int copyin_word(const user_addr_t user_addr, uint64_t *kernel_addr, vm_size_t nbytes);
+#endif
 
 int vsscanf(const char *, char const *, va_list);
 
 extern int	vprintf(const char *, va_list);
 extern int	vsnprintf(char *, size_t, const char *, va_list);
 
+#if XNU_KERNEL_PRIVATE
+extern int	vprintf_log_locked(const char *, va_list);
+extern void	osobject_retain(void * object);
+extern void	osobject_release(void * object);
+#endif
+
 /* vsprintf() is being deprecated. Please use vsnprintf() instead. */
 extern int	vsprintf(char *bufp, const char *, va_list) __deprecated;
 
@@ -196,30 +206,13 @@ extern void invalidate_icache64(addr64_t, unsigned, int);
 extern void flush_dcache64(addr64_t, unsigned, int);
 
 
-/*
- * assembly versions of clz... ideally we would just call
- * __builtin_clz(num), unfortunately this one is ill defined
- * by gcc for num=0
- */
-static __inline__ unsigned int
+static inline int
 clz(unsigned int num)
 {
-#if __i386__
-	unsigned int result;
-	__asm__ volatile(
-		"bsrl   %1, %0\n\t"
-		"cmovel %2, %0"
-		: "=r" (result)
-		: "rm" (num), "r" (63)
-	);
-	return 31 ^ result;
-
-#else
-	return num?__builtin_clz(num):__builtin_clz(0);
-#endif
+	// On Intel, clz(0) is undefined
+	return num ? __builtin_clz(num) : sizeof(num) * CHAR_BIT;
 }
 
-
 __END_DECLS
 
 #endif /* _LIBKERN_LIBKERN_H_ */