 @@ -27,69 +27,71 @@
  * in which case the provisions of the GPL are applicable instead of
  * the above. If you wish to allow the use of your version of this file
  * only under the terms of the GPL and not to allow others to use your
  * version of this file under the BSD license, indicate your decision
  * by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL. If you do not delete the
  * provisions above, a recipient may use your version of this file under
  * either the BSD or the GPL.
  */
 #ifndef LZFP_h
 #define LZFP_h
-#define STANDALONE 1 /* at the moment, this is ok. */
+#if !defined(_KERNEL) && !defined(_STANDALONE)
 #include <sys/types.h>
-#ifndef STANDALONE
+#include <inttypes.h>
 # include "lzf.h"
 #endif
 /*
- * Size of hashtable is (1 << HLOG) * sizeof (char *)
+ * Size of hashtable is (1 << LZF_HLOG) * sizeof (char *)
  * decompression is independent of the hash table size
  * the difference between 15 and 14 is very small
  * for small blocks (and 14 is usually a bit faster).
- * For a low-memory/faster configuration, use HLOG == 13;
+ * For a low-memory/faster configuration, use LZF_HLOG == 13;
  * For best compression, use 15 or 16 (or more, up to 23).
  */
-#ifndef HLOG
+#ifndef LZF_HLOG
-# define HLOG 16
+# define LZF_HLOG 16
 #endif
 /*
  * Sacrifice very little compression quality in favour of compression speed.
  * This gives almost the same compression as the default code, and is
  * (very roughly) 15% faster. This is the preferred mode of operation.
  */
 #ifndef VERY_FAST
 # define VERY_FAST 1
 #endif
 /*
  * Sacrifice some more compression quality in favour of compression speed.
  * (roughly 1-2% worse compression for large blocks and
  * 9-10% for small, redundant, blocks and >>20% better speed in both cases)
  * In short: when in need for speed, enable this for binary data,
  * possibly disable this for text data.
  */
 #ifndef ULTRA_FAST
 # define ULTRA_FAST 0
 #endif
 /*
  * Unconditionally aligning does not cost very much, so do it if unsure
+ *
  * In fact, on modern x86 processors, strict alignment is faster whether
  * in 32 or 64 bit mode.
  */
 #ifndef STRICT_ALIGN
-# define STRICT_ALIGN !(defined(__i386) || defined (__amd64))
+# define STRICT_ALIGN 1 /* !(defined(__i386) || defined (__amd64)) */
 #endif
 /*
  * You may choose to pre-set the hash table (might be faster on some
  * modern cpus and large (>>64k) blocks, and also makes compression
  * deterministic/repeatable when the configuration otherwise is the same).
  */
 #ifndef INIT_HTAB
 # define INIT_HTAB 0
 #endif
 /*
  * Avoid assigning values to errno variable? for some embedding purposes
 @@ -114,41 +116,31 @@
  * and return EINVAL if the input stream has been corrupted. This
  * only shields against overflowing the input buffer and will not
  * detect most corrupted streams.
  * This check is not normally noticable on modern hardware
  * (<1% slowdown), but might slow down older cpus considerably.
  */
 #ifndef CHECK_INPUT
 # define CHECK_INPUT 1
 #endif
 /*****************************************************************************/
 /* nothing should be changed below */
-typedef unsigned char u8;
+typedef uint8_t u8;
 typedef uint16_t u16;
 typedef const u8 *LZF_STATE[1 << (HLOG)];
-#if !STRICT_ALIGN
+#if !defined(_KERNEL) && !defined(STANDALONE)
-/* for unaligned accesses we need a 16 bit datatype. */
+typedef const u8 *LZF_STATE[1 << (LZF_HLOG)];
 # include <limits.h>
 # if USHRT_MAX == 65535
     typedef unsigned short u16;
 # elif UINT_MAX == 65535
     typedef unsigned int u16;
 # else
 #  undef STRICT_ALIGN
 #  define STRICT_ALIGN 1
 # endif
 #endif
 #if ULTRA_FAST
 # if defined(VERY_FAST)
 #  undef VERY_FAST
 # endif
 #endif
 #if INIT_HTAB
 # ifdef __cplusplus
 #  include <cstring>
 # else
 #  include <string.h>

 @@ -24,50 +24,55 @@
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * the GNU General Public License ("GPL") version 2 or any later version,
  * in which case the provisions of the GPL are applicable instead of
  * the above. If you wish to allow the use of your version of this file
  * only under the terms of the GPL and not to allow others to use your
  * version of this file under the BSD license, indicate your decision
  * by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL. If you do not delete the
  * provisions above, a recipient may use your version of this file under
  * either the BSD or the GPL.
  */
 #if defined(_KERNEL) || defined (_STANDALONE)
 #include <lib/libkern/libkern.h>
 #include "lzfP.h"
 #else
 #include "lzf.h"
 #endif
-#define HSIZE (1 << (HLOG))
+#define HSIZE (1 << (LZF_HLOG))
 /*
  * don't play with this unless you benchmark!
  * decompression is not dependent on the hash function
  * the hashing function might seem strange, just believe me
  * it works ;)
  */
 #ifndef FRST
 # define FRST(p) (((p[0]) << 8) | p[1])
 # define NEXT(v,p) (((v) << 8) | p[2])
 # if ULTRA_FAST
-#  define IDX(h) ((( h             >> (3*8 - HLOG)) - h  ) & (HSIZE - 1))
+#  define IDX(h) ((( h             >> (3*8 - LZF_HLOG)) - h  ) & (HSIZE - 1))
 # elif VERY_FAST
-#  define IDX(h) ((( h             >> (3*8 - HLOG)) - h*5) & (HSIZE - 1))
+#  define IDX(h) ((( h             >> (3*8 - LZF_HLOG)) - h*5) & (HSIZE - 1))
 # else
-#  define IDX(h) ((((h ^ (h << 5)) >> (3*8 - HLOG)) - h*5) & (HSIZE - 1))
+#  define IDX(h) ((((h ^ (h << 5)) >> (3*8 - LZF_HLOG)) - h*5) & (HSIZE - 1))
 # endif
 #endif
 /*
  * IDX works because it is very similar to a multiplicative hash, e.g.
- * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
+ * ((h * 57321 >> (3*8 - LZF_HLOG)) & (HSIZE - 1))
  * the latter is also quite fast on newer CPUs, and compresses similarly.
+ *
  * the next one is also quite good, albeit slow ;)
  * (int)(cos(h & 0xffffff) * 1e6)
  */
 #if 0
 /* original lzv-like hash function, much worse and thus slower */
 # define FRST(p) (p[0] << 5) ^ p[1]
 # define NEXT(v,p) ((v) << 5) ^ p[2]
 # define IDX(h) ((h) & (HSIZE - 1))
 #endif
 @@ -137,27 +142,27 @@ lzf_compress_r (const void *const in_dat
   hval = FRST (ip);
   while (ip < in_end - 2)
+    {
       hval = NEXT (hval, ip);
       hslot = htab + IDX (hval);
       ref = *hslot; *hslot = ip;
       if (/*CONSTCOND*/1
 #if INIT_HTAB
           && ref < ip /* the next test will actually take care of this, but this is faster */
 #endif
           && (off = ip - ref - 1) < MAX_OFF
           && ip + 4 < in_end
-          && ref > (u8 *)in_data
+          && ref > (const u8 *)in_data
 #if STRICT_ALIGN
           && ref[0] == ip[0]
           && ref[1] == ip[1]
           && ref[2] == ip[2]
 #else
           && *(const u16 *)(const void *)ref == *(const u16 *)(const void *)ip
           && ref[2] == ip[2]
 #endif
+        )
+        {
           /* match found at *ref++ */
           unsigned int len = 2;
           unsigned int maxlen = (unsigned)(in_end - ip) - len;

 @@ -24,33 +24,43 @@
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * the GNU General Public License ("GPL") version 2 or any later version,
  * in which case the provisions of the GPL are applicable instead of
  * the above. If you wish to allow the use of your version of this file
  * only under the terms of the GPL and not to allow others to use your
  * version of this file under the BSD license, indicate your decision
  * by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL. If you do not delete the
  * provisions above, a recipient may use your version of this file under
  * either the BSD or the GPL.
  */
 #if defined(_KERNEL) || defined (_STANDALONE)
 #include <lib/libkern/libkern.h>
 #include <sys/systm.h>
 #include "lzfP.h"
 #else
 #include "lzf.h"
 #endif
-#if AVOID_ERRNO
+#ifdef _KERNEL
-# define SET_ERRNO(n)
+# define SET_ERRNO(n) panic("lzf decompression failure: %s", #n)
 #else
-# include <errno.h>
+# ifdef AVOID_ERRNO
-# define SET_ERRNO(n) errno = (n)
+#  define SET_ERRNO(n)
 # else
 #  include <errno.h>
 #  define SET_ERRNO(n) errno = (n)
 # endif
 #endif
 #if (__i386 || __amd64) && __GNUC__ >= 3
 # define lzf_movsb(dst, src, len)                \
    asm ("rep movsb"                              \
         : "=D" (dst), "=S" (src), "=c" (len)     \
         :  "0" (dst),  "1" (src),  "2" (len));
 #endif
 unsigned int
 lzf_decompress (const void *const in_data,  unsigned int in_len,
                 void             *out_data, unsigned int out_len)
+{

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.libkern,v 1.32 2014/03/12 00:22:53 pooka Exp $
+#	$NetBSD: Makefile.libkern,v 1.32.2.1 2014/04/07 01:10:55 tls Exp $
+#
 # Variable definitions for libkern.
+#
 # Before including this, you _must_ set
 #   KERNDIR: location of sys/lib/libkern
+#
 # You *may* set:
 #   LIBKERN_ARCH: architecture subdir to be used
 #   KERNCPPFLAGS: see Makefile.inc
 #   KERNMISCCPPFLAGS: see Makefile.inc
+#
 @@ -84,26 +84,29 @@ SRCS+=	strncat.c strncmp.c strncpy.c
 SRCS+=	strcasecmp.c strncasecmp.c
 SRCS+=	xlat_mbr_fstype.c
 SRCS+=	heapsort.c ptree.c rb.c
 # for crypto
 SRCS+=	explicit_memset.c consttime_memequal.c
 .PATH:	${NETBSDSRCDIR}/common/lib/libc/cdb
 SRCS+=	cdbr.c
 SRCS+=	mi_vector_hash.c
 .PATH:	${NETBSDSRCDIR}/external/bsd/liblzf/dist
 SRCS+=	lzf_c.c lzf_d.c
 # Files to clean up
 CLEANFILES+= lib${LIB}.o lib${LIB}.po
 # Remove from SRCS the .c files for any .S files added by the MD makefiles,
 # also remove from SRCS the .c files for the .c files in NO_SRCS.
 # (Unlike libc, we don't worry about lint)
 .for check_file in ${SRCS:M*.S} ${NO_SRCS}
 unwanted_file := ${SRCS:M${check_file:.S=.c}}
 .if "${unwanted_file}" != ""
 SRCS := ${SRCS:N${unwanted_file}}
 .endif
 .endfor

 @@ -1,14 +1,14 @@
-/*	$NetBSD: libkern.h,v 1.113 2014/02/27 18:05:07 joerg Exp $	*/
+/*	$NetBSD: libkern.h,v 1.113.2.1 2014/04/07 01:10:55 tls Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -369,14 +369,32 @@ uintmax_t strtoumax(const char *, char *
 int	 snprintb(char *, size_t, const char *, uint64_t);
 int	 snprintb_m(char *, size_t, const char *, uint64_t, size_t);
 int	 kheapsort(void *, size_t, size_t, int (*)(const void *, const void *),
 		   void *);
 uint32_t crc32(uint32_t, const uint8_t *, size_t);
 unsigned int	popcount(unsigned int) __constfunc;
 unsigned int	popcountl(unsigned long) __constfunc;
 unsigned int	popcountll(unsigned long long) __constfunc;
 unsigned int	popcount32(uint32_t) __constfunc;
 unsigned int	popcount64(uint64_t) __constfunc;
 void	*explicit_memset(void *, int, size_t);
 int	consttime_memequal(const void *, const void *, size_t);
 /*
  * LZF hashtable/state size: on uncompressible data and on a system with
  * a sufficiently large d-cache, a larger table produces a considerable
  * speed benefit.  On systems with small memory and caches, however...
  */
 #if defined(__vax__) || defined(__m68k__)
 #define LZF_HLOG 14
 #else
 #define LZF_HLOG 15
 #endif
 typedef const uint8_t *LZF_STATE[1 << LZF_HLOG];
 unsigned int lzf_compress_r (const void *const, unsigned int, void *,
 			     unsigned int, LZF_STATE);
 unsigned int lzf_decompress (const void *const, unsigned int, void *,
 			     unsigned int);
 #endif /* !_LIB_LIBKERN_LIBKERN_H_ */