Oops, context -> ctx

DNAOp: Make use of template keyword for dependent templates

.clang-format

@@ -0,0 +1,29 @@
+---
+BasedOnStyle: LLVM
+ColumnLimit: 120
+UseTab: Never
+TabWidth: 2
+---
+Language: Cpp
+DerivePointerAlignment: false
+PointerAlignment: Left
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+IndentCaseLabels: false
+AllowShortBlocksOnASingleLine: Always
+AlignOperands: true
+AlignTrailingComments: true
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+BreakConstructorInitializersBeforeComma: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakAfterDefinitionReturnType: None
+AllowShortFunctionsOnASingleLine: All
+Cpp11BracedListStyle: true
+NamespaceIndentation: None
+BinPackArguments: true
+BinPackParameters: true
+SortIncludes: false
+AccessModifierOffset: -2
+ConstructorInitializerIndentWidth: 0
+ConstructorInitializerAllOnOneLineOrOnePerLine: true

.clang-tidy

@@ -0,0 +1 @@
+Checks: '*,-misc-unused-parameters,-modernize-use-trailing-return-type,-readability-named-parameter,-readability-convert-member-functions-to-static,-readability-uppercase-literal-suffix,-readability-magic-numbers,-hicpp-uppercase-literal-suffix,-hicpp-signed-bitwise,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-non-private-member-variables-in-classes,-fuchsia-*,-google-runtime-references,-llvmlibc-*'

.github/workflows/build.yml

@@ -0,0 +1,197 @@
+name: Build
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build-linux-x86_64:
+    name: Build Linux (GCC x86_64)
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install cmake ninja-build ccache llvm-11-dev libclang-11-dev clang-11
+
+      - name: Configure ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: ubuntu-20.04-gcc
+          max-size: 1G
+
+      - name: Configure CMake
+        run: |
+          cmake -B build . -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DClang_DIR=/usr/lib/cmake/clang-11 \
+            -DATDNA_DYNAMIC_LLVM=OFF -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+
+      - name: Build
+        run: cmake --build build --target package --verbose
+
+      - name: Test
+        working-directory: build
+        run: ./atdna-test
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: atdna-linux-x86_64
+          path: |
+            build/athena-*.tar.gz
+
+  build-linux-aarch64:
+    name: Build Linux (GCC aarch64)
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - uses: uraimo/run-on-arch-action@v2.0.9
+        name: Build & test
+        with:
+          arch: aarch64
+          distro: ubuntu20.04
+          githubToken: ${{github.token}}
+          dockerRunArgs: |
+            --volume "${PWD}:/workspace"
+          install: |
+            apt-get -y update
+            apt-get -y install build-essential cmake ninja-build llvm-11-dev libclang-11-dev clang-11
+          run: |
+            cmake -B build . -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+              -DClang_DIR=/usr/lib/cmake/clang-11 -DATDNA_DYNAMIC_LLVM=OFF
+            cmake --build build --target package --verbose
+            build/atdna-test
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: atdna-linux-aarch64
+          path: |
+            build/athena-*.tar.gz
+
+  build-macos-universal:
+    name: Build macOS (AppleClang universal)
+    runs-on: macos-10.15
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Install dependencies
+        run: |
+          brew update
+          brew install ninja ccache
+          # universal clang+llvm from macports
+          curl -LSfs https://axiodl.com/files/clang-11-11.1.0_1.mpkg -o /tmp/clang-11-11.1.0_1.mpkg
+          sudo installer -pkg /tmp/clang-11-11.1.0_1.mpkg -target /
+
+      - name: Configure ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: macos-10.15-appleclang
+          max-size: 1G
+
+      - name: Configure CMake
+        run: |
+          cmake -B build . -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
+            -DLLVM_ROOT_DIR=/opt/local/libexec/llvm-11 \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+
+      - name: Build
+        run: cmake --build build --target package --verbose
+
+      - name: Test
+        working-directory: build
+        run: ./atdna-test
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: athena-macos-universal
+          path: |
+            build/athena-*.tar.gz
+
+  build-win32-amd64:
+    name: Build Windows (MSVC AMD64)
+    runs-on: windows-2019
+    env:
+      LLVM_VERSION: 10.0.1
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Install LLVM
+        run: |
+          $TempDir = "$env:RUNNER_WORKSPACE\temp"
+          $Filename = "LLVM-$env:LLVM_VERSION-win64.exe"
+          New-Item -Path "$TempDir" -ItemType Directory -ea 0
+          (New-Object Net.WebClient).DownloadFile("https://axiodl.com/files/$Filename", "$TempDir\$Filename")
+          Start-Process "$TempDir\$Filename" -ArgumentList "/S /D=$env:RUNNER_WORKSPACE\LLVM" -Wait
+
+      - name: Install dependencies
+        run: choco install ninja
+
+      - name: Enable Visual Studio environment
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Configure CMake
+        run: |
+          $workspace = $env:RUNNER_WORKSPACE -replace '\\', '/'
+          cmake -B build . -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
+            -DLLVM_ROOT_DIR="$workspace/LLVM"
+
+      - name: Build
+        run: cmake --build build --target package --verbose
+
+      - name: Test
+        working-directory: build
+        run: ./atdna-test.exe
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: athena-win32-amd64
+          path: |
+            build/athena-*.7z
+
+  release:
+    name: Release
+    runs-on: ubuntu-20.04
+    if:
+      contains('
+        refs/heads/master
+        refs/heads/test
+      ', github.ref)
+    needs:
+      - build-linux-x86_64
+      - build-linux-aarch64
+      - build-macos-universal
+      - build-win32-amd64
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          path: artifacts
+
+      - name: Create release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: ${{github.token}}
+          automatic_release_tag: latest
+          prerelease: true
+          title: Development build
+          files: |
+            artifacts/*/*

.gitignore

@@ -12,8 +12,13 @@
 **/*.dylib
 **/*.user
 **/.directory
+**/.DS_Store
+PKGBUILD
 # Directories
 **/doc
 **/obj
 **/Makefile
-
+/build
+/out
+/cmake-build-*
+/.idea

.gitmodules

@@ -0,0 +1,8 @@
+[submodule "extern/lzokay"]
+	path = extern/lzokay
+	url = https://github.com/jackoalan/lzokay.git
+	branch = master
+[submodule "extern/fmt"]
+	path = extern/fmt
+	url = https://github.com/fmtlib/fmt
+	branch = master

AthenaConfig.cmake.in

@@ -14,7 +14,7 @@ if(NOT TARGET AthenaCore AND NOT Athena_BINARY_DIR)
 endif()
  
 # These are IMPORTED targets created by AthenaTargets.cmake
-set(ATHENA_LIBRARIES AthenaCore AthenaSakura AthenaZelda AthenaWiiSave)
+set(ATHENA_LIBRARIES athena-core athena-wiisave athena-sakura athena-zelda)
 
 # Set icon location if on windows
 if(WIN32 AND NOT CYGWIN)

AthenaConfigVersion.cmake.in

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "@ATHENA_VERSION@")
+set(PACKAGE_VERSION "@ATHENA_VERSION_STRING@")
  
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")

CMakeLists.txt

@@ -1,15 +1,138 @@
-cmake_minimum_required(VERSION 3.0)
-project(Athena)
+cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17
+# Set MSVC runtime library flags from CMAKE_MSVC_RUNTIME_LIBRARY
+cmake_policy(SET CMP0091 NEW)
 
 ##################
 # Athena Version #
 ##################
+find_package(Git)
+if (GIT_FOUND)
+  # make sure version information gets re-run when the current Git HEAD changes
+  execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --git-path HEAD
+      OUTPUT_VARIABLE athena_git_head_filename
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${athena_git_head_filename}")
 
-set(ATHENA_MAJOR_VERSION 2)
-set(ATHENA_MINOR_VERSION 3)
-set(ATHENA_PATCH_VERSION 0)
-set(ATHENA_VERSION
-  ${ATHENA_MAJOR_VERSION}.${ATHENA_MINOR_VERSION}.${ATHENA_PATCH_VERSION})
+  execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --symbolic-full-name HEAD
+      OUTPUT_VARIABLE athena_git_head_symbolic
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      COMMAND ${GIT_EXECUTABLE} rev-parse --git-path ${athena_git_head_symbolic}
+      OUTPUT_VARIABLE athena_git_head_symbolic_filename
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${athena_git_head_symbolic_filename}")
+
+  # defines ATHENA_WC_REVISION
+  execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+      OUTPUT_VARIABLE ATHENA_WC_REVISION
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # defines ATHENA_WC_DESCRIBE
+  execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --tag --long --dirty --exclude latest
+      OUTPUT_VARIABLE ATHENA_WC_DESCRIBE
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # remove hash (and trailing "-0" if needed) from description
+  string(REGEX REPLACE "(-0)?-[^-]+((-dirty)?)$" "\\2" ATHENA_WC_DESCRIBE "${ATHENA_WC_DESCRIBE}")
+
+  # defines ATHENA_WC_BRANCH
+  execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+      OUTPUT_VARIABLE ATHENA_WC_BRANCH
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # defines ATHENA_WC_DATE
+  execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} log -1 --format=%ad
+      OUTPUT_VARIABLE ATHENA_WC_DATE
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+else ()
+  message(STATUS "Unable to find git, commit information will not be available")
+endif ()
+
+if (ATHENA_WC_DESCRIBE)
+  string(REGEX REPLACE "v?([0-9]+)\.([0-9]+)\.([0-9]+)\-([0-9]+).*" "\\1.\\2.\\3.\\4" ATHENA_VERSION_STRING "${ATHENA_WC_DESCRIBE}")
+  string(REGEX REPLACE "v?([0-9]+)\.([0-9]+)\.([0-9]+).*" "\\1.\\2.\\3" ATHENA_VERSION "${ATHENA_VERSION_STRING}")
+  string(REGEX REPLACE "v?([0-9]+)\.([0-9]+)\.([0-9]+).*" "\\1" ATHENA_MAJOR_VERSION "${ATHENA_VERSION_STRING}")
+  string(REGEX REPLACE "v?([0-9]+)\.([0-9]+)\.([0-9]+).*" "\\2" ATHENA_MINOR_VERSION "${ATHENA_VERSION_STRING}")
+  string(REGEX REPLACE "v?([0-9]+)\.([0-9]+)\.([0-9]+).*" "\\3" ATHENA_PATCH_VERSION "${ATHENA_VERSION_STRING}")
+else ()
+  set(ATHENA_WC_DESCRIBE "UNKNOWN-VERSION")
+  set(ATHENA_VERSION "0.0.0")
+  set(ATHENA_MAJOR_VERSION "0")
+  set(ATHENA_MINOR_VERSION "0")
+  set(ATHENA_PATCH_VERSION "0")
+endif ()
+
+# Add version information to CI environment variables
+if(DEFINED ENV{GITHUB_ENV})
+  file(APPEND "$ENV{GITHUB_ENV}" "ATHENA_VERSION=${ATHENA_WC_DESCRIBE}")
+endif()
+
+project(athena VERSION ${ATHENA_VERSION} LANGUAGES C CXX)
+
+if (MSVC)
+  # Shaddup MSVC
+  add_compile_definitions(UNICODE=1 _UNICODE=1 __SSE__=1
+      _CRT_SECURE_NO_WARNINGS=1 D_SCL_SECURE_NO_WARNINGS=1
+      _SCL_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1
+      _ENABLE_EXTENDED_ALIGNED_STORAGE=1 NOMINMAX=1)
+  add_compile_options(/IGNORE:4221
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4018>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4800>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4005>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4311>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4068>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4267>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4244>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4200>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4305>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4067>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4146>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4309>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4805>
+      ${VS_OPTIONS})
+
+  string(REPLACE "/GR " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  string(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  add_compile_options(
+      # Disable exceptions
+      $<$<COMPILE_LANGUAGE:CXX>:/EHsc->
+
+      # Disable RTTI
+      $<$<COMPILE_LANGUAGE:CXX>:/GR->
+
+      # Enforce various standards compliant behavior.
+      $<$<COMPILE_LANGUAGE:CXX>:/permissive->
+
+      # Enable standard volatile semantics.
+      $<$<COMPILE_LANGUAGE:CXX>:/volatile:iso>
+
+      # Reports the proper value for the __cplusplus preprocessor macro.
+      $<$<COMPILE_LANGUAGE:CXX>:/Zc:__cplusplus>
+
+      # Use latest C++ standard.
+      $<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>
+  )
+
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    # Flags for MSVC (not clang-cl)
+    add_compile_options(
+        # Allow constexpr variables to have explicit external linkage.
+        $<$<COMPILE_LANGUAGE:CXX>:/Zc:externConstexpr>
+
+        # Assume that new throws exceptions, allowing better code generation.
+        $<$<COMPILE_LANGUAGE:CXX>:/Zc:throwingNew>
+
+        # Link-time Code Generation for Release builds
+        $<$<CONFIG:Release>:/GL>
+    )
+
+    # Link-time Code Generation for Release builds
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/LTCG")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/RELEASE /LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+    set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/DEBUG /RELEASE /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUGTYPE:cv,fixup")
+  endif ()
+else ()
+  set(CMAKE_CXX_STANDARD 20)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif ()
 
 ################
 # Athena Build #
@@ -17,135 +140,175 @@ set(ATHENA_VERSION
 
 add_subdirectory(extern)
 
-include_directories(include ${LZO_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${YAML_INCLUDE_DIR})
-if (NOT MSVC)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-endif()
-
-if(WIN32)
-list(APPEND CORE_EXTRA src/win32_largefilewrapper.c)
-elseif(APPLE)
-list(APPEND CORE_EXTRA src/osx_largefilewrapper.c)
-elseif(GEKKO)
-list(APPEND CORE_EXTRA src/gekko_support.c)
-endif()
-
-add_library(AthenaCore
-    src/Athena/Utility.cpp
-    src/Athena/FileReader.cpp
-    src/Athena/FileWriter.cpp
-    src/Athena/MemoryReader.cpp
-    src/Athena/MemoryWriter.cpp
-    src/Athena/Global.cpp
-    src/Athena/Checksums.cpp
-    src/Athena/Compression.cpp
+add_library(athena-core
+    src/athena/Utility.cpp
+    src/athena/MemoryReader.cpp
+    src/athena/MemoryWriter.cpp
+    src/athena/VectorWriter.cpp
+    src/athena/FileWriterGeneric.cpp
+    src/athena/Global.cpp
+    src/athena/Checksums.cpp
+    src/athena/Compression.cpp
+    src/athena/Socket.cpp
     src/LZ77/LZLookupTable.cpp
     src/LZ77/LZType10.cpp
     src/LZ77/LZType11.cpp
     src/LZ77/LZBase.cpp
-    src/Athena/FileInfo.cpp
-    src/Athena/Dir.cpp
-    src/Athena/DNAYaml.cpp
-    ${CORE_EXTRA}
+    src/athena/FileInfo.cpp
+    src/athena/Dir.cpp
+    src/athena/DNAYaml.cpp
 
-    include/Athena/IStream.hpp
-    include/Athena/IStreamReader.hpp
-    include/Athena/IStreamWriter.hpp
-    include/Athena/Types.hpp
-    include/Athena/Utility.hpp
-    include/Athena/Global.hpp
-    include/Athena/FileReader.hpp
-    include/Athena/FileWriter.hpp
-    include/Athena/MemoryReader.hpp
-    include/Athena/MemoryWriter.hpp
-    include/Athena/Checksums.hpp
-    include/Athena/Compression.hpp
+    include/athena/IStream.hpp
+    include/athena/IStreamReader.hpp
+    include/athena/IStreamWriter.hpp
+    include/athena/Types.hpp
+    include/athena/Utility.hpp
+    include/athena/Global.hpp
+    include/athena/FileReader.hpp
+    include/athena/FileWriter.hpp
+    include/athena/MemoryReader.hpp
+    include/athena/MemoryWriter.hpp
+    include/athena/VectorWriter.hpp
+    include/athena/Checksums.hpp
+    include/athena/ChecksumsLiterals.hpp
+    include/athena/Compression.hpp
+    include/athena/Socket.hpp
     include/LZ77/LZBase.hpp
     include/LZ77/LZLookupTable.hpp
     include/LZ77/LZType10.hpp
     include/LZ77/LZType11.hpp
-    include/Athena/FileInfo.hpp
-    include/Athena/Dir.hpp
-    include/gekko_support.h
-    include/Athena/DNA.hpp
-    include/Athena/DNAYaml.hpp
+    include/athena/FileInfo.hpp
+    include/athena/Dir.hpp
+    include/athena/DNA.hpp
+    include/athena/DNAYaml.hpp
+    include/athena/DNAOp.hpp
+    include/athena/YAMLCommon.hpp
+    include/athena/YAMLDocReader.hpp
+    include/athena/YAMLDocWriter.hpp
+    include/athena/yaml.h
+    include/athena/utf8proc.h
+)
+if(WIN32)
+    target_sources(athena-core PRIVATE
+        src/win32_largefilewrapper.c
+        include/win32_largefilewrapper.h
+        src/athena/FileWriterWin32.cpp
+        src/athena/FileReaderWin32.cpp
+    )
+
+    target_compile_definitions(athena-core PRIVATE
+        -DNOMINMAX
+        -DWIN32_LEAN_AND_MEAN
+    )
+else()
+    target_sources(athena-core PRIVATE
+        src/athena/FileWriterNix.cpp
+        src/athena/FileReader.cpp
+    )
+    if(APPLE OR GEKKO OR NX OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+        target_sources(athena-core PRIVATE
+            src/osx_largefilewrapper.c
+            include/osx_largefilewrapper.h
+        )
+
+        if(GEKKO OR NX)
+            target_sources(athena-core PRIVATE
+                src/gekko_support.c
+                include/athena/gekko_support.h
+            )
+        endif()
+    endif()
+endif()
+
+target_include_directories(athena-core PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+   $<BUILD_INTERFACE:${ZLIB_INCLUDE_DIR}>
+)
+target_link_libraries(athena-core PUBLIC
+    athena-libyaml
+    fmt
 )
 
-add_library(AthenaSakura
-    src/Athena/Sprite.cpp
-    src/Athena/SpriteFile.cpp
-    src/Athena/SpriteFileReader.cpp
-    src/Athena/SpriteFileWriter.cpp
-    src/Athena/SpriteFrame.cpp
-    src/Athena/SpritePart.cpp
+add_library(athena-sakura EXCLUDE_FROM_ALL
+    src/athena/Sprite.cpp
+    src/athena/SpriteFile.cpp
+    src/athena/SpriteFileReader.cpp
+    src/athena/SpriteFileWriter.cpp
+    src/athena/SpriteFrame.cpp
+    src/athena/SpritePart.cpp
 
-    include/Athena/Sprite.hpp
-    include/Athena/SpriteFile.hpp
-    include/Athena/SpriteFileReader.hpp
-    include/Athena/SpriteFileWriter.hpp
-    include/Athena/SpriteFrame.hpp
-    include/Athena/SpritePart.hpp
+    include/athena/SakuraGlobal.hpp
+    include/athena/Sprite.hpp
+    include/athena/SpriteFile.hpp
+    include/athena/SpriteFileReader.hpp
+    include/athena/SpriteFileWriter.hpp
+    include/athena/SpriteFrame.hpp
+    include/athena/SpritePart.hpp
 )
 
-add_library(AthenaWiiSave
-    src/Athena/WiiBanner.cpp
-    src/Athena/WiiFile.cpp
-    src/Athena/WiiImage.cpp
-    src/Athena/WiiSave.cpp
-    src/Athena/WiiSaveReader.cpp
-    src/Athena/WiiSaveWriter.cpp
+add_library(athena-wiisave EXCLUDE_FROM_ALL
+    src/athena/WiiBanner.cpp
+    src/athena/WiiFile.cpp
+    src/athena/WiiImage.cpp
+    src/athena/WiiSave.cpp
+    src/athena/WiiSaveReader.cpp
+    src/athena/WiiSaveWriter.cpp
     src/bn.cpp
     src/ec.cpp
     src/md5.cpp
     src/sha1.cpp
     src/aes.cpp
 
-    include/Athena/WiiBanner.hpp
-    include/Athena/WiiFile.hpp
-    include/Athena/WiiImage.hpp
-    include/Athena/WiiSave.hpp
-    include/Athena/WiiSaveReader.hpp
-    include/Athena/WiiSaveWriter.hpp
+    include/athena/WiiBanner.hpp
+    include/athena/WiiFile.hpp
+    include/athena/WiiImage.hpp
+    include/athena/WiiSave.hpp
+    include/athena/WiiSaveReader.hpp
+    include/athena/WiiSaveWriter.hpp
     include/aes.hpp
-    include/bn.h
-    include/ec.h
+    include/bn.hpp
+    include/ec.hpp
     include/md5.h
     include/sha1.h
 )
-if(NOT MSVC)
-set_source_files_properties(src/aes.cpp PROPERTIES COMPILE_FLAGS -maes)
+if(NOT MSVC AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
+    set_source_files_properties(src/aes.cpp PROPERTIES COMPILE_FLAGS -maes)
 endif()
 
-add_library(AthenaZelda
-    src/Athena/ALTTPFile.cpp
-    src/Athena/ALTTPFileReader.cpp
-    src/Athena/ALTTPFileWriter.cpp
-    src/Athena/ALTTPQuest.cpp
-    src/Athena/MCFile.cpp
-    src/Athena/MCFileReader.cpp
-    src/Athena/MCFileWriter.cpp
-    src/Athena/MCSlot.cpp
-    src/Athena/SkywardSwordFile.cpp
-    src/Athena/SkywardSwordFileReader.cpp
-    src/Athena/SkywardSwordFileWriter.cpp
-    src/Athena/SkywardSwordQuest.cpp
-    src/Athena/ZQuestFile.cpp
-    src/Athena/ZQuestFileReader.cpp
-    src/Athena/ZQuestFileWriter.cpp
 
-    include/Athena/ALTTPEnums.hpp
-    include/Athena/ALTTPFile.hpp
-    include/Athena/ALTTPFileReader.hpp
-    include/Athena/ALTTPFileWriter.hpp
-    include/Athena/ALTTPQuest.hpp
-    include/Athena/ALTTPStructs.hpp
-    include/Athena/MCFile.hpp
-    include/Athena/MCFileReader.hpp
-    include/Athena/MCFileWriter.hpp
-    include/Athena/SkywardSwordFile.hpp
-    include/Athena/SkywardSwordFileReader.hpp
-    include/Athena/SkywardSwordFileWriter.hpp
-    include/Athena/SkywardSwordQuest.hpp
+add_library(athena-zelda EXCLUDE_FROM_ALL
+    src/athena/ALTTPFile.cpp
+    src/athena/ALTTPFileReader.cpp
+    src/athena/ALTTPFileWriter.cpp
+    src/athena/ALTTPQuest.cpp
+    src/athena/MCFile.cpp
+    src/athena/MCFileReader.cpp
+    src/athena/MCFileWriter.cpp
+    src/athena/MCSlot.cpp
+    src/athena/SkywardSwordFile.cpp
+    src/athena/SkywardSwordFileReader.cpp
+    src/athena/SkywardSwordFileWriter.cpp
+    src/athena/SkywardSwordQuest.cpp
+    src/athena/ZQuestFile.cpp
+    src/athena/ZQuestFileReader.cpp
+    src/athena/ZQuestFileWriter.cpp
+
+    include/athena/ALTTPEnums.hpp
+    include/athena/ALTTPFile.hpp
+    include/athena/ALTTPFileReader.hpp
+    include/athena/ALTTPFileWriter.hpp
+    include/athena/ALTTPQuest.hpp
+    include/athena/ALTTPStructs.hpp
+    include/athena/MCFile.hpp
+    include/athena/MCFileReader.hpp
+    include/athena/MCFileWriter.hpp
+    include/athena/SkywardSwordFile.hpp
+    include/athena/SkywardSwordFileReader.hpp
+    include/athena/SkywardSwordFileWriter.hpp
+    include/athena/SkywardSwordQuest.hpp
+    include/athena/ZQuestFile.hpp
+    include/athena/ZQuestFileReader.hpp
+    include/athena/ZQuestFileWriter.hpp
 )
 
 # Icon
@@ -154,11 +317,7 @@ set(ATHENA_ICO ${CMAKE_CURRENT_SOURCE_DIR}/Athena.ico)
 # Offer the user the choice of overriding the installation directories
 set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
 set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
-if(WIN32 AND NOT CYGWIN)
-  set(INSTALL_CMAKE_DIR cmake)
-else()
-  set(INSTALL_CMAKE_DIR lib/cmake/Athena)
-endif()
+set(INSTALL_CMAKE_DIR lib/cmake/athena)
 
 # Make relative paths absolute (needed later on)
 foreach(p LIB INCLUDE CMAKE)
@@ -171,15 +330,17 @@ foreach(p LIB INCLUDE CMAKE)
 endforeach()
 
 # Define installs
-install(DIRECTORY include/ DESTINATION ${INSTALL_INCLUDE_DIR}/Athena COMPONENT Athena)
-install(TARGETS AthenaCore AthenaSakura AthenaWiiSave AthenaZelda
-        DESTINATION ${INSTALL_LIB_DIR} EXPORT AthenaTargets COMPONENT Athena)
+install(DIRECTORY include/athena DESTINATION ${INSTALL_INCLUDE_DIR} COMPONENT athena)
+install(DIRECTORY extern/fmt/include/fmt DESTINATION ${INSTALL_INCLUDE_DIR} COMPONENT athena)
+install(TARGETS athena-core fmt
+        DESTINATION ${INSTALL_LIB_DIR} EXPORT AthenaTargets COMPONENT athena)
 if(WIN32 AND NOT CYGWIN)
-install(FILES Athena.ico DESTINATION ${INSTALL_LIB_DIR} COMPONENT Athena)
+install(FILES Athena.ico DESTINATION ${INSTALL_LIB_DIR} COMPONENT athena)
 elseif(UNIX)
 configure_file(libAthena.pc.in libAthena.pc @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/libAthena.pc 
-        DESTINATION ${INSTALL_LIB_DIR}/pkgconfig COMPONENT Athena)
+configure_file(PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/PKGBUILD @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libAthena.pc
+        DESTINATION ${INSTALL_LIB_DIR}/pkgconfig COMPONENT athena)
 endif()
 
 ##################
@@ -187,41 +348,51 @@ endif()
 ##################
 
 # Add all targets to the build-tree export set
-export(TARGETS AthenaCore AthenaSakura AthenaWiiSave AthenaZelda
-  FILE "${PROJECT_BINARY_DIR}/AthenaTargets.cmake")
+export(TARGETS athena-core athena-libyaml fmt FILE "${CMAKE_CURRENT_BINARY_DIR}/AthenaTargets.cmake")
 
 # Export the package for use from the build-tree
 # (this registers the build-tree with a global CMake-registry)
-export(PACKAGE Athena)
+export(PACKAGE athena)
 
 # Create the AthenaConfig.cmake
 # ... for the build tree
-set(CONF_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/Athena")
+set(CONF_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/athena")
 set(CONF_ICON_DIR "${PROJECT_SOURCE_DIR}/Athena.ico")
-configure_file(AthenaConfig.cmake.in "${PROJECT_BINARY_DIR}/AthenaConfig.cmake" @ONLY)
+configure_file(AthenaConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/AthenaConfig.cmake" @ONLY)
 # ... for the install tree
 file(RELATIVE_PATH REL_INCLUDE_DIR "${ABS_INSTALL_CMAKE_DIR}" "${ABS_INSTALL_INCLUDE_DIR}")
 file(RELATIVE_PATH REL_ICON_DIR "${ABS_INSTALL_CMAKE_DIR}" "${ABS_INSTALL_LIB_DIR}/Athena.ico")
-set(CONF_INCLUDE_DIR "\${ATHENA_CMAKE_DIR}/${REL_INCLUDE_DIR}/Athena")
+set(CONF_INCLUDE_DIR "\${ATHENA_CMAKE_DIR}/${REL_INCLUDE_DIR}/athena")
 set(CONF_ICON_DIR "\${ATHENA_CMAKE_DIR}/${REL_ICON_DIR}")
-configure_file(AthenaConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/AthenaConfig.cmake" @ONLY)
+configure_file(AthenaConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/AthenaConfig.cmake" @ONLY)
 # ... for both
-configure_file(AthenaConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/AthenaConfigVersion.cmake" @ONLY)
+configure_file(AthenaConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/AthenaConfigVersion.cmake" @ONLY)
 
 # Install AthenaConfig.cmake
 install(FILES
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/AthenaConfig.cmake"
-  "${PROJECT_BINARY_DIR}/AthenaConfigVersion.cmake"
-  DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Athena)
+  "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/AthenaConfig.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/AthenaConfigVersion.cmake"
+  DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT athena)
 
 # Install the export set for use with the install-tree
-install(EXPORT AthenaTargets DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Athena)
+install(EXPORT AthenaTargets DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT athena)
 
 ################
 # atdna import #
 ################
 
 add_subdirectory(atdna)
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+# Test target
+add_executable(atdna-test atdna/test.cpp atdna/test.hpp)
+if (CMAKE_SYSTEM_NAME STREQUAL "Switch")
+    set_target_properties(atdna-test PROPERTIES SUFFIX ".elf")
+    target_link_libraries(atdna-test athena-core nx)
+else()
+    target_link_libraries(atdna-test athena-core)
+endif()
+target_atdna(atdna-test atdna_test.cpp atdna/test.hpp)
+endif()
 
 #########
 # CPack #
@@ -229,25 +400,37 @@ add_subdirectory(atdna)
 
 include(InstallRequiredSystemLibraries)
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Athena")
-set(CPACK_PACKAGE_VENDOR "Antidote / Jackoalan")
+set(CPACK_PACKAGE_VENDOR "AxioDL Team")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR ${ATHENA_MAJOR_VERSION})
 set(CPACK_PACKAGE_VERSION_MINOR ${ATHENA_MINOR_VERSION})
 set(CPACK_PACKAGE_VERSION_PATCH ${ATHENA_PATCH_VERSION})
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "Athena")
-if(WIN32 AND NOT UNIX)
-    # There is a bug in NSI that does not handle full unix paths properly. Make
-    # sure there is at least one set of four (4) backlasshes.
-    set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Athena")
-    set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\AthenaNSIS.bmp")
-    set(CPACK_NSIS_MODIFY_PATH ON)
-    set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\Athena.ico")
-    set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\Athena.ico")
-    set(CPACK_NSIS_INSTALLED_ICON_NAME "Uninstall.exe")
-    set(CPACK_NSIS_DISPLAY_NAME "Athena")
-    set(CPACK_NSIS_URL_INFO_ABOUT "http://libathena.github.io")
-    set(CPACK_NSIS_CONTACT "antidote.crk@gmail.com")
-endif()
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "athena")
+set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
+
+string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCHITECTURE_NAME)
+if (CMAKE_SYSTEM_NAME STREQUAL Windows)
+  set(SYSTEM_NAME win32)
+elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin)
+  set(SYSTEM_NAME macos)
+  list(LENGTH CMAKE_OSX_ARCHITECTURES num_archs)
+  if (num_archs GREATER 1)
+    set(ARCHITECTURE_NAME universal)
+  elseif(num_archs EQUAL 1)
+    set(ARCHITECTURE_NAME ${CMAKE_OSX_ARCHITECTURES})
+  endif()
+elseif (CMAKE_SYSTEM_NAME STREQUAL Linux)
+  set(SYSTEM_NAME linux)
+else ()
+  set(SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
+endif ()
+set(CPACK_PACKAGE_FILE_NAME "athena-${SYSTEM_NAME}-${ARCHITECTURE_NAME}")
+
+if (WIN32)
+  set(CPACK_GENERATOR 7Z)
+else ()
+  set(CPACK_GENERATOR TGZ)
+endif ()
 include(CPack)
 

Doxyfile

@@ -768,7 +768,7 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = include/Athena
+INPUT                  = include/athena
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

Example/CMakeLists.txt

@@ -0,0 +1,18 @@
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+cmake_minimum_required(VERSION 3.0)
+project(Example)
+endif()
+
+add_executable(Example
+    main.cpp)
+
+if(GEKKO)
+include_directories(${LIBOGCDIR}/include)
+link_directories(${LIGOGCDIR}/lib/wii)
+target_link_libraries(Example athena-core z wiiuse bte ogc m)
+target_include_directories(Example PRIVATE ${LIBOGCDIR}/include)
+target_link_directories(Example PRIVATE ${LIBOGCDIR}/lib/wii)
+else()
+#TODO: add normal link libraries
+endif()
+

Example/main.cpp

@@ -0,0 +1,55 @@
+#include <iostream>
+#if GEKKO
+#include <gccore.h>
+#if HW_RVL
+#include <wiiuse/wpad.h>
+#endif
+
+static void* xfb = nullptr;
+static GXRModeObj* rmode = nullptr;
+
+#endif
+
+#include <athena/MemoryReader.hpp>
+
+int main() {
+#if GEKKO
+  VIDEO_Init();
+#if HW_RVL
+  WPAD_Init();
+#endif
+  PAD_Init();
+
+  rmode = VIDEO_GetPreferredMode(nullptr);
+  xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
+
+  CON_Init(xfb, 20, 20, rmode->fbWidth, rmode->xfbHeight, rmode->fbWidth * VI_DISPLAY_PIX_SZ);
+  CON_EnableGecko(CARD_SLOTB, true);
+
+  VIDEO_Configure(rmode);
+  VIDEO_SetBlack(false);
+
+  VIDEO_Flush();
+
+  VIDEO_WaitVSync();
+  if (rmode->viTVMode & VI_NON_INTERLACE)
+    VIDEO_WaitVSync();
+
+  athena::io::MemoryCopyReader test("sd:/test.dat");
+  while (true) {
+#if HW_RVL
+    WPAD_ScanPads();
+#endif
+    PAD_ScanPads();
+    if (PAD_ButtonsDown(0) & PAD_BUTTON_START)
+      break;
+
+#if HW_RVL
+    if (WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME)
+      break;
+#endif
+    VIDEO_WaitVSync();
+  }
+#endif
+  return 0;
+}

LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2011-2015 Phillip "Antidote" Stephens, Jack Andersen, et al.
+The MIT License
+
+Copyright (c) 2011-2018 Phillip "Antidote" Stephens, Jack Andersen, et al.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

PKGBUILD.in

@@ -1,7 +1,8 @@
 # PKGBUILD for libAthena
 _pkgname=libathena
 pkgname=$_pkgname-git
-pkgver=2.3.0
+pkgver=@ATHENA_VERSION_STRING@
+pkgrel=1
 pkgdesc="Basic cross platform IO library"
 arch=('i686' 'x86_64')
 source=("${pkgname%-*}::git+https://github.com/libAthena/Athena.git")

atdna/CMakeLists.txt

@@ -2,42 +2,69 @@
 # ATDNA Build #
 ###############
 
-# Find dependencies
-include(FindLLVM.cmake)
-if(NOT LLVM_FOUND)
-    message("-- Unable to locate LLVM installation; skipping atdna")
-else()
-list(APPEND LLVM_LIBS
-     clangFrontend
-     clangTooling
-     clangDriver
-     clangSerialization
-     clangParse
-     clangSema
-     clangAnalysis
-     clangEdit
-     clangAST
-     clangLex
-     clangBasic
-     LLVMOption
-     LLVMMCParser
-     LLVMBitReader
-     LLVMMC
-     LLVMSupport)
-set(CLANG_INCLUDE_DIR ${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_STRING}/include)
+if(NOT TARGET atdna AND NOT CMAKE_CROSSCOMPILING)
 
-if(UNIX)
-list(APPEND PLAT_LIBS z pthread curses dl)
+get_directory_property(ATDNA_DEFINES COMPILE_DEFINITIONS)
+list(REMOVE_ITEM ATDNA_DEFINES _GLIBCXX_DEBUG=1)
+set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "${ATDNA_DEFINES}")
+
+# Find dependencies
+if (NOT "${LLVM_ROOT_DIR}" STREQUAL "")
+  # use existing LLVM_ROOT_DIR
+elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+  set(LLVM_ROOT_DIR /usr/local/opt/llvm)
+elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
+  set(LLVM_ROOT_DIR /opt/homebrew/opt/llvm)
+elseif (WIN32)
+  get_filename_component(LLVM_ROOT_DIR [HKEY_LOCAL_MACHINE\\Software\\LLVM\\LLVM] ABSOLUTE)
+else ()
+  set(LLVM_ROOT_DIR "")
+endif ()
+find_package(Clang REQUIRED PATHS ${LLVM_ROOT_DIR})
+find_package(LLVM REQUIRED PATHS ${CLANG_INSTALL_PREFIX})
+
+if(LLVM_FOUND)
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+  option(ATDNA_DYNAMIC_LLVM "Use dynamic library targets when linking LLVM" ON)
+else()
+  option(ATDNA_DYNAMIC_LLVM "Use dynamic library targets when linking LLVM" OFF)
+endif()
+
+list(APPEND CLANG_LIBS clangTooling)
+set(LLVM_LIBS "")
+
+if (ATDNA_DYNAMIC_LLVM)
+  list(APPEND LLVM_LIBS LLVM)
+else()
+  function(recursive_remove_library target library)
+    get_target_property(target_dependencies ${target} INTERFACE_LINK_LIBRARIES)
+    foreach(dep ${target_dependencies})
+      if (NOT "${dep}" STREQUAL "${library}" AND TARGET "${dep}")
+        recursive_remove_library(${dep} ${library})
+      endif()
+    endforeach()
+    list(FIND target_dependencies "${library}" list_index)
+    if (${list_index} GREATER -1)
+      list(REMOVE_AT target_dependencies ${list_index})
+      set_property(TARGET ${target} PROPERTY INTERFACE_LINK_LIBRARIES "${target_dependencies}")
+    endif()
+  endfunction()
+
+  # Remove LLVM dynamic library from Clang dependencies
+  foreach (lib ${CLANG_LIBS})
+    recursive_remove_library(${lib} LLVM)
+  endforeach ()
+  # Add LLVM static libs
+  list(APPEND LLVM_LIBS LLVMFrontendOpenMP LLVMOption)
+  # Hack around link order issues
+  target_link_libraries(clangAST INTERFACE LLVMFrontendOpenMP)
 endif()
 
 # Offer the user the choice of overriding the installation directories
 set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
 set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
-if(WIN32 AND NOT CYGWIN)
-  set(INSTALL_CMAKE_DIR cmake)
-else()
-  set(INSTALL_CMAKE_DIR lib/cmake/atdna)
-endif()
+set(INSTALL_CMAKE_DIR lib/cmake/atdna)
 
 # Make relative paths absolute (needed later on)
 foreach(p BIN INCLUDE CMAKE)
@@ -56,32 +83,34 @@ if(WIN32)
 endif()
 
 # ATDNA target
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-include_directories(${LLVM_INCLUDE_DIRS})
-link_directories(${LLVM_LIBRARY_DIRS})
 add_executable(atdna main.cpp test.hpp ${PLAT_SRCS})
-target_link_libraries(atdna ${LLVM_LIBS} ${PLAT_LIBS})
-set_source_files_properties(main.cpp PROPERTIES COMPILE_DEFINITIONS 
-                            "INSTALL_PREFIX=${ABS_INSTALL_BIN_DIR};__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1")
+target_link_libraries(atdna ${CLANG_LIBS} ${LLVM_LIBS})
+target_compile_definitions(atdna PRIVATE
+        INSTALL_PREFIX=${ABS_INSTALL_BIN_DIR}
+        __STDC_LIMIT_MACROS=1
+        __STDC_CONSTANT_MACROS=1
+        ATDNA_ARGV0=clang-tool)
+target_include_directories(atdna PRIVATE ${CLANG_INCLUDE_DIRS})
+# Clang 10.0.x headers currently broken with C++20
+set_property(TARGET atdna PROPERTY CXX_STANDARD 17)
 if(MSVC)
-set_target_properties(atdna PROPERTIES
-                      COMPILE_FLAGS "/GR-")
+  # Allow linking against release-built LLVM libraries
+  target_compile_options(atdna PRIVATE /GR- /D_ITERATOR_DEBUG_LEVEL=0)
+  set_property(TARGET atdna PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
 else()
-set_target_properties(atdna PROPERTIES
-                      COMPILE_FLAGS "-std=c++11 -fno-rtti -Wno-unused-parameter"
-                      LINK_FLAGS -std=c++11)
+  target_compile_options(atdna PRIVATE -fno-rtti -fvisibility=hidden -Wno-error)
 endif()
 
 # Define installs
 install(TARGETS atdna DESTINATION ${INSTALL_BIN_DIR} EXPORT atdnaTargets COMPONENT atdna)
-install(DIRECTORY ${CLANG_INCLUDE_DIR}/ DESTINATION ${INSTALL_INCLUDE_DIR}/Athena/clang COMPONENT atdna)
+install(DIRECTORY ${LLVM_INCLUDE_DIR}/clang DESTINATION ${INSTALL_INCLUDE_DIR}/athena COMPONENT atdna)
 
 ##################
 # Package Export #
 ##################
 
 # Add all targets to the build-tree export set
-export(TARGETS atdna FILE "${PROJECT_BINARY_DIR}/atdnaTargets.cmake")
+export(TARGETS atdna FILE "${CMAKE_CURRENT_BINARY_DIR}/atdnaTargets.cmake")
 
 # Export the package for use from the build-tree
 # (this registers the build-tree with a global CMake-registry)
@@ -89,18 +118,16 @@ export(PACKAGE atdna)
 
 # Create the atdnaConfig.cmake
 # ... for the build tree
-set(CONF_CLANG_INCLUDE_DIR "${CLANG_INCLUDE_DIR}")
-configure_file(atdnaConfig.cmake.in "${PROJECT_BINARY_DIR}/atdnaConfig.cmake" @ONLY)
+configure_file(atdnaConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/atdnaConfig.cmake" @ONLY)
 # ... for the install tree
-set(CONF_CLANG_INCLUDE_DIR "\${ATHENA_INCLUDE_DIR}/clang")
-configure_file(atdnaConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/atdnaConfig.cmake" @ONLY)
+configure_file(atdnaConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/atdnaConfig.cmake" @ONLY)
 # ... for both
-configure_file(atdnaConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/atdnaConfigVersion.cmake" @ONLY)
+configure_file(atdnaConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/atdnaConfigVersion.cmake" @ONLY)
 
 # Install atdnaConfig.cmake
 install(FILES
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/atdnaConfig.cmake"
-  "${PROJECT_BINARY_DIR}/atdnaConfigVersion.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/atdnaConfig.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/atdnaConfigVersion.cmake"
   DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT atdna)
 
 # Install the export set for use with the install-tree
@@ -110,10 +137,14 @@ install(EXPORT atdnaTargets DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT atdna)
 # CTest #
 #########
 
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 enable_testing()
-add_test(NAME test-dna COMMAND $<TARGET_FILE:atdna> -o test.cpp 
-         "-I${ATHENA_INCLUDE_DIR}" -isystem "${CLANG_INCLUDE_DIR}"
-         ${CMAKE_SOURCE_DIR}/test.hpp)
+add_test(NAME test-dna COMMAND $<TARGET_FILE:atdna> -o test.cpp
+         "-I${ATHENA_INCLUDE_DIR}" ${CMAKE_SOURCE_DIR}/test.hpp)
+endif()
 
 endif()
 
+endif()
+
+include(atdnaHelpers.cmake)

atdna/FindLLVM.cmake

@@ -1,205 +0,0 @@
-# - Find LLVM headers and libraries.
-# This module locates LLVM and adapts the llvm-config output for use with
-# CMake.
-#
-# A given list of COMPONENTS is passed to llvm-config.
-#
-# The following variables are defined:
-#  LLVM_FOUND          - true if LLVM was found
-#  LLVM_CXXFLAGS       - C++ compiler flags for files that include LLVM headers.
-#  LLVM_HOST_TARGET    - Target triple used to configure LLVM.
-#  LLVM_INCLUDE_DIRS   - Directory containing LLVM include files.
-#  LLVM_LDFLAGS        - Linker flags to add when linking against LLVM
-#                        (includes -LLLVM_LIBRARY_DIRS).
-#  LLVM_LIBRARIES      - Full paths to the library files to link against.
-#  LLVM_LIBRARY_DIRS   - Directory containing LLVM libraries.
-#  LLVM_ROOT_DIR       - The root directory of the LLVM installation.
-#                        llvm-config is searched for in ${LLVM_ROOT_DIR}/bin.
-#  LLVM_VERSION_MAJOR  - Major version of LLVM.
-#  LLVM_VERSION_MINOR  - Minor version of LLVM.
-#  LLVM_VERSION_STRING - Full LLVM version string (e.g. 2.9).
-#
-# Note: The variable names were chosen in conformance with the offical CMake
-# guidelines, see ${CMAKE_ROOT}/Modules/readme.txt.
-
-# Try suffixed versions to pick up the newest LLVM install available on Debian
-# derivatives.
-# We also want an user-specified LLVM_ROOT_DIR to take precedence over the
-# system default locations such as /usr/local/bin. Executing find_program()
-# multiples times is the approach recommended in the docs.
-set(LLVM_FIND_COMPONENTS "")
-if(WIN32)
-get_filename_component(LLVM_ROOT_DIR [HKEY_LOCAL_MACHINE\\Software\\LLVM\\LLVM] ABSOLUTE)
-endif()
-
-set(llvm_config_names llvm-config-3.7 llvm-config37
-                      llvm-config-3.6 llvm-config36
-                      llvm-config-3.5 llvm-config35
-                      llvm-config-3.4 llvm-config34
-                      llvm-config-3.3 llvm-config33
-                      llvm-config-3.2 llvm-config32
-                      llvm-config-3.1 llvm-config31 llvm-config)
-find_program(LLVM_CONFIG
-    NAMES ${llvm_config_names}
-    PATHS ${LLVM_ROOT_DIR}/bin NO_DEFAULT_PATH
-    DOC "Path to llvm-config tool.")
-find_program(LLVM_CONFIG NAMES ${llvm_config_names})
-
-if ((WIN32 AND NOT(MINGW OR CYGWIN)) OR NOT LLVM_CONFIG)
-    if (WIN32)
-        # A bit of a sanity check:
-        if( NOT EXISTS ${LLVM_ROOT_DIR}/include/llvm )
-            message(FATAL_ERROR "LLVM_ROOT_DIR (${LLVM_ROOT_DIR}) is not a valid LLVM install")
-        endif()
-        # We incorporate the CMake features provided by LLVM:
-        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${LLVM_ROOT_DIR}/share/llvm/cmake")
-        include(LLVMConfig)
-        # Set properties
-        set(LLVM_HOST_TARGET ${TARGET_TRIPLE})
-        set(LLVM_VERSION_STRING ${LLVM_PACKAGE_VERSION})
-        set(LLVM_CXXFLAGS ${LLVM_DEFINITIONS})
-        set(LLVM_LDFLAGS "")
-        list(REMOVE_ITEM LLVM_FIND_COMPONENTS "all-targets" index)
-        list(APPEND LLVM_FIND_COMPONENTS ${LLVM_TARGETS_TO_BUILD})
-        # Work around LLVM bug 21016
-        list(FIND LLVM_TARGETS_TO_BUILD "X86" TARGET_X86)
-        if(TARGET_X86 GREATER -1)
-            list(APPEND LLVM_FIND_COMPONENTS x86utils)
-        endif()
-        # Similar to the work around above, but for AArch64
-        list(FIND LLVM_TARGETS_TO_BUILD "AArch64" TARGET_AArch64)
-        if(TARGET_AArch64 GREATER -1)
-            list(APPEND LLVM_FIND_COMPONENTS AArch64Utils)
-        endif()
-        list(REMOVE_ITEM LLVM_FIND_COMPONENTS "backend" index)
-        if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-2][\\.0-9A-Za-z]*")
-            # Versions below 3.3 do not support components objcarcopts, option
-            list(REMOVE_ITEM LLVM_FIND_COMPONENTS "objcarcopts" index)
-            list(REMOVE_ITEM LLVM_FIND_COMPONENTS "option" index)
-        endif()
-        if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-4][\\.0-9A-Za-z]*")
-            # Versions below 3.5 do not support components lto, profiledata
-            list(REMOVE_ITEM LLVM_FIND_COMPONENTS "lto" index)
-            list(REMOVE_ITEM LLVM_FIND_COMPONENTS "profiledata" index)
-        endif()
-        if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-6][\\.0-9A-Za-z]*")
-            # Versions below 3.7 do not support components debuginfodwarf
-            # Only debuginfo is available
-            list(REMOVE_ITEM LLVM_FIND_COMPONENTS "debuginfodwarf" index)
-            list(APPEND LLVM_FIND_COMPONENTS "debuginfo")
-        endif()
-
-        if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-4][\\.0-9A-Za-z]*")
-            llvm_map_components_to_libraries(tmplibs ${LLVM_FIND_COMPONENTS})
-        else()
-            llvm_map_components_to_libnames(tmplibs ${LLVM_FIND_COMPONENTS})
-        endif()
-        if(MSVC)
-            foreach(lib ${tmplibs})
-                list(APPEND LLVM_LIBRARIES "${LLVM_LIBRARY_DIRS}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            endforeach()
-        else()
-            # Rely on the library search path being set correctly via -L on
-            # MinGW and others, as the library list returned by
-            # llvm_map_components_to_libraries also includes imagehlp and psapi.
-            set(LLVM_LDFLAGS "-L${LLVM_LIBRARY_DIRS}")
-            set(LLVM_LIBRARIES ${tmplibs})
-        endif()
-
-        # When using the CMake LLVM module, LLVM_DEFINITIONS is a list
-        # instead of a string. Later, the list seperators would entirely
-        # disappear, replace them by spaces instead. A better fix would be
-        # to switch to add_definitions() instead of throwing strings around.
-        string(REPLACE ";" " " LLVM_CXXFLAGS "${LLVM_CXXFLAGS}")
-    else()
-        if (NOT FIND_LLVM_QUIETLY)
-            message(WARNING "Could not find llvm-config. Try manually setting LLVM_ROOT_DIR to the prebuilt LLVM prefix to use.")
-        endif()
-    endif()
-else()
-    macro(llvm_set var flag)
-       if(LLVM_FIND_QUIETLY)
-            set(_quiet_arg ERROR_QUIET)
-        endif()
-        execute_process(
-            COMMAND ${LLVM_CONFIG} --${flag}
-            OUTPUT_VARIABLE LLVM_${var}
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            ${_quiet_arg}
-        )
-        if(${ARGV2})
-            file(TO_CMAKE_PATH "${LLVM_${var}}" LLVM_${var})
-        endif()
-    endmacro()
-    macro(llvm_set_libs var flag prefix)
-       if(LLVM_FIND_QUIETLY)
-            set(_quiet_arg ERROR_QUIET)
-        endif()
-        execute_process(
-            COMMAND ${LLVM_CONFIG} --${flag} ${LLVM_FIND_COMPONENTS}
-            OUTPUT_VARIABLE tmplibs
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            ${_quiet_arg}
-        )
-        file(TO_CMAKE_PATH "${tmplibs}" tmplibs)
-        string(REGEX REPLACE "([$^.[|*+?()]|])" "\\\\\\1" pattern "${prefix}/")
-        string(REGEX MATCHALL "${pattern}[^ ]+" LLVM_${var} ${tmplibs})
-    endmacro()
-
-    llvm_set(VERSION_STRING version)
-    llvm_set(CXXFLAGS cxxflags)
-    llvm_set(HOST_TARGET host-target)
-    llvm_set(INCLUDE_DIRS includedir true)
-    llvm_set(ROOT_DIR prefix true)
-
-    if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-2][\\.0-9A-Za-z]*")
-        # Versions below 3.3 do not support components objcarcopts, option
-        list(REMOVE_ITEM LLVM_FIND_COMPONENTS "objcarcopts" index)
-        list(REMOVE_ITEM LLVM_FIND_COMPONENTS "option" index)
-    endif()
-    if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-4][\\.0-9A-Za-z]*")
-        # Versions below 3.5 do not support components lto, profiledata
-        list(REMOVE_ITEM LLVM_FIND_COMPONENTS "lto" index)
-        list(REMOVE_ITEM LLVM_FIND_COMPONENTS "profiledata" index)
-    endif()
-    if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-6][\\.0-9A-Za-z]*")
-        # Versions below 3.7 do not support components debuginfodwarf
-        # Only debuginfo is available
-        list(REMOVE_ITEM LLVM_FIND_COMPONENTS "debuginfodwarf" index)
-        list(APPEND LLVM_FIND_COMPONENTS "debuginfo")
-    endif()
-
-    llvm_set(LDFLAGS ldflags)
-    if(NOT ${LLVM_VERSION_STRING} MATCHES "^3\\.[0-4][\\.0-9A-Za-z]*")
-        # In LLVM 3.5+, the system library dependencies (e.g. "-lz") are accessed
-        # using the separate "--system-libs" flag.
-        llvm_set(SYSTEM_LIBS system-libs)
-        string(REPLACE "\n" " " LLVM_LDFLAGS "${LLVM_LDFLAGS} ${LLVM_SYSTEM_LIBS}")
-    endif()
-    llvm_set(LIBRARY_DIRS libdir true)
-    llvm_set_libs(LIBRARIES libfiles "${LLVM_LIBRARY_DIRS}")
-endif()
-
-# On CMake builds of LLVM, the output of llvm-config --cxxflags does not
-# include -fno-rtti, leading to linker errors. Be sure to add it.
-if(CMAKE_COMPILER_IS_GNUCXX OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
-    if(NOT ${LLVM_CXXFLAGS} MATCHES "-fno-rtti")
-        set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fno-rtti")
-    endif()
-endif()
-
-string(REGEX REPLACE "([0-9]+).*" "\\1" LLVM_VERSION_MAJOR "${LLVM_VERSION_STRING}" )
-string(REGEX REPLACE "[0-9]+\\.([0-9]+).*[A-Za-z]*" "\\1" LLVM_VERSION_MINOR "${LLVM_VERSION_STRING}" )
-
-# Use the default CMake facilities for handling QUIET/REQUIRED.
-include(FindPackageHandleStandardArgs)
-
-if(${CMAKE_VERSION} VERSION_LESS "2.8.4")
-  # The VERSION_VAR argument is not supported on pre-2.8.4, work around this.
-  set(VERSION_VAR dummy)
-endif()
-
-find_package_handle_standard_args(LLVM
-    REQUIRED_VARS LLVM_ROOT_DIR LLVM_HOST_TARGET
-    VERSION_VAR LLVM_VERSION_STRING)
-

atdna/atdnaConfig.cmake.in

@@ -1,22 +1,25 @@
 # - Config file for the atdna package
  
 # Compute paths
-get_filename_component(ATHENA_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(ATDNA_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
  
 # Our library dependencies (contains definitions for IMPORTED targets)
 if(NOT TARGET atdna AND NOT atdna_BINARY_DIR)
-  include("${ATHENA_CMAKE_DIR}/atdnaTargets.cmake")
+  include("${ATDNA_CMAKE_DIR}/atdnaTargets.cmake")
 endif()
 
-# Find Athena
-find_package(Athena REQUIRED)
-
 # Super handy macro for adding atdna target
-macro(atdna out)
+function(atdna out)
+  # Ninja wants invocations in root binary dir for DEPFILE application
+  file(RELATIVE_PATH out_rel ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/${out}")
+
   # Make input files source-relative
   set(ins "")
+  set(ins_impdeps "")
   foreach(arg ${ARGN})
     list(APPEND ins ${CMAKE_CURRENT_SOURCE_DIR}/${arg})
+    list(APPEND ins_impdeps CXX)
+    list(APPEND ins_impdeps ${CMAKE_CURRENT_SOURCE_DIR}/${arg})
   endforeach()
 
   # Get local include directories for atdna
@@ -41,12 +44,43 @@ macro(atdna out)
       list(APPEND extraargs -fms-compatibility-version=18.00)
     elseif(MSVC_VERSION EQUAL 1900)
       list(APPEND extraargs -fms-compatibility-version=19.00)
-    endif()
+    elseif(MSVC_VERSION EQUAL 1910)
+      list(APPEND extraargs -fms-compatibility-version=19.10)
+    elseif(MSVC_VERSION EQUAL 1911)
+      list(APPEND extraargs -fms-compatibility-version=19.11)
   endif()
-  
-  # Make target
-  add_custom_command(OUTPUT ${out} COMMAND $<TARGET_FILE:atdna> 
-                     ARGS ${extraargs} -o ${out} ${cdefcli} ${inccli} "-I${ATHENA_INCLUDE_DIR}" -isystem "@CONF_CLANG_INCLUDE_DIR@" ${ins}
-                     DEPENDS ${ins} COMMENT "Generating DNA ${out}")
-endmacro()
+
+  # OSX Extra
+  elseif(APPLE)
+    get_filename_component(COMPILER_DIR "${CMAKE_CXX_COMPILER}" DIRECTORY)
+    if (NOT EXISTS "${CMAKE_OSX_SYSROOT}")
+      message(FATAL_ERROR "CMAKE_OSX_SYSROOT not set")
+    endif()
+    file(GLOB SYSTEM_INCLUDE_DIR "${COMPILER_DIR}/../lib/clang/*/include")
+    list(APPEND extraargs
+         -isysroot ${CMAKE_OSX_SYSROOT}
+         -stdlib++-isystem "${COMPILER_DIR}/../include/c++/v1"
+         -isystem "${SYSTEM_INCLUDE_DIR}")
+  endif()
+
+  # Make target
+  if(${CMAKE_GENERATOR} STREQUAL "Ninja")
+    # Use Ninja's DEPFILE parser in cooperation with atdna
+    add_custom_command(OUTPUT ${out} COMMAND $<TARGET_FILE:atdna>
+                       ARGS ${extraargs} -o ${out_rel} -MD -MT ${out_rel} -MF ${out_rel}.d ${cdefcli} ${inccli}
+                       "-I${ATHENA_INCLUDE_DIR}" ${ins}
+                       DEPENDS atdna ${ins} IMPLICIT_DEPENDS ${ins_impdeps}
+                       DEPFILE "${CMAKE_CURRENT_BINARY_DIR}/${out}.d"
+                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                       COMMENT "Generating DNA ${out_rel}")
+  else()
+    # Use CMake's built-in dependency scanner for makefile targets
+    add_custom_command(OUTPUT ${out} COMMAND $<TARGET_FILE:atdna>
+                       ARGS ${extraargs} -o ${out_rel} ${cdefcli} ${inccli}
+                       "-I${ATHENA_INCLUDE_DIR}" ${ins}
+                       DEPENDS atdna ${ins} IMPLICIT_DEPENDS ${ins_impdeps}
+                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                       COMMENT "Generating DNA ${out_rel}")
+  endif()
+endfunction()
 

atdna/atdnaConfigVersion.cmake.in

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "@ATHENA_VERSION@")
+set(PACKAGE_VERSION "@ATHENA_VERSION_STRING@")
  
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")

atdna/atdnaHelpers.cmake

@@ -0,0 +1,154 @@
+#
+# gather_include_directories recursively builds a list of include directories
+# across all dependencies.
+#
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.20")
+  # Don't transform add_custom_command DEPFILE for Ninja
+  cmake_policy(SET CMP0116 OLD)
+endif ()
+
+function(_atdna_gather_include_directories_impl target_name)
+  get_target_property(target_dependencies ${target_name} INTERFACE_LINK_LIBRARIES)
+  foreach(dep ${target_dependencies})
+    if(TARGET ${dep})
+      get_target_property(dep_includes ${dep} INTERFACE_INCLUDE_DIRECTORIES)
+      if(dep_includes)
+        list(APPEND target_includes ${dep_includes})
+      endif()
+      _atdna_gather_include_directories_impl(${dep})
+    endif()
+  endforeach()
+  set(target_includes ${target_includes} PARENT_SCOPE)
+endfunction()
+
+function(atdna_gather_include_directories var target_name)
+  unset(target_includes)
+  get_directory_property(dir_includes INCLUDE_DIRECTORIES)
+  if(dir_includes)
+    list(APPEND target_includes ${dir_includes})
+  endif()
+  get_target_property(target_includes1 ${target_name} INCLUDE_DIRECTORIES)
+  if(target_includes1)
+    list(APPEND target_includes ${target_includes1})
+  endif()
+  get_target_property(target_includes2 ${target_name} INTERFACE_INCLUDE_DIRECTORIES)
+  if(target_includes2)
+    list(APPEND target_includes ${target_includes2})
+  endif()
+  _atdna_gather_include_directories_impl(${target_name})
+  list(REMOVE_DUPLICATES target_includes)
+  set(${var} ${target_includes} PARENT_SCOPE)
+endfunction()
+
+function(_atdna_gather_compile_definitions_impl target_name)
+  get_target_property(target_dependencies ${target_name} INTERFACE_LINK_LIBRARIES)
+  foreach(dep ${target_dependencies})
+    if(TARGET ${dep})
+      get_target_property(dep_defines ${dep} INTERFACE_COMPILE_DEFINITIONS)
+      if(dep_defines)
+        list(APPEND target_defines ${dep_defines})
+      endif()
+      _atdna_gather_compile_definitions_impl(${dep})
+    endif()
+  endforeach()
+  set(target_defines ${target_defines} PARENT_SCOPE)
+endfunction()
+
+function(atdna_gather_compile_definitions var target_name)
+  unset(target_defines)
+  get_directory_property(dir_defines COMPILE_DEFINITIONS)
+  if(dir_defines)
+    list(APPEND target_defines ${dir_defines})
+  endif()
+  get_target_property(target_defines1 ${target_name} COMPILE_DEFINITIONS)
+  if(target_defines1)
+    list(APPEND target_defines ${target_defines1})
+  endif()
+  get_target_property(target_defines2 ${target_name} INTERFACE_COMPILE_DEFINITIONS)
+  if(target_defines2)
+    list(APPEND target_defines ${target_defines2})
+  endif()
+  _atdna_gather_compile_definitions_impl(${target_name})
+  list(REMOVE_DUPLICATES target_defines)
+  set(${var} ${target_defines} PARENT_SCOPE)
+endfunction()
+
+#######################
+# In-tree atdna macro #
+#######################
+
+# Super handy macro for adding atdna target
+function(atdna out incdirs cdefs)
+  # Ninja wants invocations in root binary dir for DEPFILE application
+  file(RELATIVE_PATH out_rel ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/${out}")
+
+  # Make input files source-relative
+  unset(ins)
+  unset(ins_impdeps)
+  foreach(arg ${ARGN})
+    list(APPEND ins ${CMAKE_CURRENT_SOURCE_DIR}/${arg})
+    list(APPEND ins_impdeps CXX)
+    list(APPEND ins_impdeps ${CMAKE_CURRENT_SOURCE_DIR}/${arg})
+  endforeach()
+
+  # MS extra
+  unset(extraargs)
+  if(MSVC)
+    list(APPEND extraargs -fms-compatibility -fexceptions)
+    if(MSVC_VERSION EQUAL 1800)
+      list(APPEND extraargs -fms-compatibility-version=18.00)
+    elseif(MSVC_VERSION EQUAL 1900)
+      list(APPEND extraargs -fms-compatibility-version=19.00)
+    elseif(MSVC_VERSION EQUAL 1910)
+      list(APPEND extraargs -fms-compatibility-version=19.10)
+    elseif(MSVC_VERSION EQUAL 1911)
+      list(APPEND extraargs -fms-compatibility-version=19.11)
+  endif()
+
+  # OSX Extra
+  elseif(APPLE)
+    get_filename_component(COMPILER_DIR "${CMAKE_CXX_COMPILER}" DIRECTORY)
+    if (NOT EXISTS "${CMAKE_OSX_SYSROOT}")
+      message(FATAL_ERROR "CMAKE_OSX_SYSROOT not set")
+    endif()
+    file(GLOB SYSTEM_INCLUDE_DIR "${COMPILER_DIR}/../lib/clang/*/include")
+    list(APPEND extraargs
+         -isysroot ${CMAKE_OSX_SYSROOT}
+         -stdlib++-isystem "${COMPILER_DIR}/../include/c++/v1"
+         -isystem "${SYSTEM_INCLUDE_DIR}")
+  endif()
+
+  # Make target
+  if(${CMAKE_GENERATOR} STREQUAL "Ninja")
+    # Use Ninja's DEPFILE parser in cooperation with atdna
+    add_custom_command(OUTPUT ${out} COMMAND $<TARGET_FILE:atdna>
+                       ARGS ${extraargs} -o ${out_rel} -MD -MT ${out_rel} -MF ${out_rel}.d
+                       "$<$<BOOL:${incdirs}>:-I$<JOIN:${incdirs},;-I>>"
+                       "$<$<BOOL:${cdefs}>:-D$<JOIN:${cdefs},;-D>>"
+                       "-I${athena_SOURCE_DIR}/include" ${ins}
+                       DEPENDS atdna ${ins} IMPLICIT_DEPENDS ${ins_impdeps}
+                       DEPFILE "${CMAKE_CURRENT_BINARY_DIR}/${out}.d"
+                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                       COMMENT "Generating DNA ${out_rel}"
+                       COMMAND_EXPAND_LISTS)
+  else()
+    # Use CMake's built-in dependency scanner for makefile targets
+    add_custom_command(OUTPUT ${out} COMMAND $<TARGET_FILE:atdna>
+                       ARGS ${extraargs} -o ${out_rel}
+                       "$<$<BOOL:${incdirs}>:-I$<JOIN:${incdirs},;-I>>"
+                       "$<$<BOOL:${cdefs}>:-D$<JOIN:${cdefs},;-D>>"
+                       "-I${athena_SOURCE_DIR}/include" ${ins}
+                       DEPENDS atdna ${ins} IMPLICIT_DEPENDS ${ins_impdeps}
+                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                       COMMENT "Generating DNA ${out_rel}"
+                       COMMAND_EXPAND_LISTS)
+  endif()
+endfunction()
+
+function(target_atdna target out)
+  atdna_gather_include_directories(include_list ${target})
+  atdna_gather_compile_definitions(define_list ${target})
+  atdna(${out} "${include_list}" "${define_list}" ${ARGN})
+  target_sources(${target} PRIVATE ${out} ${ARGN})
+endfunction()

atdna/main.rc.in

@@ -17,12 +17,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Jackoalan / Antidote"
             VALUE "FileDescription", "ATDNA"
-            VALUE "FileVersion", "@ATHENA_MAJOR_VERSION@.@ATHENA_MINOR_VERSION@.@ATHENA_PATCH_VERSION@" 
-            VALUE "LegalCopyright", "Copyright (C) 2015 Jackoalan / Antidote"
+            VALUE "FileVersion", "@ATHENA_VERSION@"
+            VALUE "LegalCopyright", "Copyright (C) 2016 Jackoalan / Antidote"
             VALUE "InternalName", "atdna"
             VALUE "OriginalFilename", "atdna.exe"
             VALUE "ProductName", "ATDNA"
-            VALUE "ProductVersion", "@ATHENA_MAJOR_VERSION@.@ATHENA_MINOR_VERSION@.@ATHENA_PATCH_VERSION@"
+            VALUE "ProductVersion", "@ATHENA_VERSION@"
         END
     END
     BLOCK "VarFileInfo"

atdna/test.cpp

@@ -0,0 +1,28 @@
+#include "test.hpp"
+
+#include <athena/MemoryWriter.hpp>
+#include <fmt/format.h>
+
+#define EXPECTED_BYTES 281
+
+int main(int argc, const char** argv) {
+  TESTFile<atUint32, 2> file = {};
+  file.arrCount[0] = 2;
+  file.array.push_back(42);
+  file.array.push_back(64);
+  size_t binSize = 0;
+  file.binarySize(binSize);
+  athena::io::MemoryCopyWriter w(nullptr, binSize);
+  atInt64 pos = w.position();
+  file.write(w);
+
+  const bool pass = !w.hasError() && w.position() - pos == binSize && binSize == EXPECTED_BYTES;
+  if (pass) {
+    fmt::print(FMT_STRING("[PASS] {} bytes written\n"), size_t(w.position() - pos));
+  } else {
+    fmt::print(FMT_STRING("[FAIL] {} bytes written; {} bytes sized; {} bytes expected\n"), size_t(w.position() - pos), binSize,
+               EXPECTED_BYTES);
+  }
+
+  return pass ? 0 : 1;
+}

atdna/test.hpp

@@ -1,75 +1,73 @@
-#include <Athena/DNAYaml.hpp>
+#include <athena/DNAYaml.hpp>
 
-using namespace Athena;
-typedef io::DNAYaml<BigEndian> BigDNA;
+using namespace athena;
+typedef io::DNA<Endian::Big> BigDNA;
 
-struct TESTSubFile : public BigDNA
-{
-    DECL_DNA
-    DECL_YAML
-    Value<atUint32> sub1;
-    Value<atUint32> sub2;
+enum ETest : atUint8 { ZERO, ONE, TWO, THREE };
+
+template <ETest EVal>
+struct AT_SPECIALIZE_PARMS(ETest::ZERO, ETest::ONE, ETest::TWO, ETest::THREE) TESTSubFile : public BigDNA {
+  AT_DECL_DNA
+  Value<ETest> varE = EVal;
+  Value<atUint32> sub1;
+  Value<atUint32> sub2;
 };
 
-struct TESTSubClassFile : public TESTSubFile
-{
-    DECL_DNA
-    DECL_YAML
-    Value<atUint32> sub3;
-    Value<atUint32> sub4;
+struct TESTSubClassFile : public TESTSubFile<ETest::ONE> {
+  AT_DECL_DNA
+  Value<atUint32> sub3;
+  Value<atUint16> sub4;
 };
 
-struct TESTSubSubClassFile : public TESTSubClassFile
-{
-    DECL_DNA
-    DECL_YAML
-    Value<atUint32> sub5;
-    Value<atUint32> sub6;
+struct TESTSubSubClassFile : public TESTSubClassFile {
+  AT_DECL_DNA
+  Value<atUint32> sub5;
+  Value<atUint32> sub6;
 };
 
-struct TESTFile : public BigDNA
-{
-    DECL_DNA
-    DECL_YAML
-    Value<bool> varBool;
-    Value<atUint32> var32;
-    Value<atUint16> var16;
-    Value<atVec3f> vec3;
-    Value<atVec4f> vec4;
+template <class Var32Tp, int Var32Val>
+struct AT_SPECIALIZE_PARMS(atUint16, 42, atUint32, 87, atUint32, 2) TESTFile : public BigDNA {
+  AT_DECL_DNA
+  Value<bool> varBool;
+  AT_OVERRIDE_RCRC32(12345678) Value<Var32Tp> x4_var32 = Var32Val;
+  AT_OVERRIDE_RCRC32(deadbabe) Value<atUint16> x8_var16;
+  Value<atVec3f> vec3;
+  Value<atVec4f> vec4;
 
-    struct TESTNestedSubFile : public BigDNA
-    {
-        DECL_DNA
-        DECL_YAML
-        Value<atUint32> nestSub1;
-        Value<atUint32> nestSub2;
-    } nestedSubFile; 
+  struct TESTNestedSubFile : public BigDNA {
+    AT_DECL_DNA
+    Value<atUint32> nestSub1;
+    Value<atUint32> nestSub2;
+  } nestedSubFile;
 
-    TESTSubFile subFile;
+  using TESTSubFileUsing = TESTSubFile<ETest::TWO>;
+  TESTSubFileUsing subFile;
 
-    Align<4> align;
+  Align<4> align;
 
-    struct TESTExplicitSubFile : public BigDNA
-    {
-        DECL_EXPLICIT_DNA
-        DECL_YAML
-        Value<atUint32> explSub1;
-        Value<atUint32> explSub2;
-    } explSubFile;
+  template <class NestedTp, int NestedVal>
+  struct AT_SPECIALIZE_PARMS(atInt32, 36, atInt64, 96) TESTTemplateSubFile : public BigDNA {
+    AT_DECL_DNA
+    Value<NestedTp> explSub1 = NestedVal;
+    Value<Var32Tp> explSub2 = Var32Val;
+  };
+  Value<TESTTemplateSubFile<atInt32, 36>> nestedTemplate1;
+  Value<TESTTemplateSubFile<atInt64, 96>> nestedTemplate2;
 
-    Value<atUint32> arrCount[2];
-    Vector<atUint32, DNA_COUNT(arrCount[0])> array;
+  Value<atUint32, Endian::Little> arrCount[2];
+  Vector<atUint32, AT_DNA_COUNT(arrCount[0])> array;
 
-    Seek<21, Current> seek;
+  Value<atUint32> arrAltCount;
+  Vector<atUint32, AT_DNA_COUNT(arrAltCount)> arrayAlt;
 
-    Value<atUint32> arrCount2;
-    Vector<TESTSubFile, DNA_COUNT(arrCount[1] + arrCount2)> array2;
+  Seek<21, SeekOrigin::Current> seek;
 
-    Value<atUint32> bufSz;
-    Buffer<DNA_COUNT(bufSz)> buf;
+  Value<atUint32> arrCount2;
+  Vector<TESTSubFile<ETest::ZERO>, AT_DNA_COUNT(arrCount[1] + arrCount2)> array2;
 
-    String<32> str;
-    WString<64> wstr;
-    WStringAsString<> utf8str[5];
+  Value<atUint32> bufSz;
+  Buffer<AT_DNA_COUNT(bufSz)> buf;
+
+  String<32> str;
+  WString<64> wstr;
 };
-

cmake/Platform/Switch.cmake

@@ -0,0 +1,3 @@
+set(CMAKE_EXECUTABLE_SUFFIX ".nro.so")
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "/usr/bin/llvm-mc ${AS_FLAGS} <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")

cmake/SwitchTools_nx.cmake

@@ -0,0 +1,175 @@
+
+get_filename_component(__tools_switch_sdir ${CMAKE_CURRENT_LIST_FILE} PATH) # Used to locate files to be used with configure_file
+
+#############
+## ELF2NRO ##
+#############
+if (NOT ELF2NRO)
+    # message(STATUS "Looking for makerom...")
+    find_program(ELF2NRO elf2nro ${DEVKITPRO}/tools/bin)
+    if (ELF2NRO)
+        message(STATUS "elf2nro: ${ELF2NRO} - found")
+    else ()
+        message(WARNING "elf2nro - not found")
+    endif ()
+endif ()
+
+#############
+## ELF2KIP ##
+#############
+if (NOT ELF2KIP)
+    # message(STATUS "Looking for makerom...")
+    find_program(ELF2KIP elf2kip ${DEVKITPRO}/tools/bin)
+    if (ELF2KIP)
+        message(STATUS "elf2kip: ${ELF2KIP} - found")
+    else ()
+        message(WARNING "elf2kip - not found")
+    endif ()
+endif ()
+#############
+## ELF2NSO ##
+#############
+if (NOT ELF2NSO)
+    # message(STATUS "Looking for makerom...")
+    find_program(ELF2NSO elf2nso ${DEVKITPRO}/tools/bin)
+    if (ELF2NSO)
+        message(STATUS "elf2nso: ${ELF2NSO} - found")
+    else ()
+        message(WARNING "elf2nso - not found")
+    endif ()
+endif ()
+
+#############
+##  BIN2S  ##
+#############
+if (NOT BIN2S)
+    # message(STATUS "Looking for bin2s...")
+    find_program(BIN2S bin2s ${DEVKITPRO}/tools/bin)
+    if (BIN2S)
+        message(STATUS "bin2s: ${BIN2S} - found")
+    else ()
+        message(WARNING "bin2s - not found")
+    endif ()
+endif ()
+
+#############
+##  RAW2C  ##
+#############
+if (NOT RAW2C)
+    # message(STATUS "Looking for bin2s...")
+    find_program(RAW2C raw2c ${DEVKITPRO}/tools/bin)
+    if (RAW2C)
+        message(STATUS "raw2c: ${RAW2C} - found")
+    else ()
+        message(WARNING "raw2c - not found")
+    endif ()
+endif ()
+
+##################
+##  BUILD_PFS0  ##
+##################
+if (NOT BUILD_PFS0)
+    # message(STATUS "Looking for bin2s...")
+    find_program(BUILD_PFS0 build_pfs0 ${DEVKITPRO}/tools/bin)
+    if (BUILD_PFS0)
+        message(STATUS "build_pfs0: ${BUILD_PFS0} - found")
+    else ()
+        message(WARNING "build_pfs0 - not found")
+    endif ()
+endif ()
+
+################
+##  NACPTOOL  ##
+################
+if (NOT NACPTOOL)
+    # message(STATUS "Looking for bin2s...")
+    find_program(NACPTOOL nacptool ${DEVKITPRO}/tools/bin)
+    if (NACPTOOL)
+        message(STATUS "nacptool: ${NACPTOOL} - found")
+    else ()
+        message(WARNING "nacptool - not found")
+    endif ()
+endif ()
+
+
+function(__add_nacp target APP_TITLE APP_AUTHOR APP_VERSION)
+    set(__NACP_COMMAND ${NACPTOOL} --create ${APP_TITLE} ${APP_AUTHOR} ${APP_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/${target})
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}
+            COMMAND ${__NACP_COMMAND}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+            VERBATIM
+            )
+endfunction()
+function(add_nro_target target)
+    get_filename_component(target_we ${target} NAME_WE)
+    if ((NOT (${ARGC} GREATER 1 AND "${ARGV1}" STREQUAL "NO_NACP")) OR (${ARGC} GREATER 3))
+        if (${ARGC} GREATER 3)
+            set(APP_TITLE ${ARGV1})
+            set(APP_AUTHOR ${ARGV2})
+            set(APP_VERSION ${ARGV3})
+        endif ()
+        if (${ARGC} EQUAL 5)
+            set(APP_ICON ${ARGV4})
+        endif ()
+        if (NOT APP_TITLE)
+            set(APP_TITLE ${target})
+        endif ()
+        if (NOT APP_AUTHOR)
+            set(APP_AUTHOR "Unspecified Author")
+        endif ()
+        if (NOT APP_VERSION)
+            set(APP_VERSION "1.0")
+        endif ()
+        if (NOT APP_ICON)
+            if (EXISTS ${target}.png)
+                set(APP_ICON ${target}.jpg)
+            elseif (EXISTS icon.jpg)
+                set(APP_ICON icon.jpg)
+            elseif (NX)
+                set(APP_ICON ${DEVKITPRO}/libnx/default_icon.jpg)
+            else ()
+                message(FATAL_ERROR "No icon found ! Please use NO_SMDH or provide some icon.")
+            endif ()
+        endif ()
+        if (NOT ${target_we}.nacp)
+            __add_nacp(${target_we}.nacp ${APP_TITLE} ${APP_AUTHOR} ${APP_VERSION})
+        endif ()
+        if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+            add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro
+                    COMMAND ${ELF2NRO} $<TARGET_FILE:${target}> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro --icon=${APP_ICON} --nacp=${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp
+                    DEPENDS ${target} ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp
+                    VERBATIM
+                    )
+        else ()
+            message("${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp")
+            add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro
+                    COMMAND ${ELF2NRO} $<TARGET_FILE:${target}> ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro --icon=${APP_ICON} --nacp=${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp
+                    DEPENDS ${target} ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp
+                    VERBATIM
+                    )
+        endif ()
+    else ()
+        message(STATUS "No nacp file will be generated")
+        if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+            add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro
+                    COMMAND ${ELF2NRO} $<TARGET_FILE:${target}> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro
+                    DEPENDS ${target}
+                    VERBATIM
+                    )
+        else ()
+            add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro
+                    COMMAND ${ELF2NRO} $<TARGET_FILE:${target}> ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro
+                    DEPENDS ${target}
+                    VERBATIM
+                    )
+        endif ()
+
+    endif ()
+    if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+        add_custom_target(${target_we}_nro ALL SOURCES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro)
+
+    else ()
+        add_custom_target(${target_we}_nro ALL SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro)
+    endif ()
+endfunction()

cmake/SwitchTools_trn.cmake

@@ -0,0 +1,71 @@
+set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6)
+find_package(PythonInterp 3 REQUIRED)
+
+set(CONVERTER "${LIBTRN}/tools/elf2nxo.py")
+
+function(add_nro_target target)
+    get_filename_component(target_we ${target} NAME_WE)
+    if ((NOT (${ARGC} GREATER 1 AND "${ARGV1}" STREQUAL "NO_HDR")) OR (${ARGC} GREATER 3))
+        if (${ARGC} GREATER 3)
+            set(APP_TITLE ${ARGV1})
+            set(APP_AUTHOR ${ARGV2})
+            set(APP_VERSION ${ARGV3})
+        endif ()
+        if (${ARGC} EQUAL 5)
+            set(APP_ICON ${ARGV4})
+        endif ()
+        if (NOT APP_TITLE)
+            set(APP_TITLE ${target})
+        endif ()
+        if (NOT APP_AUTHOR)
+            set(APP_AUTHOR "Unspecified Author")
+        endif ()
+        if (NOT APP_VERSION)
+            set(APP_VERSION "1.0")
+        endif ()
+        if (NOT APP_ICON)
+            if (EXISTS ${target}.png)
+                set(APP_ICON ${target}.png)
+            elseif (EXISTS icon.png)
+                set(APP_ICON icon.png)
+            else ()
+                message(FATAL_ERROR "No icon found ! Please use NO_SMDH or provide some icon.")
+            endif ()
+        endif ()
+        if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+            add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro
+                    COMMAND ${PYTHON_EXECUTABLE} ${CONVERTER} -n ${APP_TITLE} -d ${APP_AUTHOR} -v ${APP_VERSION} -i ${APP_ICON} $<TARGET_FILE:${target}> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro nro
+                    DEPENDS ${target} ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp
+                    VERBATIM
+                    )
+        else ()
+            add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro
+                    COMMAND ${PYTHON_EXECUTABLE} ${CONVERTER} -n ${APP_TITLE} -d ${APP_AUTHOR} -v ${APP_VERSION} -i ${APP_ICON} $<TARGET_FILE:${target}> ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro nro
+                    DEPENDS ${target} ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp
+                    VERBATIM
+                    )
+        endif ()
+    else ()
+        message(STATUS "No header will be generated")
+        if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+            add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro
+                    COMMAND ${PYTHON_EXECUTABLE} ${CONVERTER} $<TARGET_FILE:${target}> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro nro
+                    DEPENDS ${target}
+                    VERBATIM
+                    )
+        else ()
+            add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro
+                    COMMAND ${PYTHON_EXECUTABLE} ${CONVERTER} $<TARGET_FILE:${target}> ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro nro
+                    DEPENDS ${target}
+                    VERBATIM
+                    )
+        endif ()
+
+    endif ()
+    if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+        add_custom_target(${target_we}_nro ALL SOURCES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target_we}.nro)
+
+    else ()
+        add_custom_target(${target_we}_nro ALL SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nro)
+    endif ()
+endfunction()

extern/CMakeLists.txt

@@ -1,3 +1,15 @@
-add_subdirectory(lzo)
+add_subdirectory(lzokay)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  target_compile_options(lzokay PRIVATE -Wno-maybe-uninitialized)
+endif ()
 add_subdirectory(zlib)
 add_subdirectory(yaml)
+if(NOT TARGET fmt)
+  add_subdirectory(fmt)
+  target_compile_definitions(fmt PUBLIC
+          FMT_STRING_ALIAS=1
+          FMT_ARM_ABI_COMPATIBILITY=1
+          FMT_EXCEPTIONS=0)
+  target_compile_definitions(fmt INTERFACE
+          FMT_ENFORCE_COMPILE_STRING=1)
+endif()

extern/lzo/AUTHORS

@@ -1,3 +0,0 @@
-Authors of the LZO data compression library:
-
-Markus F.X.J. Oberhumer.  Invented, designed and implemented LZO.

extern/lzo/BUGS

@@ -1,21 +0,0 @@
-============================================================================
-LZO -- a real-time data compression library
-============================================================================
-
-LZO is free of any known bugs.
-
-Nevertheless LZO has been reported to break the optimizer of some
-compilers including gcc 2.7.2 (AIX, IRIX) and Watcom C 9.5.
-
-So if 'lzotest' reports data decompression errors you should recompile
-everything without optimizations and see if that fixes the problem.
-I'd like to hear about optimizer problems and possible workarounds.
-
-
-Known compiler problems:
-------------------------
-  some versions of gcc    use '-O2 -fno-strength-reduce'
-  some versions of gcc    use '-O2 -fno-schedule-insns -fno-schedule-insns2'
-  Watcom C 9.5            compile with '-oneax' instead of '-oneatx'
-
-

extern/lzo/CMakeLists.txt

@@ -1,85 +0,0 @@
-if(NOT WIN32)
-find_library(LZO_LIB lzo2)
-endif()
-if(WIN32 OR LZO_LIB STREQUAL LZO_LIB-NOTFOUND)
-include_directories(include)
-message("-- Using Athena's built-in lzo")
-add_library(lzo2
-    src/lzo1.c
-    src/lzo1_99.c
-    src/lzo1a.c
-    src/lzo1a_99.c
-    src/lzo1b_1.c
-    src/lzo1b_2.c
-    src/lzo1b_3.c
-    src/lzo1b_4.c
-    src/lzo1b_5.c
-    src/lzo1b_6.c
-    src/lzo1b_7.c
-    src/lzo1b_8.c
-    src/lzo1b_9.c
-    src/lzo1b_99.c
-    src/lzo1b_9x.c
-    src/lzo1b_cc.c
-    src/lzo1b_d1.c
-    src/lzo1b_d2.c
-    src/lzo1b_rr.c
-    src/lzo1b_xx.c
-    src/lzo1c_1.c
-    src/lzo1c_2.c
-    src/lzo1c_3.c
-    src/lzo1c_4.c
-    src/lzo1c_5.c
-    src/lzo1c_6.c
-    src/lzo1c_7.c
-    src/lzo1c_8.c
-    src/lzo1c_9.c
-    src/lzo1c_99.c
-    src/lzo1c_9x.c
-    src/lzo1c_cc.c
-    src/lzo1c_d1.c
-    src/lzo1c_d2.c
-    src/lzo1c_rr.c
-    src/lzo1c_xx.c
-    src/lzo1f_1.c
-    src/lzo1f_9x.c
-    src/lzo1f_d1.c
-    src/lzo1f_d2.c
-    src/lzo1x_1.c
-    src/lzo1x_1k.c
-    src/lzo1x_1l.c
-    src/lzo1x_1o.c
-    src/lzo1x_9x.c
-    src/lzo1x_d1.c
-    src/lzo1x_d2.c
-    src/lzo1x_d3.c
-    src/lzo1x_o.c
-    src/lzo1y_1.c
-    src/lzo1y_9x.c
-    src/lzo1y_d1.c
-    src/lzo1y_d2.c
-    src/lzo1y_d3.c
-    src/lzo1y_o.c
-    src/lzo1z_9x.c
-    src/lzo1z_d1.c
-    src/lzo1z_d2.c
-    src/lzo1z_d3.c
-    src/lzo2a_9x.c
-    src/lzo2a_d1.c
-    src/lzo2a_d2.c
-    src/lzo_crc.c
-    src/lzo_init.c
-    src/lzo_ptr.c
-    src/lzo_str.c
-    src/lzo_util.c
-    include/lzo/lzo1.h
-    include/lzo/lzo1x.h
-    include/lzo/lzoconf.h
-    include/lzo/lzodefs.h
-    include/lzo/lzoutil.h)
-if(WIN32 AND NOT UNIX)
-install(DIRECTORY include/lzo DESTINATION include COMPONENT lzo2)
-install(TARGETS lzo2 DESTINATION lib COMPONENT lzo2)
-endif()
-set(LZO_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "LZO include path" FORCE)
-endif()

extern/lzo/COPYING

@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

extern/lzo/ChangeLog

@@ -1,3 +0,0 @@
-Sorry, no detailed ChangeLog available yet.
-
-Please see the file NEWS for a list of user visible changes.

extern/lzo/INSTALL

@@ -1,265 +0,0 @@
-Introduction
-============
-
-  This installation guide is for POSIX (Autoconf) systems.
-  For Win32, Win64, DOS and OS/2 please read the file B/00README.TXT.
-
-  Quick start
-  -----------
-    ./configure
-    make
-    make check
-    make test     (run a full test)
-    make install  (when logged in as root)
-
-  Exotic machines
-  ---------------
-  Instead of using Autoconf you may want to adapt the simple build
-  script in B/generic/build.sh.
-
-  Shared libraries
-  ----------------
-  LZO uses Libtool so that shared libraries are supported on many
-  systems. If want to build shared libraries type you have to type
-  `./configure --enable-shared' - building shared libraries is not
-  enabled by default.
-
-  Assembler versions
-  ------------------
-  On Intel i386 systems, the assembler versions of the decompressors are
-  built and used by default. You can use `./configure --disable-asm' if
-  for some reason they cause compilation problems on your system.
-
-
-
-[ The standard Autoconf installation instructions follow below. ]
-
-
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

extern/lzo/NEWS

@@ -1,288 +0,0 @@
-============================================================================
-User visible changes for LZO -- a real-time data compression library
-============================================================================
-
-Changes in 2.09 (04 Feb 2015)
-  * Work around gcc bug #64516 that could affect architectures like
-    armv4, armv5 and sparc.
-
-Changes in 2.08 (29 Jun 2014)
-  * Updated the Autoconf scripts to fix some reported build problems.
-  * Added CMake build support.
-  * Fixed lzo_init() on big-endian architectures like Sparc.
-
-Changes in 2.07 (25 Jun 2014)
-  * Fixed a potential integer overflow condition in the "safe" decompressor
-    variants which could result in a possible buffer overrun when
-    processing maliciously crafted compressed input data.
-
-    Fortunately this issue only affects 32-bit systems and also can only happen
-    if you use uncommonly huge buffer sizes where you have to decompress more
-    than 16 MiB (> 2^24 bytes) untrusted compressed bytes within a single
-    function call, so the practical implications are limited.
-
-    POTENTIAL SECURITY ISSUE. CVE-2014-4607.
-
-  * Removed support for ancient configurations like 16-bit "huge" pointers -
-    LZO now requires a flat 32-bit or 64-bit memory model.
-  * Assorted cleanups.
-
-Changes in 2.06 (12 Aug 2011)
-  * Some minor optimizations for big-endian architectures.
-  * Fixed overly strict malloc() misalignment check in examples.
-
-Changes in 2.05 (23 Apr 2011)
-  * Converted the configure system to non-recursive Automake.
-  * Applied some overdue speed optimizations for modern x86/x64 architectures
-    and current compilers like gcc 4.6 and MSVC 2010.
-
-Changes in 2.04 (31 Oct 2010)
-  * Fixed a gcc-4.5 aliasing issue in lzo_init().
-  * Updated the configure system.
-  * Assorted cleanups.
-
-Changes in 2.03 (30 Apr 2008)
-  * Updated the ELF assembler sources to mark the stack as non-executable.
-  * Fixed a HP-UX 11 build issue with Itanium in ILP32 mode.
-  * Updated the configure system.
-
-Changes in 2.02 (17 Oct 2005)
-  * Updated the build and Autoconf scripts to fix some reported
-    compilation problems.
-
-Changes in 2.01 (27 Jun 2005)
-  * Changed the configure system to install the LZO library under the
-    name "liblzo2" so that parallel installation with LZO v1 is possible.
-  * Improved auto-configuration in miniLZO for some embedded targets like
-    Blackfin and H8/300 processors.
-
-Changes in 2.00 (30 May 2005)
-
-  [Library interface changes]
-  * The 'lzo_uint' typedef has been changed to match 'size_t', which means
-    it now is 64 bits on most 64-bit architectures. 32-bit machines
-    are not affected by this change.
-  * The formula for maximum expansion of incompressible data has changed.
-    See doc/LZO.FAQ. This is needed for some upcoming speed improvements,
-    and also for compatibility with our commercial LZO Professional product.
-  * The progress indicator callback interface has been revamped.
-  * All public header files now get installed into a "lzo" subdirectory, so
-    your applications should use #include <lzo/lzoXXX.h>.
-  * A number of (internal) macros have been renamed. See LZO_CFG_COMPAT
-    in <lzo/lzoconf.h> if your code depends on these.
-
-  [Speed]
-  * Small overall speedup by exploiting features like branch prediction
-    hints and explicit inline control present in modern C/C++ compilers.
-  * Significant speedup for 64-bit architectures like AMD64.
-
-  [Portability]
-  * LZO now fully supports the LLP64 programming model.
-  * LZO now fully supports the ILP64 and SILP64 programming models which
-    are used on some supercomputing architectures.
-  * Full Win64 support for AMD64 (aka x64) and IA64 (Itanium).
-  * Full 16-bit support for ancient DOS 286 protected mode, OS/2 1.x
-    and Windows 3.x.
-  * The LZO library now compiles and works on completely freestanding or
-    embedded systems as long as you have <limits.h> and <stddef.h> header
-    files. See the B/generic/build_freestanding.sh build script.
-
-  [Misc]
-  * The i386 assembler versions of the decompressors are now automatically
-    built and installed. See also asm/i386/00README.TXT.
-  * Added include file <lzo/lzo_asm.h> that provides prototypes for all
-    assembler functions.
-  * Under MacOS X, the configure script now will use the '-no-cpp-precomp'
-    compiler option in order to work around bugs in some versions of
-    Apple's native "smart" preprocessor.
-  * Worked around a preprocessor bug that is present in all compilers which
-    are based on the lcc compiler kit.
-  * Added simple B/generic/build.sh build script family.
-  * Added lots of new build scripts for various DOS/Windows compilers.
-
-  [Upgrade instructions from LZO v1 to LZO v2]
-  * On 64-bit architectures, revisit all uses of lzo_uint.
-  * Adapt for the maximum expansion change of incompressible data.
-  * If you use the progress callback then adapt for the new interface.
-  * Use #include <lzo/lzoXXX.h> or adjust your include path.
-  * Check your code for use of deprecated macros. Add a
-    #define LZO_CFG_COMPAT if necessary.
-  * Other than that LZO v2 should be fully source-compatible with LZO v1.
-    Of course, the compressed data is fully compatible as well.
-  * Re-compile and re-link your application.
-  * Enjoy the improvements!
-
-----------------------------------------------------------------------------
-
-Changes in 1.08 (12 Jul 2002)
-  * Much better support for cross compiling.
-  * Straighten out ANSI-conforming compiler checks.
-  * Avoid harmless compiler warnings reported by -Wcast-align.
-  * Fixed some sign extension problems on rather exotic machines where
-    sizeof(size_t) < sizeof(ptrdiff_t) and sizeof(lzo_uint) == sizeof(size_t)
-  * Updated the configure system to use the latest Autoconf, Automake
-    and Libtool versions.
-
-Changes in 1.07 (18 Oct 2000)
-  * Default to '--disable-shared' (I'm getting tired of Libtool's
-    shared library build problems, this time AIX was the culprit).
-  * Avoid some harmless compiler warnings.
-
-Changes in 1.06 (29 Nov 1999)
-  * Updated the configure system to use Autoconf 2.13, Automake 1.4 and
-    Libtool 1.3.3. This should hopefully fix the shared-library build
-    problems that were reported on some machines.
-  * Enhanced example programs a little bit.
-
-Changes in 1.05 (14 Apr 1998)
-  * Just a one-line change in the configure script to workaround
-    a HPUX and IRIX build problem.
-
-Changes in 1.04 (15 Mar 1998)
-  * Worked around a bug in the cpp preprocessor under HPUX 10.20.
-  * Adapted for Automake 1.2f and Libtool 1.1.
-
-Changes in 1.03 (18 Jan 1998)
-  * minor compression ratio improvement
-  * extended example program to show how to do overlapping compression
-  * assembler changes, added support for the nasm assembler
-  * better support for cross compiling
-  * some cleanups
-
-Changes in 1.02 (07 Dec 1997)
-  * improved LZO1X-999 and LZO1Y-999 compression ratio a little bit again
-  * introduced compression levels for LZO1X-999 and LZO1Y-999
-  * added support for preset dictionaries
-  * implemented LZO1X-1(12): needs 16 KiB for compression
-  * new algorithm LZO1Z: this is another variant of LZO1X
-  * added example program: how to use preset dictionaries
-  * added example program: how to do in-place decompression
-  * added a little file-packer example program
-  * LZO now works cleanly under checkergcc
-  * strict 16-bit memory model is working (but not officially supported)
-  * shared libraries are supported on many platforms
-  * adapted for Automake 1.2d and Libtool 1.0h
-
-Changes in 1.01 (10 Aug 1997)
-  * improved LZO1X-999 and LZO1Y-999 compression ratio a little bit
-  * i386+gcc: significant speedup of the C version of the LZO1, LZO1A,
-    LZO1B and LZO1C decompressors
-  * added example programs that show how to generate pre-compressed data
-  * added Makefiles for DOS, Windows and OS/2 targets
-
-Changes in 1.00 (13 Jul 1997)
-  * added miniLZO - can be easily included in your project
-  * improved documentation, added LZO.FAQ
-  * added build scripts for many systems where Autoconf is not available:
-    Windows 3.1 (LIB+DLL), Windows 95/NT (LIB+DLL), DOS (16+32 bit), OS/2
-  * adapted for Automake 1.2 and Libtool 1.0
-
-Changes in 0.90 (27 Jun 1997): never released
-  * LZO now uses GNU Automake 1.0 - lots of configuration changes
-  * added LZO1X-1(11): this version needs only 8 KiB for compression
-  * implemented LZO1Y-1
-  * added i386 assembler decompressors for MASM/TASM/WASM
-  * the name of some assembler functions changed
-  * the numeric value of some error codes changed
-  * portability fixes
-
-Changes in 0.29 (04 May 1997)
-  * Linux ELF shared library support
-  * workaround for gcc 2.7.2 optimizer bug under AIX
-  * added lzo_crc32() checksum
-
-Changes in 0.28 (22 Feb 1997)
-  * new algorithm LZO1Y: LZO1Y-999 and LZO1Y decompressor
-  * added lzo1x_optimize() and lzo1y_optimize()
-  * minor speedup in assembler decompressors (i386+gcc)
-  * ltest.c rewritten
-
-Changes in 0.27 (19 Jan 1997)
-  * fixed a bug in LZO1B-999 and LZO1C-999 that could produce
-    invalid compressed data in very rare cases
-
-Changes in 0.26 (18 Jan 1997): never released
-  * implemented LZO1B-999
-  * renamed LZO1D to LZO2A (also updated all docs)
-  * some cleanups
-
-Changes in 0.25 (28 Dec 1996): never released
-  * some portability fixes (LZO now works on my old Atari ST :-)
-  * adapted for Autoconf 2.12
-
-Changes in 0.24 (30 Nov 1996): never released
-  * improved performance of LZO1X assembler decompressor on a Pentium (i386+gcc)
-
-Changes in 0.23 (23 Nov 1996)
-  * added LZO1C, LZO1F and LZO1X decompressors in assembler (i386+gcc)
-  * added corresponding LZO_PUBLIC to all LZO_EXTERN functions
-  * added support for Microsoft C 7.0 (16-bit DOS)
-  * introduced lzo_uint32. This could prove useful for a strict 16-bit
-    version that doesn't use 'huge' pointers.
-  * all algorithms use incremental hashing now
-  * some cleanups and portability fixes
-
-Changes in 0.22 (19 Sep 1996)
-  * LZO1X: minor decompressor speedup, added some checks in safe decompressor
-  * Autoconf: added detection of gcc strength-reduction bug
-  * Makefile changes
-
-Changes in 0.21 (08 Sep 1996)
-  * LZO now uses GNU Autoconf 2.10 - lots of configuration changes
-  * a few cosmetical changes
-
-Changes in 0.20 (11 Aug 1996)
-  * new algorithm LZO1X: LZO1X-1, LZO1X-999 and LZO1X decompressor
-  * significantly speeded up LZO1B, LZO1C and LZO1F decompressors
-    on CPUs which allow unaligned memory access (e.g. Intel i386)
-  * greatly speeded up LZO2A-999 compressor at the cost of some memory
-  * some cleanups, portability fixes and minor speedups
-
-Changes in 0.16 (22 Jul 1996)
-  * speeded up LZO1F decompressor a little bit
-  * improved LZO1F-999 compression ratio
-
-Changes in 0.15 (10 Jul 1996)
-  * new algorithm LZO1F: LZO1F-1, LZO1F-999 and LZO1F decompressor
-  * improved LZO2A-999 compression ratio
-  * removed LZO1E as it is dominated by LZO1F
-
-Changes in 0.14 (06 Jul 1996): never released
-  * experimental algorithms: LZO1E and LZO1F
-  * added LZO_EXTERN to all prototypes. Useful when building a DLL.
-  * improved LZO1C-999 and LZO2A-999 compression ratio a little bit
-  * fixed progress indicator callback (it was called only once)
-
-Changes in 0.13 (20 Jun 1996)
-  * some speed improvements in LZO1C-999 and LZO2A-999
-
-Changes in 0.12 (18 Jun 1996): never released
-  * added LZO1C-999, a slow but nearly optimal compressor
-    intended for generating pre-compressed data
-  * added tests for lookbehind-overrun in all safe decompressors
-  * source tree completely rearranged, some filenames changed
-  * extensions changed: a .ch file is a C source code that is included
-    for reasons of code sharing
-  * new algorithm LZO2A: LZO2A-999 and LZO2A decompressor. There is
-    no fast compressor yet.
-  * some cleanups
-
-Changes in 0.11 (29 May 1996)
-  * source tree rearranged
-  * LZO now compiles fine as a C++ library (interface still has C linkage)
-  * improved overall compression ratio a little bit
-  * LZO1B-99/LZO1C-99 now search for longer matches
-  * incremental hash is working, it's a little bit faster
-  * Makefile changed
-  * added lzo_uint and lzo_sizeof in some places
-  * split LZO1B compressor into even more include-files
-
-Changes in 0.10 (20 May 1996): first public release of the LZO library
-  * includes LZO1, LZO1A, LZO1B and LZO1C algorithms
-    (compression levels 1-9 and 99)
-
-14 Mar 1996:
-  * public release of the LZO1A algorithm
-
-04 Mar 1996:
-  * public release of the LZO1 algorithm

extern/lzo/README

@@ -1,32 +0,0 @@
-============================================================================
-LZO -- a real-time data compression library
-============================================================================
-
-Please read the file doc/LZO.TXT for an introduction to LZO.
-See the file doc/LZO.FAQ for various tidbits of information.
-
-See the file NEWS for a list of major changes in the current release.
-
-See the file INSTALL for compilation and installation instructions.
-
-For a quick start how to use LZO look at examples/lzopack.c.
-
-
-Directory overview:
--------------------
-  autoconf      Autoconf configuration files (UNIX specific)
-  B             various support files for DOS, Windows, OS/2, ...
-  doc           documentation
-  examples      example programs
-  include       public header files
-  minilzo       a lightweight subset for easy inclusion in your project
-  src           library source
-  tests         more or less exotic test programs
-  util          some utility scripts
-
-
-Have fun,
-Markus
-
-http://www.oberhumer.com/opensource/lzo/
-

extern/lzo/THANKS

@@ -1,14 +0,0 @@
-I want to thank the following people for giving feedback, doing
-beta-testing or helping me some other way:
-
-Charles W. Sandmann             <sandmann@clio.rice.edu>
-Frank Donahoe                   <fdonahoe@wilkes1.wilkes.edu>
-Holger Berger                   <Holger.Berger@rus.uni-stuttgart.de>
-Jean-loup Gailly                <jloup@gzip.org>
-Laszlo Molnar                   <ml1050@freemail.c3.hu>
-Mark Adler                      <madler@alumni.caltech.edu>
-Paul D. Eccles                  <pde@sd.inri.com>
-Rodolphe Ortalo                 <ortalo@laas.fr>
-William Magro                   <wmagro@TC.Cornell.EDU>
-Wolfgang Lugmayr                <W.Lugmayr@infosys.tuwien.ac.at>
-Natascha

extern/lzo/include/lzo/lzo1.h

@@ -1,84 +0,0 @@
-/* lzo1.h -- public interface of the LZO1 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1_H_INCLUDED
-#define __LZO1_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1_MEM_COMPRESS       ((lzo_uint32_t) (8192L * lzo_sizeof_dict_t))
-#define LZO1_MEM_DECOMPRESS     (0)
-
-
-LZO_EXTERN(int)
-lzo1_compress(const lzo_bytep src, lzo_uint  src_len,
-              lzo_bytep dst, lzo_uintp dst_len,
-              lzo_voidp wrkmem);
-
-LZO_EXTERN(int)
-lzo1_decompress(const lzo_bytep src, lzo_uint  src_len,
-                lzo_bytep dst, lzo_uintp dst_len,
-                lzo_voidp wrkmem /* NOT USED */);
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1_99_MEM_COMPRESS    ((lzo_uint32_t) (65536L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1_99_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzo1a.h

@@ -1,84 +0,0 @@
-/* lzo1a.h -- public interface of the LZO1A compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1A_H_INCLUDED
-#define __LZO1A_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1A_MEM_COMPRESS      ((lzo_uint32_t) (8192L * lzo_sizeof_dict_t))
-#define LZO1A_MEM_DECOMPRESS    (0)
-
-
-LZO_EXTERN(int)
-lzo1a_compress(const lzo_bytep src, lzo_uint  src_len,
-               lzo_bytep dst, lzo_uintp dst_len,
-               lzo_voidp wrkmem);
-
-LZO_EXTERN(int)
-lzo1a_decompress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem /* NOT USED */);
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1A_99_MEM_COMPRESS   ((lzo_uint32_t) (65536L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1a_99_compress(const lzo_bytep src, lzo_uint  src_len,
-                  lzo_bytep dst, lzo_uintp dst_len,
-                  lzo_voidp wrkmem);
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzo1b.h

@@ -1,148 +0,0 @@
-/* lzo1b.h -- public interface of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1B_H_INCLUDED
-#define __LZO1B_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1B_MEM_COMPRESS      ((lzo_uint32_t) (16384L * lzo_sizeof_dict_t))
-#define LZO1B_MEM_DECOMPRESS    (0)
-
-
-/* compression levels */
-#define LZO1B_BEST_SPEED             1
-#define LZO1B_BEST_COMPRESSION       9
-#define LZO1B_DEFAULT_COMPRESSION  (-1)     /* fastest by default */
-
-
-LZO_EXTERN(int)
-lzo1b_compress(const lzo_bytep src, lzo_uint  src_len,
-               lzo_bytep dst, lzo_uintp dst_len,
-               lzo_voidp wrkmem,
-               int compression_level);
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1b_decompress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem /* NOT USED */);
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1b_decompress_safe(const lzo_bytep src, lzo_uint  src_len,
-                      lzo_bytep dst, lzo_uintp dst_len,
-                      lzo_voidp wrkmem /* NOT USED */);
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1b_1_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1b_2_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1b_3_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1b_4_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1b_5_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1b_6_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1b_7_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1b_8_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1b_9_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1B_99_MEM_COMPRESS   ((lzo_uint32_t) (65536L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1b_99_compress(const lzo_bytep src, lzo_uint  src_len,
-                  lzo_bytep dst, lzo_uintp dst_len,
-                  lzo_voidp wrkmem);
-
-
-#define LZO1B_999_MEM_COMPRESS  ((lzo_uint32_t) (3 * 65536L * sizeof(lzo_xint)))
-
-LZO_EXTERN(int)
-lzo1b_999_compress(const lzo_bytep src, lzo_uint  src_len,
-                   lzo_bytep dst, lzo_uintp dst_len,
-                   lzo_voidp wrkmem);
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzo1c.h

@@ -1,148 +0,0 @@
-/* lzo1c.h -- public interface of the LZO1C compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1C_H_INCLUDED
-#define __LZO1C_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1C_MEM_COMPRESS      ((lzo_uint32_t) (16384L * lzo_sizeof_dict_t))
-#define LZO1C_MEM_DECOMPRESS    (0)
-
-
-/* compression levels */
-#define LZO1C_BEST_SPEED             1
-#define LZO1C_BEST_COMPRESSION       9
-#define LZO1C_DEFAULT_COMPRESSION  (-1)     /* fastest by default */
-
-
-LZO_EXTERN(int)
-lzo1c_compress(const lzo_bytep src, lzo_uint  src_len,
-               lzo_bytep dst, lzo_uintp dst_len,
-               lzo_voidp wrkmem,
-               int compression_level);
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1c_decompress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem /* NOT USED */);
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1c_decompress_safe(const lzo_bytep src, lzo_uint  src_len,
-                      lzo_bytep dst, lzo_uintp dst_len,
-                      lzo_voidp wrkmem /* NOT USED */);
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1c_1_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1c_2_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1c_3_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1c_4_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1c_5_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1c_6_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1c_7_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1c_8_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-LZO_EXTERN(int)
-lzo1c_9_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1C_99_MEM_COMPRESS   ((lzo_uint32_t) (65536L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1c_99_compress(const lzo_bytep src, lzo_uint  src_len,
-                  lzo_bytep dst, lzo_uintp dst_len,
-                  lzo_voidp wrkmem);
-
-
-#define LZO1C_999_MEM_COMPRESS  ((lzo_uint32_t) (5 * 16384L * sizeof(short)))
-
-LZO_EXTERN(int)
-lzo1c_999_compress(const lzo_bytep src, lzo_uint  src_len,
-                   lzo_bytep dst, lzo_uintp dst_len,
-                   lzo_voidp wrkmem);
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzo1f.h

@@ -1,96 +0,0 @@
-/* lzo1f.h -- public interface of the LZO1F compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1F_H_INCLUDED
-#define __LZO1F_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1F_MEM_COMPRESS      ((lzo_uint32_t) (16384L * lzo_sizeof_dict_t))
-#define LZO1F_MEM_DECOMPRESS    (0)
-
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1f_decompress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem /* NOT USED */);
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1f_decompress_safe(const lzo_bytep src, lzo_uint  src_len,
-                      lzo_bytep dst, lzo_uintp dst_len,
-                      lzo_voidp wrkmem /* NOT USED */);
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1f_1_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1F_999_MEM_COMPRESS  ((lzo_uint32_t) (5 * 16384L * sizeof(short)))
-
-LZO_EXTERN(int)
-lzo1f_999_compress(const lzo_bytep src, lzo_uint  src_len,
-                   lzo_bytep dst, lzo_uintp dst_len,
-                   lzo_voidp wrkmem);
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzo1x.h

@@ -1,165 +0,0 @@
-/* lzo1x.h -- public interface of the LZO1X compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1X_H_INCLUDED
-#define __LZO1X_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1X_MEM_COMPRESS      LZO1X_1_MEM_COMPRESS
-#define LZO1X_MEM_DECOMPRESS    (0)
-#define LZO1X_MEM_OPTIMIZE      (0)
-
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1x_decompress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem /* NOT USED */);
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1x_decompress_safe(const lzo_bytep src, lzo_uint  src_len,
-                      lzo_bytep dst, lzo_uintp dst_len,
-                      lzo_voidp wrkmem /* NOT USED */);
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO1X_1_MEM_COMPRESS    ((lzo_uint32_t) (16384L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1x_1_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-
-
-/***********************************************************************
-// special compressor versions
-************************************************************************/
-
-/* this version needs only 8 KiB work memory */
-#define LZO1X_1_11_MEM_COMPRESS ((lzo_uint32_t) (2048L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1x_1_11_compress(const lzo_bytep src, lzo_uint  src_len,
-                    lzo_bytep dst, lzo_uintp dst_len,
-                    lzo_voidp wrkmem);
-
-
-/* this version needs 16 KiB work memory */
-#define LZO1X_1_12_MEM_COMPRESS ((lzo_uint32_t) (4096L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1x_1_12_compress(const lzo_bytep src, lzo_uint  src_len,
-                    lzo_bytep dst, lzo_uintp dst_len,
-                    lzo_voidp wrkmem);
-
-
-/* use this version if you need a little more compression speed */
-#define LZO1X_1_15_MEM_COMPRESS ((lzo_uint32_t) (32768L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1x_1_15_compress(const lzo_bytep src, lzo_uint  src_len,
-                    lzo_bytep dst, lzo_uintp dst_len,
-                    lzo_voidp wrkmem);
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1X_999_MEM_COMPRESS  ((lzo_uint32_t) (14 * 16384L * sizeof(short)))
-
-LZO_EXTERN(int)
-lzo1x_999_compress(const lzo_bytep src, lzo_uint  src_len,
-                   lzo_bytep dst, lzo_uintp dst_len,
-                   lzo_voidp wrkmem);
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1x_999_compress_dict(const lzo_bytep src, lzo_uint  src_len,
-                        lzo_bytep dst, lzo_uintp dst_len,
-                        lzo_voidp wrkmem,
-                        const lzo_bytep dict, lzo_uint dict_len);
-
-LZO_EXTERN(int)
-lzo1x_999_compress_level(const lzo_bytep src, lzo_uint  src_len,
-                         lzo_bytep dst, lzo_uintp dst_len,
-                         lzo_voidp wrkmem,
-                         const lzo_bytep dict, lzo_uint dict_len,
-                         lzo_callback_p cb,
-                         int compression_level);
-
-LZO_EXTERN(int)
-lzo1x_decompress_dict_safe(const lzo_bytep src, lzo_uint  src_len,
-                           lzo_bytep dst, lzo_uintp dst_len,
-                           lzo_voidp wrkmem /* NOT USED */,
-                           const lzo_bytep dict, lzo_uint dict_len);
-
-
-/***********************************************************************
-// optimize a compressed data block
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1x_optimize(lzo_bytep src, lzo_uint  src_len,
-               lzo_bytep dst, lzo_uintp dst_len,
-               lzo_voidp wrkmem /* NOT USED */);
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzo1y.h

@@ -1,133 +0,0 @@
-/* lzo1y.h -- public interface of the LZO1Y compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1Y_H_INCLUDED
-#define __LZO1Y_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1Y_MEM_COMPRESS      ((lzo_uint32_t) (16384L * lzo_sizeof_dict_t))
-#define LZO1Y_MEM_DECOMPRESS    (0)
-#define LZO1Y_MEM_OPTIMIZE      (0)
-
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1y_decompress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem /* NOT USED */);
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1y_decompress_safe(const lzo_bytep src, lzo_uint  src_len,
-                      lzo_bytep dst, lzo_uintp dst_len,
-                      lzo_voidp wrkmem /* NOT USED */);
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1y_1_compress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem);
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1Y_999_MEM_COMPRESS  ((lzo_uint32_t) (14 * 16384L * sizeof(short)))
-
-LZO_EXTERN(int)
-lzo1y_999_compress(const lzo_bytep src, lzo_uint  src_len,
-                   lzo_bytep dst, lzo_uintp dst_len,
-                   lzo_voidp wrkmem);
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1y_999_compress_dict(const lzo_bytep src, lzo_uint  src_len,
-                        lzo_bytep dst, lzo_uintp dst_len,
-                        lzo_voidp wrkmem,
-                        const lzo_bytep dict, lzo_uint dict_len);
-
-LZO_EXTERN(int)
-lzo1y_999_compress_level(const lzo_bytep src, lzo_uint  src_len,
-                         lzo_bytep dst, lzo_uintp dst_len,
-                         lzo_voidp wrkmem,
-                         const lzo_bytep dict, lzo_uint dict_len,
-                         lzo_callback_p cb,
-                         int compression_level);
-
-LZO_EXTERN(int)
-lzo1y_decompress_dict_safe(const lzo_bytep src, lzo_uint  src_len,
-                           lzo_bytep dst, lzo_uintp dst_len,
-                           lzo_voidp wrkmem /* NOT USED */,
-                           const lzo_bytep dict, lzo_uint dict_len);
-
-
-/***********************************************************************
-// optimize a compressed data block
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1y_optimize(lzo_bytep src, lzo_uint  src_len,
-               lzo_bytep dst, lzo_uintp dst_len,
-               lzo_voidp wrkmem /* NOT USED */);
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzo1z.h

@@ -1,109 +0,0 @@
-/* lzo1z.h -- public interface of the LZO1Z compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1Z_H_INCLUDED
-#define __LZO1Z_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1Z_MEM_DECOMPRESS    (0)
-
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1z_decompress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem /* NOT USED */);
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1z_decompress_safe(const lzo_bytep src, lzo_uint  src_len,
-                      lzo_bytep dst, lzo_uintp dst_len,
-                      lzo_voidp wrkmem /* NOT USED */);
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1Z_999_MEM_COMPRESS  ((lzo_uint32_t) (14 * 16384L * sizeof(short)))
-
-LZO_EXTERN(int)
-lzo1z_999_compress(const lzo_bytep src, lzo_uint  src_len,
-                   lzo_bytep dst, lzo_uintp dst_len,
-                   lzo_voidp wrkmem);
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1z_999_compress_dict(const lzo_bytep src, lzo_uint  src_len,
-                        lzo_bytep dst, lzo_uintp dst_len,
-                        lzo_voidp wrkmem,
-                        const lzo_bytep dict, lzo_uint dict_len);
-
-LZO_EXTERN(int)
-lzo1z_999_compress_level(const lzo_bytep src, lzo_uint  src_len,
-                         lzo_bytep dst, lzo_uintp dst_len,
-                         lzo_voidp wrkmem,
-                         const lzo_bytep dict, lzo_uint dict_len,
-                         lzo_callback_p cb,
-                         int compression_level);
-
-LZO_EXTERN(int)
-lzo1z_decompress_dict_safe(const lzo_bytep src, lzo_uint  src_len,
-                           lzo_bytep dst, lzo_uintp dst_len,
-                           lzo_voidp wrkmem /* NOT USED */,
-                           const lzo_bytep dict, lzo_uint dict_len);
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzo2a.h

@@ -1,80 +0,0 @@
-/* lzo2a.h -- public interface of the LZO2A compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO2A_H_INCLUDED
-#define __LZO2A_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO2A_MEM_DECOMPRESS    (0)
-
-/* decompression */
-LZO_EXTERN(int)
-lzo2a_decompress(const lzo_bytep src, lzo_uint  src_len,
-                 lzo_bytep dst, lzo_uintp dst_len,
-                 lzo_voidp wrkmem /* NOT USED */);
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo2a_decompress_safe(const lzo_bytep src, lzo_uint  src_len,
-                      lzo_bytep dst, lzo_uintp dst_len,
-                      lzo_voidp wrkmem /* NOT USED */);
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO2A_999_MEM_COMPRESS  ((lzo_uint32_t) (8 * 16384L * sizeof(short)))
-
-LZO_EXTERN(int)
-lzo2a_999_compress(const lzo_bytep src, lzo_uint  src_len,
-                   lzo_bytep dst, lzo_uintp dst_len,
-                   lzo_voidp wrkmem);
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzo_asm.h

@@ -1,140 +0,0 @@
-/* lzo_asm.h -- assembler prototypes for the LZO data compression library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO_ASM_H_INCLUDED
-#define __LZO_ASM_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// i386 assembly decompressors
-//
-// NOTE:
-// ====
-//
-// - For reasons of speed all fast assembler decompressors (having '_fast'
-//   in their name) can access (write to) up to 3 bytes past the end of
-//   the decompressed ("dst") block. Data past the end of the compressed
-//   ("src") block is never accessed (read from).
-//   [ technical note: because data is transferred in 32-bit units ]
-//
-// - Please also see asm/i386/00README.TXT and doc/LZO.FAQ for more
-//   important details about the assembler versions.
-//
-************************************************************************/
-
-LZO_EXTERN(int) lzo1c_decompress_asm
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-LZO_EXTERN(int) lzo1c_decompress_asm_safe
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-
-LZO_EXTERN(int) lzo1f_decompress_asm_fast
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-LZO_EXTERN(int) lzo1f_decompress_asm_fast_safe
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-
-LZO_EXTERN(int) lzo1x_decompress_asm
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-LZO_EXTERN(int) lzo1x_decompress_asm_safe
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-LZO_EXTERN(int) lzo1x_decompress_asm_fast
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-LZO_EXTERN(int) lzo1x_decompress_asm_fast_safe
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-
-LZO_EXTERN(int) lzo1y_decompress_asm
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-LZO_EXTERN(int) lzo1y_decompress_asm_safe
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-LZO_EXTERN(int) lzo1y_decompress_asm_fast
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-LZO_EXTERN(int) lzo1y_decompress_asm_fast_safe
-(const lzo_bytep src, lzo_uint  src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem);
-
-
-/***********************************************************************
-// checksum and misc functions
-************************************************************************/
-
-#if 0
-
-LZO_EXTERN(lzo_uint32_t)
-lzo_crc32_asm(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len,
-              const lzo_uint32_tp tab);
-
-LZO_EXTERN(lzo_uint32_t)
-lzo_crc32_asm_small(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len);
-
-LZO_EXTERN(int)
-lzo_cpuid_asm(lzo_uint32_tp /* lzo_uint32_t info[16] */);
-
-LZO_EXTERN(lzo_uint32_t)
-lzo_rdtsc_asm(lzo_uint32_tp /* lzo_uint32_t ticks[2] */);
-
-#endif
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzoconf.h

@@ -1,462 +0,0 @@
-/* lzoconf.h -- configuration of the LZO data compression library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZOCONF_H_INCLUDED
-#define __LZOCONF_H_INCLUDED 1
-
-#define LZO_VERSION             0x2090
-#define LZO_VERSION_STRING      "2.09"
-#define LZO_VERSION_DATE        "Feb 04 2015"
-
-/* internal Autoconf configuration file - only used when building LZO */
-#if defined(LZO_HAVE_CONFIG_H)
-#  include <config.h>
-#endif
-#include <limits.h>
-#include <stddef.h>
-
-
-/***********************************************************************
-// LZO requires a conforming <limits.h>
-************************************************************************/
-
-#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
-#  error "invalid CHAR_BIT"
-#endif
-#if !defined(UCHAR_MAX) || !defined(USHRT_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
-#  error "check your compiler installation"
-#endif
-#if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1)
-#  error "your limits.h macros are broken"
-#endif
-
-/* get OS and architecture defines */
-#ifndef __LZODEFS_H_INCLUDED
-#include <lzo/lzodefs.h>
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// some core defines
-************************************************************************/
-
-/* memory checkers */
-#if !defined(__LZO_CHECKER)
-#  if defined(__BOUNDS_CHECKING_ON)
-#    define __LZO_CHECKER       1
-#  elif defined(__CHECKER__)
-#    define __LZO_CHECKER       1
-#  elif defined(__INSURE__)
-#    define __LZO_CHECKER       1
-#  elif defined(__PURIFY__)
-#    define __LZO_CHECKER       1
-#  endif
-#endif
-
-
-/***********************************************************************
-// integral and pointer types
-************************************************************************/
-
-/* lzo_uint must match size_t */
-#if !defined(LZO_UINT_MAX)
-#  if (LZO_ABI_LLP64)
-#    if (LZO_OS_WIN64)
-typedef unsigned __int64   lzo_uint;
-typedef __int64            lzo_int;
-#    define LZO_TYPEOF_LZO_INT  LZO_TYPEOF___INT64
-#    else
-typedef lzo_ullong_t       lzo_uint;
-typedef lzo_llong_t        lzo_int;
-#    define LZO_TYPEOF_LZO_INT  LZO_TYPEOF_LONG_LONG
-#    endif
-#    define LZO_SIZEOF_LZO_INT  8
-#    define LZO_UINT_MAX        0xffffffffffffffffull
-#    define LZO_INT_MAX         9223372036854775807LL
-#    define LZO_INT_MIN         (-1LL - LZO_INT_MAX)
-#  elif (LZO_ABI_IP32L64) /* MIPS R5900 */
-typedef unsigned int       lzo_uint;
-typedef int                lzo_int;
-#    define LZO_SIZEOF_LZO_INT  LZO_SIZEOF_INT
-#    define LZO_TYPEOF_LZO_INT  LZO_TYPEOF_INT
-#    define LZO_UINT_MAX        UINT_MAX
-#    define LZO_INT_MAX         INT_MAX
-#    define LZO_INT_MIN         INT_MIN
-#  elif (ULONG_MAX >= LZO_0xffffffffL)
-typedef unsigned long      lzo_uint;
-typedef long               lzo_int;
-#    define LZO_SIZEOF_LZO_INT  LZO_SIZEOF_LONG
-#    define LZO_TYPEOF_LZO_INT  LZO_TYPEOF_LONG
-#    define LZO_UINT_MAX        ULONG_MAX
-#    define LZO_INT_MAX         LONG_MAX
-#    define LZO_INT_MIN         LONG_MIN
-#  else
-#    error "lzo_uint"
-#  endif
-#endif
-
-/* The larger type of lzo_uint and lzo_uint32_t. */
-#if (LZO_SIZEOF_LZO_INT >= 4)
-#  define lzo_xint              lzo_uint
-#else
-#  define lzo_xint              lzo_uint32_t
-#endif
-
-typedef int lzo_bool;
-
-/* sanity checks */
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int)  == LZO_SIZEOF_LZO_INT)
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == LZO_SIZEOF_LZO_INT)
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_xint) >= sizeof(lzo_uint))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_xint) >= sizeof(lzo_uint32_t))
-
-#ifndef __LZO_MMODEL
-#define __LZO_MMODEL            /*empty*/
-#endif
-
-/* no typedef here because of const-pointer issues */
-#define lzo_bytep               unsigned char __LZO_MMODEL *
-#define lzo_charp               char __LZO_MMODEL *
-#define lzo_voidp               void __LZO_MMODEL *
-#define lzo_shortp              short __LZO_MMODEL *
-#define lzo_ushortp             unsigned short __LZO_MMODEL *
-#define lzo_intp                lzo_int __LZO_MMODEL *
-#define lzo_uintp               lzo_uint __LZO_MMODEL *
-#define lzo_xintp               lzo_xint __LZO_MMODEL *
-#define lzo_voidpp              lzo_voidp __LZO_MMODEL *
-#define lzo_bytepp              lzo_bytep __LZO_MMODEL *
-
-#define lzo_int8_tp             lzo_int8_t __LZO_MMODEL *
-#define lzo_uint8_tp            lzo_uint8_t __LZO_MMODEL *
-#define lzo_int16_tp            lzo_int16_t __LZO_MMODEL *
-#define lzo_uint16_tp           lzo_uint16_t __LZO_MMODEL *
-#define lzo_int32_tp            lzo_int32_t __LZO_MMODEL *
-#define lzo_uint32_tp           lzo_uint32_t __LZO_MMODEL *
-#if defined(lzo_int64_t)
-#define lzo_int64_tp            lzo_int64_t __LZO_MMODEL *
-#define lzo_uint64_tp           lzo_uint64_t __LZO_MMODEL *
-#endif
-
-/* Older LZO versions used to support ancient systems and memory models
- * such as 16-bit MSDOS with __huge pointers or Cray PVP, but these
- * obsolete configurations are not supported any longer.
- */
-#if defined(__LZO_MMODEL_HUGE)
-#error "__LZO_MMODEL_HUGE memory model is unsupported"
-#endif
-#if (LZO_MM_PVP)
-#error "LZO_MM_PVP memory model is unsupported"
-#endif
-#if (LZO_SIZEOF_INT < 4)
-#error "LZO_SIZEOF_INT < 4 is unsupported"
-#endif
-#if (__LZO_UINTPTR_T_IS_POINTER)
-#error "__LZO_UINTPTR_T_IS_POINTER is unsupported"
-#endif
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) >= 4)
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) >= 4)
-/* Strange configurations where sizeof(lzo_uint) != sizeof(size_t) should
- * work but have not received much testing lately, so be strict here.
- */
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(size_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(ptrdiff_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(lzo_uintptr_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(void*)   == sizeof(lzo_uintptr_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(char*)   == sizeof(lzo_uintptr_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long*)   == sizeof(lzo_uintptr_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(void*)   == sizeof(lzo_voidp))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(char*)   == sizeof(lzo_bytep))
-
-
-/***********************************************************************
-// function types
-************************************************************************/
-
-/* name mangling */
-#if !defined(__LZO_EXTERN_C)
-#  ifdef __cplusplus
-#    define __LZO_EXTERN_C      extern "C"
-#  else
-#    define __LZO_EXTERN_C      extern
-#  endif
-#endif
-
-/* calling convention */
-#if !defined(__LZO_CDECL)
-#  define __LZO_CDECL           __lzo_cdecl
-#endif
-
-/* DLL export information */
-#if !defined(__LZO_EXPORT1)
-#  define __LZO_EXPORT1         /*empty*/
-#endif
-#if !defined(__LZO_EXPORT2)
-#  define __LZO_EXPORT2         /*empty*/
-#endif
-
-/* __cdecl calling convention for public C and assembly functions */
-#if !defined(LZO_PUBLIC)
-#  define LZO_PUBLIC(r)         __LZO_EXPORT1 r __LZO_EXPORT2 __LZO_CDECL
-#endif
-#if !defined(LZO_EXTERN)
-#  define LZO_EXTERN(r)         __LZO_EXTERN_C LZO_PUBLIC(r)
-#endif
-#if !defined(LZO_PRIVATE)
-#  define LZO_PRIVATE(r)        static r  __LZO_CDECL
-#endif
-
-/* function types */
-typedef int
-(__LZO_CDECL* lzo_compress_t)(const lzo_bytep src, lzo_uint  src_len,
-                              lzo_bytep dst, lzo_uintp dst_len,
-                              lzo_voidp wrkmem);
-
-typedef int
-(__LZO_CDECL* lzo_decompress_t)(const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem);
-
-typedef int
-(__LZO_CDECL* lzo_optimize_t)(lzo_bytep src, lzo_uint  src_len,
-                              lzo_bytep dst, lzo_uintp dst_len,
-                              lzo_voidp wrkmem);
-
-typedef int
-(__LZO_CDECL* lzo_compress_dict_t)(const lzo_bytep src, lzo_uint  src_len,
-                                   lzo_bytep dst, lzo_uintp dst_len,
-                                   lzo_voidp wrkmem,
-                                   const lzo_bytep dict, lzo_uint dict_len);
-
-typedef int
-(__LZO_CDECL* lzo_decompress_dict_t)(const lzo_bytep src, lzo_uint  src_len,
-                                     lzo_bytep dst, lzo_uintp dst_len,
-                                     lzo_voidp wrkmem,
-                                     const lzo_bytep dict, lzo_uint dict_len);
-
-
-/* Callback interface. Currently only the progress indicator ("nprogress")
- * is used, but this may change in a future release. */
-
-struct lzo_callback_t;
-typedef struct lzo_callback_t lzo_callback_t;
-#define lzo_callback_p lzo_callback_t __LZO_MMODEL *
-
-/* malloc & free function types */
-typedef lzo_voidp(__LZO_CDECL* lzo_alloc_func_t)
-(lzo_callback_p self, lzo_uint items, lzo_uint size);
-typedef void (__LZO_CDECL* lzo_free_func_t)
-(lzo_callback_p self, lzo_voidp ptr);
-
-/* a progress indicator callback function */
-typedef void (__LZO_CDECL* lzo_progress_func_t)
-(lzo_callback_p, lzo_uint, lzo_uint, int);
-
-struct lzo_callback_t
-{
-    /* custom allocators (set to 0 to disable) */
-    lzo_alloc_func_t nalloc;                /* [not used right now] */
-    lzo_free_func_t nfree;                  /* [not used right now] */
-
-    /* a progress indicator callback function (set to 0 to disable) */
-    lzo_progress_func_t nprogress;
-
-    /* INFO: the first parameter "self" of the nalloc/nfree/nprogress
-     * callbacks points back to this struct, so you are free to store
-     * some extra info in the following variables. */
-    lzo_voidp user1;
-    lzo_xint user2;
-    lzo_xint user3;
-};
-
-
-/***********************************************************************
-// error codes and prototypes
-************************************************************************/
-
-/* Error codes for the compression/decompression functions. Negative
- * values are errors, positive values will be used for special but
- * normal events.
- */
-#define LZO_E_OK                    0
-#define LZO_E_ERROR                 (-1)
-#define LZO_E_OUT_OF_MEMORY         (-2)    /* [lzo_alloc_func_t failure] */
-#define LZO_E_NOT_COMPRESSIBLE      (-3)    /* [not used right now] */
-#define LZO_E_INPUT_OVERRUN         (-4)
-#define LZO_E_OUTPUT_OVERRUN        (-5)
-#define LZO_E_LOOKBEHIND_OVERRUN    (-6)
-#define LZO_E_EOF_NOT_FOUND         (-7)
-#define LZO_E_INPUT_NOT_CONSUMED    (-8)
-#define LZO_E_NOT_YET_IMPLEMENTED   (-9)    /* [not used right now] */
-#define LZO_E_INVALID_ARGUMENT      (-10)
-#define LZO_E_INVALID_ALIGNMENT     (-11)   /* pointer argument is not properly aligned */
-#define LZO_E_OUTPUT_NOT_CONSUMED   (-12)
-#define LZO_E_INTERNAL_ERROR        (-99)
-
-
-#ifndef lzo_sizeof_dict_t
-#  define lzo_sizeof_dict_t     ((unsigned)sizeof(lzo_bytep))
-#endif
-
-/* lzo_init() should be the first function you call.
- * Check the return code !
- *
- * lzo_init() is a macro to allow checking that the library and the
- * compiler's view of various types are consistent.
- */
-#define lzo_init() __lzo_init_v2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
-    (int)sizeof(long),(int)sizeof(lzo_uint32_t),(int)sizeof(lzo_uint),\
-    (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\
-    (int)sizeof(lzo_callback_t))
-LZO_EXTERN(int) __lzo_init_v2(unsigned, int, int, int, int, int, int, int, int, int);
-
-/* version functions (useful for shared libraries) */
-LZO_EXTERN(unsigned) lzo_version(void);
-LZO_EXTERN(const char*) lzo_version_string(void);
-LZO_EXTERN(const char*) lzo_version_date(void);
-LZO_EXTERN(const lzo_charp) _lzo_version_string(void);
-LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
-
-/* string functions */
-LZO_EXTERN(int)
-lzo_memcmp(const lzo_voidp a, const lzo_voidp b, lzo_uint len);
-LZO_EXTERN(lzo_voidp)
-lzo_memcpy(lzo_voidp dst, const lzo_voidp src, lzo_uint len);
-LZO_EXTERN(lzo_voidp)
-lzo_memmove(lzo_voidp dst, const lzo_voidp src, lzo_uint len);
-LZO_EXTERN(lzo_voidp)
-lzo_memset(lzo_voidp buf, int c, lzo_uint len);
-
-/* checksum functions */
-LZO_EXTERN(lzo_uint32_t)
-lzo_adler32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len);
-LZO_EXTERN(lzo_uint32_t)
-lzo_crc32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len);
-LZO_EXTERN(const lzo_uint32_tp)
-lzo_get_crc32_table(void);
-
-/* misc. */
-LZO_EXTERN(int) _lzo_config_check(void);
-typedef union
-{
-    lzo_voidp a00;
-    lzo_bytep a01;
-    lzo_uint a02;
-    lzo_xint a03;
-    lzo_uintptr_t a04;
-    void* a05;
-    unsigned char* a06;
-    unsigned long a07;
-    size_t a08;
-    ptrdiff_t a09;
-#if defined(lzo_int64_t)
-    lzo_uint64_t a10;
-#endif
-} lzo_align_t;
-
-/* align a char pointer on a boundary that is a multiple of 'size' */
-LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp p, lzo_uint size);
-#define LZO_PTR_ALIGN_UP(p,size) \
-    ((p) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(p),(lzo_uint)(size)))
-
-
-/***********************************************************************
-// deprecated macros - only for backward compatibility
-************************************************************************/
-
-/* deprecated - use 'lzo_bytep' instead of 'lzo_byte *' */
-#define lzo_byte                unsigned char
-/* deprecated type names */
-#define lzo_int32               lzo_int32_t
-#define lzo_uint32              lzo_uint32_t
-#define lzo_int32p              lzo_int32_t __LZO_MMODEL *
-#define lzo_uint32p             lzo_uint32_t __LZO_MMODEL *
-#define LZO_INT32_MAX           LZO_INT32_C(2147483647)
-#define LZO_UINT32_MAX          LZO_UINT32_C(4294967295)
-#if defined(lzo_int64_t)
-#define lzo_int64               lzo_int64_t
-#define lzo_uint64              lzo_uint64_t
-#define lzo_int64p              lzo_int64_t __LZO_MMODEL *
-#define lzo_uint64p             lzo_uint64_t __LZO_MMODEL *
-#define LZO_INT64_MAX           LZO_INT64_C(9223372036854775807)
-#define LZO_UINT64_MAX          LZO_UINT64_C(18446744073709551615)
-#endif
-/* deprecated types */
-typedef union { lzo_bytep a; lzo_uint b; } __lzo_pu_u;
-typedef union { lzo_bytep a; lzo_uint32_t b; } __lzo_pu32_u;
-/* deprecated defines */
-#if !defined(LZO_SIZEOF_LZO_UINT)
-#  define LZO_SIZEOF_LZO_UINT   LZO_SIZEOF_LZO_INT
-#endif
-
-#if defined(LZO_CFG_COMPAT)
-
-#define __LZOCONF_H 1
-
-#if defined(LZO_ARCH_I086)
-#  define __LZO_i386 1
-#elif defined(LZO_ARCH_I386)
-#  define __LZO_i386 1
-#endif
-
-#if defined(LZO_OS_DOS16)
-#  define __LZO_DOS 1
-#  define __LZO_DOS16 1
-#elif defined(LZO_OS_DOS32)
-#  define __LZO_DOS 1
-#elif defined(LZO_OS_WIN16)
-#  define __LZO_WIN 1
-#  define __LZO_WIN16 1
-#elif defined(LZO_OS_WIN32)
-#  define __LZO_WIN 1
-#endif
-
-#define __LZO_CMODEL            /*empty*/
-#define __LZO_DMODEL            /*empty*/
-#define __LZO_ENTRY             __LZO_CDECL
-#define LZO_EXTERN_CDECL        LZO_EXTERN
-#define LZO_ALIGN               LZO_PTR_ALIGN_UP
-
-#define lzo_compress_asm_t      lzo_compress_t
-#define lzo_decompress_asm_t    lzo_decompress_t
-
-#endif /* LZO_CFG_COMPAT */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/include/lzo/lzoutil.h

@@ -1,62 +0,0 @@
-/* lzoutil.h -- utility functions for use by applications
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZOUTIL_H_INCLUDED
-#define __LZOUTIL_H_INCLUDED 1
-
-#ifndef __LZOCONF_H_INCLUDED
-#include <lzo/lzoconf.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// LZO-v1 deprecated macros (which were used in the old example programs)
-//
-// THIS FILE IS DEPRECATED. DO NOT USE.
-************************************************************************/
-
-#define lzo_alloc(a,b)      (malloc((a)*(b)))
-#define lzo_malloc(a)       (malloc(a))
-#define lzo_free(a)         (free(a))
-
-#define lzo_fread(f,b,s)    (fread(b,1,s,f))
-#define lzo_fwrite(f,b,s)   (fwrite(b,1,s,f))
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/compr1b.h

@@ -1,68 +0,0 @@
-/* compr1b.h --
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define LZO_NEED_DICT_H 1
-#include "config1b.h"
-
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID     LZO_PP_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
-    LZO_PP_ECONCAT3(lzo1b_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
-    LZO_PP_ECONCAT3(_lzo1b_,COMPRESS_ID,_compress_func)
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-const lzo_compress_t LZO_COMPRESS_FUNC = do_compress;
-
-LZO_PUBLIC(int)
-LZO_COMPRESS(const lzo_bytep in,  lzo_uint  in_len,
-             lzo_bytep out, lzo_uintp out_len,
-             lzo_voidp wrkmem)
-{
-    return _lzo1b_do_compress(in, in_len, out, out_len, wrkmem, do_compress);
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/compr1c.h

@@ -1,68 +0,0 @@
-/* compr1c.h --
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define LZO_NEED_DICT_H 1
-#include "config1c.h"
-
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID     LZO_PP_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
-    LZO_PP_ECONCAT3(lzo1c_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
-    LZO_PP_ECONCAT3(_lzo1c_,COMPRESS_ID,_compress_func)
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-const lzo_compress_t LZO_COMPRESS_FUNC = do_compress;
-
-LZO_PUBLIC(int)
-LZO_COMPRESS(const lzo_bytep in,  lzo_uint  in_len,
-             lzo_bytep out, lzo_uintp out_len,
-             lzo_voidp wrkmem)
-{
-    return _lzo1c_do_compress(in, in_len, out, out_len, wrkmem, do_compress);
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/config1.h

@@ -1,46 +0,0 @@
-/* config1.h -- configuration for the LZO1 algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-#ifndef __LZO_CONFIG1_H
-#define __LZO_CONFIG1_H 1
-
-#include "lzo_conf.h"
-#include <lzo/lzo1.h>
-
-#define LZO_NO_R1 1
-#include "config1a.h"
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/config1a.h

@@ -1,182 +0,0 @@
-/* config1a.h -- configuration for the LZO1A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1A_H
-#define __LZO_CONFIG1A_H 1
-
-#include "lzo_conf.h"
-#include <lzo/lzo1a.h>
-
-#undef LZO_COLLECT_STATS    /* no support for stats here */
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* run bits (4 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-#  define DDBITS    0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 4 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (DDBITS < 0 || DDBITS > 6)
-#  error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#undef LZO_EOF_CODE
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH        LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define R_BITS          RBITS
-#define DD_BITS         DDBITS
-#ifndef D_BITS
-#define D_BITS          16
-#endif
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define M3O_BITS        M2O_BITS
-#define M3L_BITS        CHAR_BIT
-#define M3_MAX_LEN      (M3_MIN_LEN + LZO_SIZE(M3L_BITS) - 1)
-#define _MAX_OFFSET     _M2_MAX_OFFSET
-#define LZO_NO_M3 1
-
-#include "lzo1b_de.h"
-#include "stats1b.h"
-
-#include "lzo1b_cc.h"
-
-
-/***********************************************************************
-// check for total LZO1/LZO1A compatibility
-************************************************************************/
-
-#undef M2_MARKER
-#define M2_MARKER   (1 << M2O_BITS)
-
-#if (R_BITS != 5)
-#  error
-#endif
-#if (M2O_BITS != 5)
-#  error
-#endif
-#if (M3O_BITS != 5)
-#  error
-#endif
-#if (M2_MIN_LEN != 3)
-#  error
-#endif
-#if (M2_MAX_LEN != 8)
-#  error
-#endif
-#if (M3_MIN_LEN != 9)
-#  error
-#endif
-#if (M3_MAX_LEN != 264)
-#  error
-#endif
-#if (_M2_MAX_OFFSET != (1u << 13))
-#  error
-#endif
-#if (_M2_MAX_OFFSET != _M3_MAX_OFFSET)
-#  error
-#endif
-#if (_M2_MAX_OFFSET != _MAX_OFFSET)
-#  error
-#endif
-#if (R0MIN != 32)
-#  error
-#endif
-#if (R0MAX != 287)
-#  error
-#endif
-#if (R0FAST != 280)
-#  error
-#endif
-
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/config1b.h

@@ -1,126 +0,0 @@
-/* config1b.h -- configuration for the LZO1B algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1B_H
-#define __LZO_CONFIG1B_H 1
-
-#include "lzo_conf.h"
-#include <lzo/lzo1b.h>
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* run bits (4 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-#  define DDBITS    0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 4 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (DDBITS < 0 || DDBITS > 6)
-#  error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#define LZO_EOF_CODE 1
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH        LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define R_BITS          RBITS
-#define DD_BITS         DDBITS
-#ifndef D_BITS
-#define D_BITS          14
-#endif
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#include "lzo1b_de.h"
-#include "stats1b.h"
-
-#include "lzo1b_cc.h"
-
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/config1c.h

@@ -1,131 +0,0 @@
-/* config1c.h -- configuration for the LZO1C algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1C_H
-#define __LZO_CONFIG1C_H 1
-
-#include "lzo_conf.h"
-#include <lzo/lzo1c.h>
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* run bits (4 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-#  define DDBITS    0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 4 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (DDBITS < 0 || DDBITS > 6)
-#  error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#define LZO_EOF_CODE 1
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH        LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define R_BITS          RBITS
-#define DD_BITS         DDBITS
-#ifndef D_BITS
-#define D_BITS          14
-#endif
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* good parameters when using a blocksize of 8kB */
-#define M3O_BITS        6
-#undef LZO_DETERMINISTIC
-
-
-#include "lzo1b_de.h"
-#include "stats1c.h"
-
-#include "lzo1c_cc.h"
-
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/config1f.h

@@ -1,83 +0,0 @@
-/* config1f.h -- configuration for the LZO1F algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1F_H
-#define __LZO_CONFIG1F_H 1
-
-#include "lzo_conf.h"
-#include <lzo/lzo1f.h>
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_EOF_CODE 1
-#undef LZO_DETERMINISTIC
-
-#define M2_MAX_OFFSET   0x0800
-#define M3_MAX_OFFSET   0x3fff
-
-#define M2_MIN_LEN      3
-#define M2_MAX_LEN      8
-#define M3_MIN_LEN      3
-#define M3_MAX_LEN      33
-
-#define M3_MARKER       224
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef MIN_LOOKAHEAD
-#define MIN_LOOKAHEAD       (M2_MAX_LEN + 1)
-#endif
-
-#if defined(LZO_NEED_DICT_H)
-
-#ifndef LZO_HASH
-#define LZO_HASH            LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define DL_MIN_LEN          M2_MIN_LEN
-#include "lzo_dict.h"
-
-#endif
-
-
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/config1x.h

@@ -1,106 +0,0 @@
-/* config1x.h -- configuration for the LZO1X algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1X_H
-#define __LZO_CONFIG1X_H 1
-
-#if !defined(LZO1X) && !defined(LZO1Y) && !defined(LZO1Z)
-#  define LZO1X 1
-#endif
-
-#include "lzo_conf.h"
-#if !defined(__LZO_IN_MINILZO)
-#include <lzo/lzo1x.h>
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef LZO_EOF_CODE
-#define LZO_EOF_CODE 1
-#endif
-#undef LZO_DETERMINISTIC
-
-#define M1_MAX_OFFSET   0x0400
-#ifndef M2_MAX_OFFSET
-#define M2_MAX_OFFSET   0x0800
-#endif
-#define M3_MAX_OFFSET   0x4000
-#define M4_MAX_OFFSET   0xbfff
-
-#define MX_MAX_OFFSET   (M1_MAX_OFFSET + M2_MAX_OFFSET)
-
-#define M1_MIN_LEN      2
-#define M1_MAX_LEN      2
-#define M2_MIN_LEN      3
-#ifndef M2_MAX_LEN
-#define M2_MAX_LEN      8
-#endif
-#define M3_MIN_LEN      3
-#define M3_MAX_LEN      33
-#define M4_MIN_LEN      3
-#define M4_MAX_LEN      9
-
-#define M1_MARKER       0
-#define M2_MARKER       64
-#define M3_MARKER       32
-#define M4_MARKER       16
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef MIN_LOOKAHEAD
-#define MIN_LOOKAHEAD       (M2_MAX_LEN + 1)
-#endif
-
-#if defined(LZO_NEED_DICT_H)
-
-#ifndef LZO_HASH
-#define LZO_HASH            LZO_HASH_LZO_INCREMENTAL_B
-#endif
-#define DL_MIN_LEN          M2_MIN_LEN
-#include "lzo_dict.h"
-
-#endif
-
-
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/config1y.h

@@ -1,52 +0,0 @@
-/* config1y.h -- configuration for the LZO1Y algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1Y_H
-#define __LZO_CONFIG1Y_H 1
-
-#if !defined(LZO1Y)
-#  define LZO1Y 1
-#endif
-
-#include "lzo_conf.h"
-#include <lzo/lzo1y.h>
-
-#define M2_MAX_LEN      14
-#define M2_MAX_OFFSET   0x0400
-#include "config1x.h"
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/config1z.h

@@ -1,51 +0,0 @@
-/* config1z.h -- configuration for the LZO1Z algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1Z_H
-#define __LZO_CONFIG1Z_H 1
-
-#if !defined(LZO1Z)
-#  define LZO1Z 1
-#endif
-
-#include "lzo_conf.h"
-#include <lzo/lzo1z.h>
-
-#define M2_MAX_OFFSET   0x0700
-#include "config1x.h"
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/config2a.h

@@ -1,141 +0,0 @@
-/* config2a.h -- configuration for the LZO2A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG2A_H
-#define __LZO_CONFIG2A_H 1
-
-#include "lzo_conf.h"
-#include <lzo/lzo2a.h>
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-#  define DDBITS    0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (DDBITS < 0 || DDBITS > 6)
-#  error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-#if 1
-#define SWD_N        8191           /* size of ring buffer */
-#else
-#define SWD_N       16383           /* size of ring buffer */
-#endif
-
-#define M1_MIN_LEN  2
-#define M1_MAX_LEN  5
-#define M2_MIN_LEN  3
-#define M3_MIN_LEN  3
-
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#define LZO_EOF_CODE 1
-
-#undef LZO_DETERMINISTIC
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH        LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define DD_BITS         DDBITS
-#ifndef D_BITS
-#define D_BITS          14
-#endif
-
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* get bits */
-#define _NEEDBITS \
-    { _NEEDBYTE; b |= ((lzo_uint32_t) _NEXTBYTE) << k; k += 8; assert(k <= 32); }
-#define NEEDBITS(j)     { assert((j) < 8); if (k < (j)) _NEEDBITS }
-
-/* set bits */
-#define SETBITS(j,x)    { b |= ((lzo_uint32_t)(x)) << k; k += (j); assert(k <= 32); }
-
-/* access bits */
-#define MASKBITS(j)     (b & ((((lzo_uint32_t)1 << (j)) - 1)))
-
-/* drop bits */
-#define DUMPBITS(j)     { assert(k >= j); b >>= (j); k -= (j); }
-
-
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1.c

@@ -1,665 +0,0 @@
-/* lzo1.c -- implementation of the LZO1 algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#include <lzo/lzo1.h>
-
-
-/***********************************************************************
-// The next two defines can be changed to customize LZO1.
-// The default version is LZO1-5/1.
-************************************************************************/
-
-/* run bits (3 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 3 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// You should not have to change anything below this line.
-************************************************************************/
-
-/*
-     Format of the marker byte
-
-
-     76543210
-     --------
-     00000000   a long run (a 'R0' run) - there are short and long R0 runs
-     000rrrrr   a short run with len r
-     mmmooooo   a short match (len = 2+m, o = offset low bits)
-     111ooooo   a long match (o = offset low bits)
-*/
-
-
-#define RSIZE   (1 << RBITS)
-#define RMASK   (RSIZE - 1)
-
-#define OBITS   RBITS               /* offset and run-length use same bits */
-#define OSIZE   (1 << OBITS)
-#define OMASK   (OSIZE - 1)
-
-#define MBITS   (8 - OBITS)
-#define MSIZE   (1 << MBITS)
-#define MMASK   (MSIZE - 1)
-
-
-/* sanity checks */
-#if (OBITS < 3 || OBITS > 5)
-#  error "invalid OBITS"
-#endif
-#if (MBITS < 3 || MBITS > 5)
-#  error "invalid MBITS"
-#endif
-
-
-/***********************************************************************
-// some macros to improve readability
-************************************************************************/
-
-/* Minimum len of a match */
-#define MIN_MATCH           3
-#define THRESHOLD           (MIN_MATCH - 1)
-
-/* Minimum len of match coded in 2 bytes */
-#define MIN_MATCH_SHORT     MIN_MATCH
-
-/* Maximum len of match coded in 2 bytes */
-#define MAX_MATCH_SHORT     (THRESHOLD + (MSIZE - 2))
-/* MSIZE - 2: 0 is used to indicate runs,
- *            MSIZE-1 is used to indicate a long match */
-
-/* Minimum len of match coded in 3 bytes */
-#define MIN_MATCH_LONG      (MAX_MATCH_SHORT + 1)
-
-/* Maximum len of match coded in 3 bytes */
-#define MAX_MATCH_LONG      (MIN_MATCH_LONG + 255)
-
-/* Maximum offset of a match */
-#define MAX_OFFSET          (1 << (8 + OBITS))
-
-
-/*
-
-RBITS | MBITS  MIN  THR.  MSIZE  MAXS  MINL  MAXL   MAXO  R0MAX R0FAST
-======+===============================================================
-  3   |   5      3    2     32    32    33    288   2048    263   256
-  4   |   4      3    2     16    16    17    272   4096    271   264
-  5   |   3      3    2      8     8     9    264   8192    287   280
-
- */
-
-
-/***********************************************************************
-// internal configuration
-// all of these affect compression only
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH    LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX2(p,5,5)) >> 5)
-#define D_INDEX2(d,p)       d = d ^ D_MASK
-
-#define DBITS       (8 + RBITS)
-#include "lzo_dict.h"
-#define DVAL_LEN    DVAL_LOOKAHEAD
-
-
-/***********************************************************************
-// get algorithm info, return memory required for compression
-************************************************************************/
-
-LZO_EXTERN(lzo_uint) lzo1_info(int* rbits, int* clevel);
-
-LZO_PUBLIC(lzo_uint)
-lzo1_info(int* rbits, int* clevel)
-{
-    if (rbits)
-        *rbits = RBITS;
-
-    if (clevel)
-        *clevel = CLEVEL;
-
-    return D_SIZE * lzo_sizeof(lzo_bytep);
-}
-
-
-/***********************************************************************
-// decode a R0 literal run (a long run)
-************************************************************************/
-
-#define R0MIN   (RSIZE)             /* Minimum len of R0 run of literals */
-#define R0MAX   (R0MIN + 255)       /* Maximum len of R0 run of literals */
-#define R0FAST  (R0MAX & ~7u)       /* R0MAX aligned to 8 byte boundary */
-
-#if (R0MAX - R0FAST != 7) || ((R0FAST & 7) != 0)
-#  error "something went wrong"
-#endif
-
-/* 7 special codes from R0FAST+1 .. R0MAX
- * these codes mean long R0 runs with lengths
- * 512, 1024, 2048, 4096, 8192, 16384, 32768 */
-
-
-/***********************************************************************
-// LZO1 decompress a block of data.
-//
-// Could be easily translated into assembly code.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1_decompress(const lzo_bytep in , lzo_uint  in_len,
-                lzo_bytep out, lzo_uintp out_len,
-                lzo_voidp wrkmem)
-{
-    lzo_bytep op;
-    const lzo_bytep ip;
-    const lzo_bytep const ip_end = in + in_len;
-    lzo_uint t;
-
-    LZO_UNUSED(wrkmem);
-
-    op = out;
-    ip = in;
-
-    while (ip < ip_end)
-    {
-        t = *ip++;  /* get marker */
-
-        if (t < R0MIN)          /* a literal run */
-        {
-            if (t == 0)             /* a R0 literal run */
-            {
-                t = *ip++;
-
-                if (t >= R0FAST - R0MIN)            /* a long R0 run */
-                {
-                    t -= R0FAST - R0MIN;
-
-                    if (t == 0)
-                        t = R0FAST;
-                    else
-                    {
-#if 0
-                        t = 256u << ((unsigned) t);
-#else
-                        /* help the optimizer */
-                        lzo_uint tt = 256;
-
-                        do tt <<= 1;
-
-                        while (--t > 0);
-
-                        t = tt;
-#endif
-                    }
-
-                    MEMCPY8_DS(op, ip, t);
-                    continue;
-                }
-
-                t += R0MIN;
-            }
-
-            MEMCPY_DS(op, ip, t);
-        }
-        else                    /* a match */
-        {
-            lzo_uint tt;
-            /* get match offset */
-            const lzo_bytep m_pos = op - 1;
-            m_pos -= (lzo_uint)(t & OMASK) | (((lzo_uint) * ip++) << OBITS);
-
-            /* get match len */
-            if (t >= ((MSIZE - 1) << OBITS))                /* all m-bits set */
-                tt = (MIN_MATCH_LONG - THRESHOLD) + *ip++;  /* a long match */
-            else
-                tt = t >> OBITS;                            /* a short match */
-
-            assert(m_pos >= out);
-            assert(m_pos <  op);
-            /* a half unrolled loop */
-            *op++ = *m_pos++;
-            *op++ = *m_pos++;
-            MEMCPY_DS(op, m_pos, tt);
-        }
-    }
-
-    *out_len = pd(op, out);
-
-    /* the next line is the only check in the decompressor ! */
-    return (ip == ip_end ? LZO_E_OK :
-            (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-}
-
-
-/***********************************************************************
-// code a literal run
-************************************************************************/
-
-static
-#if LZO_ARCH_AVR
-__lzo_noinline
-#endif
-lzo_bytep
-store_run(lzo_bytep op, const lzo_bytep ii, lzo_uint r_len)
-{
-    assert(r_len > 0);
-
-    /* code a long R0 run */
-    if (r_len >= 512)
-    {
-        unsigned r_bits = 7;        /* 256 << 7 == 32768 */
-
-        do
-        {
-            while (r_len >= (256u << r_bits))
-            {
-                r_len -= (256u << r_bits);
-                *op++ = 0;
-                *op++ = LZO_BYTE((R0FAST - R0MIN) + r_bits);
-                MEMCPY8_DS(op, ii, (256u << r_bits));
-            }
-        }
-        while (--r_bits > 0);
-    }
-
-    while (r_len >= R0FAST)
-    {
-        r_len -= R0FAST;
-        *op++ = 0;
-        *op++ = R0FAST - R0MIN;
-        MEMCPY8_DS(op, ii, R0FAST);
-    }
-
-    if (r_len >= R0MIN)
-    {
-        /* code a short R0 run */
-        *op++ = 0;
-        *op++ = LZO_BYTE(r_len - R0MIN);
-        MEMCPY_DS(op, ii, r_len);
-    }
-    else if (r_len > 0)
-    {
-        /* code a 'normal' run */
-        *op++ = LZO_BYTE(r_len);
-        MEMCPY_DS(op, ii, r_len);
-    }
-
-    assert(r_len == 0);
-    return op;
-}
-
-
-
-/***********************************************************************
-// LZO1 compress a block of data.
-//
-// Could be translated into assembly code without too much effort.
-//
-// I apologize for the spaghetti code, but it really helps the optimizer.
-************************************************************************/
-
-static int
-do_compress(const lzo_bytep in , lzo_uint  in_len,
-            lzo_bytep out, lzo_uintp out_len,
-            lzo_voidp wrkmem)
-{
-    const lzo_bytep ip;
-#if defined(__LZO_HASH_INCREMENTAL)
-    lzo_xint dv;
-#endif
-    lzo_bytep op;
-    const lzo_bytep m_pos;
-    const lzo_bytep const ip_end = in + in_len - DVAL_LEN - MIN_MATCH_LONG;
-    const lzo_bytep const in_end = in + in_len - DVAL_LEN;
-    const lzo_bytep ii;
-    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
-#if !defined(NDEBUG)
-    const lzo_bytep m_pos_sav;
-#endif
-
-    op = out;
-    ip = in;
-    ii = ip;                /* point to start of literal run */
-
-    if (in_len <= MIN_MATCH_LONG + DVAL_LEN + 1)
-        goto the_end;
-
-    /* init dictionary */
-#if (LZO_DETERMINISTIC)
-    BZERO8_PTR(wrkmem, sizeof(lzo_dict_t), D_SIZE);
-#endif
-
-    DVAL_FIRST(dv, ip);
-    UPDATE_D(dict, 0, dv, ip, in);
-    ip++;
-    DVAL_NEXT(dv, ip);
-
-    do
-    {
-        LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, m_off, 0);
-        lzo_uint dindex;
-
-        DINDEX1(dindex, ip);
-        GINDEX(m_pos, m_off, dict, dindex, in);
-
-        if (LZO_CHECK_MPOS(m_pos, m_off, in, ip, MAX_OFFSET))
-            goto literal;
-
-        if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-            goto match;
-
-        DINDEX2(dindex, ip);
-        GINDEX(m_pos, m_off, dict, dindex, in);
-
-        if (LZO_CHECK_MPOS(m_pos, m_off, in, ip, MAX_OFFSET))
-            goto literal;
-
-        if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-            goto match;
-
-        goto literal;
-
-
-literal:
-        UPDATE_I(dict, 0, dindex, ip, in);
-
-        if (++ip >= ip_end)
-            break;
-
-        continue;
-
-match:
-        UPDATE_I(dict, 0, dindex, ip, in);
-#if !defined(NDEBUG) && (LZO_DICT_USE_PTR)
-        m_pos_sav = m_pos;
-#endif
-        m_pos += 3;
-        {
-            /* we have found a match (of at least length 3) */
-#if !defined(NDEBUG) && !(LZO_DICT_USE_PTR)
-            assert((m_pos_sav = ip - m_off) == (m_pos - 3));
-#endif
-
-            /* 1) store the current literal run */
-            if (pd(ip, ii) > 0)
-            {
-                lzo_uint t = pd(ip, ii);
-#if 1
-
-                /* OPTIMIZED: inline the copying of a short run */
-                if (t < R0MIN)
-                {
-                    *op++ = LZO_BYTE(t);
-                    MEMCPY_DS(op, ii, t);
-                }
-                else
-#endif
-                    op = store_run(op, ii, t);
-            }
-
-            /* 2a) compute match len */
-            ii = ip;        /* point to start of current match */
-
-            /* we already matched MIN_MATCH bytes,
-             * m_pos also already advanced MIN_MATCH bytes */
-            ip += MIN_MATCH;
-            assert(m_pos < ip);
-
-            /* try to match another MIN_MATCH_LONG - MIN_MATCH bytes
-             * to see if we get a long match */
-
-#define PS  *m_pos++ != *ip++
-
-#if (MIN_MATCH_LONG - MIN_MATCH == 2)                   /* MBITS == 2 */
-
-            if (PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 6)                 /* MBITS == 3 */
-            if (PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 14)                /* MBITS == 4 */
-            if (PS || PS || PS || PS || PS || PS || PS ||
-                    PS || PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 30)                /* MBITS == 5 */
-            if (PS || PS || PS || PS || PS || PS || PS || PS ||
-                    PS || PS || PS || PS || PS || PS || PS || PS ||
-                    PS || PS || PS || PS || PS || PS || PS || PS ||
-                    PS || PS || PS || PS || PS || PS)
-#else
-#  error "MBITS not yet implemented"
-#endif
-            {
-                lzo_uint m_len;
-
-                /* 2b) code a short match */
-                assert(pd(ip, m_pos) == m_off);
-                --ip;   /* ran one too far, point back to non-match */
-                m_len = pd(ip, ii);
-                assert(m_len >= MIN_MATCH_SHORT);
-                assert(m_len <= MAX_MATCH_SHORT);
-                assert(m_off > 0);
-                assert(m_off <= MAX_OFFSET);
-                assert(ii - m_off == m_pos_sav);
-                assert(lzo_memcmp(m_pos_sav, ii, m_len) == 0);
-                --m_off;
-                /* code short match len + low offset bits */
-                *op++ = LZO_BYTE(((m_len - THRESHOLD) << OBITS) |
-                                 (m_off & OMASK));
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> OBITS);
-
-
-                /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#define SI      /* nothing */
-#define DI      ++ii; DVAL_NEXT(dv,ii); UPDATE_D(dict,0,dv,ii,in);
-#define XI      assert(ii < ip); ii = ip; DVAL_FIRST(dv,(ip));
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && MBITS <= 4) || (CLEVEL >= 5 && MBITS <= 3)
-                /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-                ++ii;
-
-                do
-                {
-                    DVAL_NEXT(dv, ii);
-                    UPDATE_D(dict, 0, dv, ii, in);
-                }
-                while (++ii < ip);
-
-                DVAL_NEXT(dv, ii);
-                assert(ii == ip);
-                DVAL_ASSERT(dv, ip);
-#elif (CLEVEL >= 3)
-                SI   DI DI   XI
-#elif (CLEVEL >= 2)
-                SI   DI      XI
-#else
-                XI
-#endif
-
-            }
-            else
-            {
-                /* we've found a long match - see how far we can still go */
-                const lzo_bytep end;
-                lzo_uint m_len;
-
-                assert(ip <= in_end);
-                assert(ii == ip - MIN_MATCH_LONG);
-
-                if (pd(in_end, ip) <= (MAX_MATCH_LONG - MIN_MATCH_LONG))
-                    end = in_end;
-                else
-                {
-                    end = ip + (MAX_MATCH_LONG - MIN_MATCH_LONG);
-                    assert(end < in_end);
-                }
-
-                while (ip < end  &&  *m_pos == *ip)
-                    m_pos++, ip++;
-
-                assert(ip <= in_end);
-
-                /* 2b) code the long match */
-                m_len = pd(ip, ii);
-                assert(m_len >= MIN_MATCH_LONG);
-                assert(m_len <= MAX_MATCH_LONG);
-                assert(m_off > 0);
-                assert(m_off <= MAX_OFFSET);
-                assert(ii - m_off == m_pos_sav);
-                assert(lzo_memcmp(m_pos_sav, ii, m_len) == 0);
-                assert(pd(ip, m_pos) == m_off);
-                --m_off;
-                /* code long match flag + low offset bits */
-                *op++ = LZO_BYTE(((MSIZE - 1) << OBITS) | (m_off & OMASK));
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> OBITS);
-                /* code match len */
-                *op++ = LZO_BYTE(m_len - MIN_MATCH_LONG);
-
-
-                /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
-                /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-                /* This is not recommended because it is slow. */
-                ++ii;
-
-                do
-                {
-                    DVAL_NEXT(dv, ii);
-                    UPDATE_D(dict, 0, dv, ii, in);
-                }
-                while (++ii < ip);
-
-                DVAL_NEXT(dv, ii);
-                assert(ii == ip);
-                DVAL_ASSERT(dv, ip);
-#elif (CLEVEL >= 8)
-                SI   DI DI DI DI DI DI DI DI   XI
-#elif (CLEVEL >= 7)
-                SI   DI DI DI DI DI DI DI      XI
-#elif (CLEVEL >= 6)
-                SI   DI DI DI DI DI DI         XI
-#elif (CLEVEL >= 5)
-                SI   DI DI DI DI               XI
-#elif (CLEVEL >= 4)
-                SI   DI DI DI                  XI
-#elif (CLEVEL >= 3)
-                SI   DI DI                     XI
-#elif (CLEVEL >= 2)
-                SI   DI                        XI
-#else
-                XI
-#endif
-            }
-
-            /* ii now points to the start of next literal run */
-            assert(ii == ip);
-        }
-    }
-    while (ip < ip_end);
-
-
-
-the_end:
-    assert(ip <= in_end);
-
-
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-
-    /* return -1 if op == out to indicate that we
-     * couldn't compress and didn't copy anything.
-     */
-    if (op == out)
-    {
-        *out_len = 0;
-        return LZO_E_NOT_COMPRESSIBLE;
-    }
-
-#endif
-
-
-    /* store the final literal run */
-    if (pd(in_end + DVAL_LEN, ii) > 0)
-        op = store_run(op, ii, pd(in_end + DVAL_LEN, ii));
-
-    *out_len = pd(op, out);
-    return 0;               /* compression went ok */
-}
-
-
-/***********************************************************************
-// compress public entry point.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1_compress(const lzo_bytep in , lzo_uint  in_len,
-              lzo_bytep out, lzo_uintp out_len,
-              lzo_voidp wrkmem)
-{
-    int r = LZO_E_OK;
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-        *out_len = 0;
-    else if (in_len <= MIN_MATCH_LONG + DVAL_LEN + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(store_run(out, in, in_len), out);
-#endif
-    }
-    else
-        r = do_compress(in, in_len, out, out_len, wrkmem);
-
-    return r;
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1_99.c

@@ -1,116 +0,0 @@
-/* lzo1_99.c -- implementation of the LZO1-99 algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-#define COMPRESS_ID     99
-
-#define DDBITS          3
-#define CLEVEL          9
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_NEED_DICT_H 1
-#include "config1.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-static int
-_lzo1_do_compress(const lzo_bytep in,  lzo_uint  in_len,
-                  lzo_bytep out, lzo_uintp out_len,
-                  lzo_voidp wrkmem,
-                  lzo_compress_t func)
-{
-    int r;
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-    {
-        *out_len = 0;
-        r = LZO_E_OK;
-    }
-    else if (in_len <= MIN_LOOKAHEAD + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        *out_len = 0;
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(STORE_RUN(out, in, in_len), out);
-        r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
-    }
-    else
-        r = func(in, in_len, out, out_len, wrkmem);
-
-    return r;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID     _LZO_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#define LZO_CODE_MATCH_INCLUDE_FILE     "lzo1_cm.ch"
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
-    LZO_PP_ECONCAT3(lzo1_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
-    LZO_PP_ECONCAT3(_lzo1_,COMPRESS_ID,_compress_func)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-LZO_COMPRESS(const lzo_bytep in,  lzo_uint  in_len,
-             lzo_bytep out, lzo_uintp out_len,
-             lzo_voidp wrkmem)
-{
-    return _lzo1_do_compress(in, in_len, out, out_len, wrkmem, do_compress);
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1_cm.ch

@@ -1,38 +0,0 @@
-/* lzo1_cm.ch -- implementation of the LZO1 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#include "lzo1a_cm.ch"
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1_d.ch

@@ -1,156 +0,0 @@
-/* lzo1_d.ch -- common decompression stuff
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-#if defined(LZO_TEST_OVERRUN)
-#  if !defined(LZO_TEST_OVERRUN_INPUT)
-#    define LZO_TEST_OVERRUN_INPUT       2
-#  endif
-#  if !defined(LZO_TEST_OVERRUN_OUTPUT)
-#    define LZO_TEST_OVERRUN_OUTPUT      2
-#  endif
-#  if !defined(LZO_TEST_OVERRUN_LOOKBEHIND)
-#    define LZO_TEST_OVERRUN_LOOKBEHIND  1
-#  endif
-#endif
-
-
-/***********************************************************************
-// Overrun detection is internally handled by these macros:
-//
-//   TEST_IP    test input overrun at loop begin
-//   NEED_IP    test input overrun at every input byte
-//
-//   TEST_OP    test output overrun at loop begin
-//   NEED_OP    test output overrun at every output byte
-//
-//   TEST_LB    test match position
-//
-// The fastest decompressor results when testing for no overruns
-// and using LZO_EOF_CODE.
-************************************************************************/
-
-#undef TEST_IP
-#undef TEST_OP
-#undef TEST_IP_AND_TEST_OP
-#undef TEST_LB
-#undef TEST_LBO
-#undef NEED_IP
-#undef NEED_OP
-#undef TEST_IV
-#undef TEST_OV
-#undef HAVE_TEST_IP
-#undef HAVE_TEST_OP
-#undef HAVE_NEED_IP
-#undef HAVE_NEED_OP
-#undef HAVE_ANY_IP
-#undef HAVE_ANY_OP
-
-
-#if defined(LZO_TEST_OVERRUN_INPUT)
-#  if (LZO_TEST_OVERRUN_INPUT >= 1)
-#    define TEST_IP             (ip < ip_end)
-#  endif
-#  if (LZO_TEST_OVERRUN_INPUT >= 2)
-#    define NEED_IP(x) \
-            if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x))  goto input_overrun
-#    define TEST_IV(x)          if ((x) >  (lzo_uint)0 - (511)) goto input_overrun
-#  endif
-#endif
-
-#if defined(LZO_TEST_OVERRUN_OUTPUT)
-#  if (LZO_TEST_OVERRUN_OUTPUT >= 1)
-#    define TEST_OP             (op <= op_end)
-#  endif
-#  if (LZO_TEST_OVERRUN_OUTPUT >= 2)
-#    undef TEST_OP              /* don't need both of the tests here */
-#    define NEED_OP(x) \
-            if ((lzo_uint)(op_end - op) < (lzo_uint)(x))  goto output_overrun
-#    define TEST_OV(x)          if ((x) >  (lzo_uint)0 - (511)) goto output_overrun
-#  endif
-#endif
-
-#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
-#  define TEST_LB(m_pos)        if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op)) goto lookbehind_overrun
-#  define TEST_LBO(m_pos,o)     if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op-(o))) goto lookbehind_overrun
-#else
-#  define TEST_LB(m_pos)        ((void) 0)
-#  define TEST_LBO(m_pos,o)     ((void) 0)
-#endif
-
-
-#if !defined(LZO_EOF_CODE) && !defined(TEST_IP)
-/* if we have no EOF code, we have to test for the end of the input */
-#  define TEST_IP               (ip < ip_end)
-#endif
-
-
-#if defined(TEST_IP)
-#  define HAVE_TEST_IP 1
-#else
-#  define TEST_IP               1
-#endif
-#if defined(TEST_OP)
-#  define HAVE_TEST_OP 1
-#else
-#  define TEST_OP               1
-#endif
-
-#if defined(HAVE_TEST_IP) && defined(HAVE_TEST_OP)
-#  define TEST_IP_AND_TEST_OP   (TEST_IP && TEST_OP)
-#elif defined(HAVE_TEST_IP)
-#  define TEST_IP_AND_TEST_OP   TEST_IP
-#elif defined(HAVE_TEST_OP)
-#  define TEST_IP_AND_TEST_OP   TEST_OP
-#else
-#  define TEST_IP_AND_TEST_OP   1
-#endif
-
-#if defined(NEED_IP)
-#  define HAVE_NEED_IP 1
-#else
-#  define NEED_IP(x)            ((void) 0)
-#  define TEST_IV(x)            ((void) 0)
-#endif
-#if defined(NEED_OP)
-#  define HAVE_NEED_OP 1
-#else
-#  define NEED_OP(x)            ((void) 0)
-#  define TEST_OV(x)            ((void) 0)
-#endif
-
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
-#  define HAVE_ANY_IP 1
-#endif
-#if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP)
-#  define HAVE_ANY_OP 1
-#endif
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1a.c

@@ -1,690 +0,0 @@
-/* lzo1a.c -- implementation of the LZO1A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#include <lzo/lzo1a.h>
-
-
-/***********************************************************************
-// The next two defines can be changed to customize LZO1A.
-// The default version is LZO1A-5/1.
-************************************************************************/
-
-/* run bits (3 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio
- */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-// You should not have to change anything below this line.
-************************************************************************/
-
-/* check configuration */
-#if (RBITS < 3 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-// all of these affect compression only
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH    LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX2(p,5,5)) >> 5)
-#define D_INDEX2(d,p)       d = d ^ D_MASK
-
-#include "lzo1a_de.h"
-#include "stats1a.h"
-
-
-/* check other constants */
-#if (LBITS < 5 || LBITS > 8)
-#  error "invalid LBITS"
-#endif
-
-
-#if (LZO_COLLECT_STATS)
-static lzo1a_stats_t lzo_statistics;
-lzo1a_stats_t* lzo1a_stats = &lzo_statistics;
-#  define lzo_stats lzo1a_stats
-#endif
-
-
-/***********************************************************************
-// get algorithm info, return memory required for compression
-************************************************************************/
-
-LZO_EXTERN(lzo_uint) lzo1a_info(int* rbits, int* clevel);
-
-LZO_PUBLIC(lzo_uint)
-lzo1a_info(int* rbits, int* clevel)
-{
-    if (rbits)
-        *rbits = RBITS;
-
-    if (clevel)
-        *clevel = CLEVEL;
-
-    return D_SIZE * lzo_sizeof(lzo_bytep);
-}
-
-
-/***********************************************************************
-// LZO1A decompress a block of data.
-//
-// Could be easily translated into assembly code.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1a_decompress(const lzo_bytep in , lzo_uint  in_len,
-                 lzo_bytep out, lzo_uintp out_len,
-                 lzo_voidp wrkmem)
-{
-    lzo_bytep op;
-    const lzo_bytep ip;
-    lzo_uint t;
-    const lzo_bytep m_pos;
-    const lzo_bytep const ip_end = in + in_len;
-
-    LZO_UNUSED(wrkmem);
-
-    op = out;
-    ip = in;
-
-    while (ip < ip_end)
-    {
-        t = *ip++;      /* get marker */
-        LZO_STATS(lzo_stats->marker[t]++);
-
-        if (t == 0)             /* a R0 literal run */
-        {
-            t = *ip++;
-
-            if (t >= R0FAST - R0MIN)            /* a long R0 run */
-            {
-                t -= R0FAST - R0MIN;
-
-                if (t == 0)
-                    t = R0FAST;
-                else
-                {
-#if 0
-                    t = 256u << ((unsigned) t);
-#else
-                    /* help the optimizer */
-                    lzo_uint tt = 256;
-
-                    do tt <<= 1;
-
-                    while (--t > 0);
-
-                    t = tt;
-#endif
-                }
-
-                MEMCPY8_DS(op, ip, t);
-                continue;
-            }
-
-            t += R0MIN;
-            goto literal;
-        }
-        else if (t < R0MIN)     /* a short literal run */
-        {
-literal:
-            MEMCPY_DS(op, ip, t);
-
-            /* after a literal a match must follow */
-            while (ip < ip_end)
-            {
-                t = *ip++;          /* get R1 marker */
-
-                if (t >= R0MIN)
-                    goto match;
-
-                /* R1 match - a context sensitive 3 byte match + 1 byte literal */
-                assert((t & OMASK) == t);
-                m_pos = op - MIN_OFFSET;
-                m_pos -= t | (((lzo_uint) * ip++) << OBITS);
-                assert(m_pos >= out);
-                assert(m_pos < op);
-                *op++ = m_pos[0];
-                *op++ = m_pos[1];
-                *op++ = m_pos[2];
-                *op++ = *ip++;
-            }
-        }
-        else                    /* a match */
-        {
-match:
-            /* get match offset */
-            m_pos = op - MIN_OFFSET;
-            m_pos -= (t & OMASK) | (((lzo_uint) * ip++) << OBITS);
-            assert(m_pos >= out);
-            assert(m_pos < op);
-
-            /* get match len */
-            if (t < ((MSIZE - 1) << OBITS))         /* a short match */
-            {
-                t >>= OBITS;
-                *op++ = *m_pos++;
-                *op++ = *m_pos++;
-                MEMCPY_DS(op, m_pos, t);
-            }
-            else                                     /* a long match */
-            {
-#if (LBITS < 8)
-                t = (MIN_MATCH_LONG - THRESHOLD) + ((lzo_uint)(*ip++) & LMASK);
-#else
-                t = (MIN_MATCH_LONG - THRESHOLD) + (lzo_uint)(*ip++);
-#endif
-                *op++ = *m_pos++;
-                *op++ = *m_pos++;
-                MEMCPY_DS(op, m_pos, t);
-#if (LBITS < 8)
-                /* a very short literal following a long match */
-                t = ip[-1] >> LBITS;
-
-                if (t) do
-                        *op++ = *ip++;
-
-                    while (--t);
-
-#endif
-            }
-        }
-    }
-
-    *out_len = pd(op, out);
-
-    /* the next line is the only check in the decompressor */
-    return (ip == ip_end ? LZO_E_OK :
-            (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-}
-
-
-
-/***********************************************************************
-// LZO1A compress a block of data.
-//
-// I apologize for the spaghetti code, but it really helps the optimizer.
-************************************************************************/
-
-#include "lzo1a_cr.ch"
-
-static int
-do_compress(const lzo_bytep in , lzo_uint  in_len,
-            lzo_bytep out, lzo_uintp out_len,
-            lzo_voidp wrkmem)
-{
-    const lzo_bytep ip;
-#if defined(__LZO_HASH_INCREMENTAL)
-    lzo_xint dv;
-#endif
-    const lzo_bytep m_pos;
-    lzo_bytep op;
-    const lzo_bytep const ip_end = in + in_len - DVAL_LEN - MIN_MATCH_LONG;
-    const lzo_bytep const in_end = in + in_len - DVAL_LEN;
-    const lzo_bytep ii;
-    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-    const lzo_bytep r1 = ip_end;    /* pointer for R1 match (none yet) */
-#if (LBITS < 8)
-    const lzo_bytep im = ip_end;    /* pointer to last match start */
-#endif
-
-#if !defined(NDEBUG)
-    const lzo_bytep m_pos_sav;
-#endif
-
-    op = out;
-    ip = in;
-    ii = ip;            /* point to start of current literal run */
-
-    /* init dictionary */
-#if (LZO_DETERMINISTIC)
-    BZERO8_PTR(wrkmem, sizeof(lzo_dict_t), D_SIZE);
-#endif
-
-    DVAL_FIRST(dv, ip);
-    UPDATE_D(dict, 0, dv, ip, in);
-    ip++;
-    DVAL_NEXT(dv, ip);
-
-    do
-    {
-        LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, m_off, 0);
-        lzo_uint dindex;
-
-        DINDEX1(dindex, ip);
-        GINDEX(m_pos, m_off, dict, dindex, in);
-
-        if (LZO_CHECK_MPOS_NON_DET(m_pos, m_off, in, ip, MAX_OFFSET))
-            goto literal;
-
-        if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-            goto match;
-
-        DINDEX2(dindex, ip);
-        GINDEX(m_pos, m_off, dict, dindex, in);
-
-        if (LZO_CHECK_MPOS_NON_DET(m_pos, m_off, in, ip, MAX_OFFSET))
-            goto literal;
-
-        if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-            goto match;
-
-        goto literal;
-
-literal:
-        UPDATE_I(dict, 0, dindex, ip, in);
-
-        if (++ip >= ip_end)
-            break;
-
-        continue;
-
-match:
-        UPDATE_I(dict, 0, dindex, ip, in);
-#if !defined(NDEBUG) && (LZO_DICT_USE_PTR)
-        assert(m_pos == NULL || m_pos >= in);
-        m_pos_sav = m_pos;
-#endif
-        m_pos += 3;
-        {
-            /* we have found a match (of at least length 3) */
-
-#if !defined(NDEBUG) && !(LZO_DICT_USE_PTR)
-            assert((m_pos_sav = ip - m_off) == (m_pos - 3));
-#endif
-
-            assert(m_pos >= in);
-            assert(ip < ip_end);
-
-            /* 1) store the current literal run */
-            if (pd(ip, ii) > 0)
-            {
-                lzo_uint t = pd(ip, ii);
-
-                if (ip - r1 == MIN_MATCH + 1)
-                {
-                    /* Code a context sensitive R1 match.
-                     * This is tricky and somewhat difficult to explain:
-                     * multiplex a literal run of length 1 into the previous
-                     * short match of length MIN_MATCH.
-                     * The key idea is:
-                     *  - after a short run a match MUST follow
-                     *  - therefore the value m = 000 in the mmmooooo marker is free
-                     *  - use 000ooooo to indicate a MIN_MATCH match (this
-                     *    is already coded) plus a 1 byte literal
-                     */
-                    assert(t == 1);
-                    /* modify marker byte */
-                    assert((op[-2] >> OBITS) == (MIN_MATCH - THRESHOLD));
-                    op[-2] &= OMASK;
-                    assert((op[-2] >> OBITS) == 0);
-                    /* copy 1 literal */
-                    *op++ = *ii;
-                    LZO_STATS(lzo_stats->r1_matches++);
-                    r1 = ip;                /* set new R1 pointer */
-                }
-                else if (t < R0MIN)
-                {
-                    /* inline the copying of a short run */
-#if (LBITS < 8)
-                    if (t < (1 << (8 - LBITS)) && ii - im >= MIN_MATCH_LONG)
-                    {
-                        /* Code a very short literal run into the
-                         * previous long match length byte.
-                         */
-                        LZO_STATS(lzo_stats->lit_runs_after_long_match++);
-                        LZO_STATS(lzo_stats->lit_run_after_long_match[t]++);
-                        assert(ii - im <= MAX_MATCH_LONG);
-                        assert((op[-1] >> LBITS) == 0);
-                        op[-1] = LZO_BYTE(op[-1] | (t << LBITS));
-                        MEMCPY_DS(op, ii, t);
-                    }
-                    else
-#endif
-                    {
-                        LZO_STATS(lzo_stats->lit_runs++);
-                        LZO_STATS(lzo_stats->lit_run[t]++);
-                        *op++ = LZO_BYTE(t);
-                        MEMCPY_DS(op, ii, t);
-                        r1 = ip;                /* set new R1 pointer */
-                    }
-                }
-                else if (t < R0FAST)
-                {
-                    /* inline the copying of a short R0 run */
-                    LZO_STATS(lzo_stats->r0short_runs++);
-                    *op++ = 0;
-                    *op++ = LZO_BYTE(t - R0MIN);
-                    MEMCPY_DS(op, ii, t);
-                    r1 = ip;                /* set new R1 pointer */
-                }
-                else
-                    op = store_run(op, ii, t);
-            }
-
-#if (LBITS < 8)
-            im = ip;
-#endif
-
-
-            /* 2) compute match len */
-            ii = ip;        /* point to start of current match */
-
-            /* we already matched MIN_MATCH bytes,
-             * m_pos also already advanced MIN_MATCH bytes */
-            ip += MIN_MATCH;
-            assert(m_pos < ip);
-
-            /* try to match another MIN_MATCH_LONG - MIN_MATCH bytes
-             * to see if we get a long match */
-
-#define PS  *m_pos++ != *ip++
-
-#if (MIN_MATCH_LONG - MIN_MATCH == 2)                   /* MBITS == 2 */
-
-            if (PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 6)                 /* MBITS == 3 */
-            if (PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 14)                /* MBITS == 4 */
-            if (PS || PS || PS || PS || PS || PS || PS ||
-                    PS || PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 30)                /* MBITS == 5 */
-            if (PS || PS || PS || PS || PS || PS || PS || PS ||
-                    PS || PS || PS || PS || PS || PS || PS || PS ||
-                    PS || PS || PS || PS || PS || PS || PS || PS ||
-                    PS || PS || PS || PS || PS || PS)
-#else
-#  error "MBITS not yet implemented"
-#endif
-            {
-                /* we've found a short match */
-                lzo_uint m_len;
-
-                /* 2a) compute match parameters */
-                assert(ip - m_pos == (int)m_off);
-                --ip;   /* ran one too far, point back to non-match */
-                m_len = pd(ip, ii);
-                assert(m_len >= MIN_MATCH_SHORT);
-                assert(m_len <= MAX_MATCH_SHORT);
-                assert(m_off >= MIN_OFFSET);
-                assert(m_off <= MAX_OFFSET);
-                assert(ii - m_off == m_pos_sav);
-                assert(lzo_memcmp(m_pos_sav, ii, m_len) == 0);
-                m_off -= MIN_OFFSET;
-
-                /* 2b) code a short match */
-                /* code short match len + low offset bits */
-                *op++ = LZO_BYTE(((m_len - THRESHOLD) << OBITS) |
-                                 (m_off & OMASK));
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> OBITS);
-
-
-#if (LZO_COLLECT_STATS)
-                lzo_stats->short_matches++;
-                lzo_stats->short_match[m_len]++;
-
-                if (m_off < OSIZE)
-                    lzo_stats->short_match_offset_osize[m_len]++;
-
-                if (m_off < 256)
-                    lzo_stats->short_match_offset_256[m_len]++;
-
-                if (m_off < 1024)
-                    lzo_stats->short_match_offset_1024[m_len]++;
-
-#endif
-
-
-                /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#define SI      /* nothing */
-#define DI      ++ii; DVAL_NEXT(dv,ii); UPDATE_D(dict,0,dv,ii,in);
-#define XI      assert(ii < ip); ii = ip; DVAL_FIRST(dv,(ip));
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && MBITS <= 4) || (CLEVEL >= 5 && MBITS <= 3)
-                /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-                ++ii;
-
-                do
-                {
-                    DVAL_NEXT(dv, ii);
-                    UPDATE_D(dict, 0, dv, ii, in);
-                }
-                while (++ii < ip);
-
-                DVAL_NEXT(dv, ii);
-                assert(ii == ip);
-                DVAL_ASSERT(dv, ip);
-#elif (CLEVEL >= 3)
-                SI   DI DI   XI
-#elif (CLEVEL >= 2)
-                SI   DI      XI
-#else
-                XI
-#endif
-
-            }
-            else
-            {
-                /* we've found a long match - see how far we can still go */
-                const lzo_bytep end;
-                lzo_uint m_len;
-
-                assert(ip <= in_end);
-                assert(ii == ip - MIN_MATCH_LONG);
-
-                if (pd(in_end, ip) <= (MAX_MATCH_LONG - MIN_MATCH_LONG))
-                    end = in_end;
-                else
-                {
-                    end = ip + (MAX_MATCH_LONG - MIN_MATCH_LONG);
-                    assert(end < in_end);
-                }
-
-                while (ip < end  &&  *m_pos == *ip)
-                    m_pos++, ip++;
-
-                assert(ip <= in_end);
-
-                /* 2a) compute match parameters */
-                m_len = pd(ip, ii);
-                assert(m_len >= MIN_MATCH_LONG);
-                assert(m_len <= MAX_MATCH_LONG);
-                assert(m_off >= MIN_OFFSET);
-                assert(m_off <= MAX_OFFSET);
-                assert(ii - m_off == m_pos_sav);
-                assert(lzo_memcmp(m_pos_sav, ii, m_len) == 0);
-                assert(pd(ip, m_pos) == m_off);
-                m_off -= MIN_OFFSET;
-
-                /* 2b) code the long match */
-                /* code long match flag + low offset bits */
-                *op++ = LZO_BYTE(((MSIZE - 1) << OBITS) | (m_off & OMASK));
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> OBITS);
-                /* code match len */
-                *op++ = LZO_BYTE(m_len - MIN_MATCH_LONG);
-
-
-#if (LZO_COLLECT_STATS)
-                lzo_stats->long_matches++;
-                lzo_stats->long_match[m_len]++;
-#endif
-
-
-                /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
-                /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-                /* This is not recommended because it is slow. */
-                ++ii;
-
-                do
-                {
-                    DVAL_NEXT(dv, ii);
-                    UPDATE_D(dict, 0, dv, ii, in);
-                }
-                while (++ii < ip);
-
-                DVAL_NEXT(dv, ii);
-                assert(ii == ip);
-                DVAL_ASSERT(dv, ip);
-#elif (CLEVEL >= 8)
-                SI   DI DI DI DI DI DI DI DI   XI
-#elif (CLEVEL >= 7)
-                SI   DI DI DI DI DI DI DI      XI
-#elif (CLEVEL >= 6)
-                SI   DI DI DI DI DI DI         XI
-#elif (CLEVEL >= 5)
-                SI   DI DI DI DI               XI
-#elif (CLEVEL >= 4)
-                SI   DI DI DI                  XI
-#elif (CLEVEL >= 3)
-                SI   DI DI                     XI
-#elif (CLEVEL >= 2)
-                SI   DI                        XI
-#else
-                XI
-#endif
-            }
-
-            /* ii now points to the start of the next literal run */
-            assert(ii == ip);
-        }
-
-    }
-    while (ip < ip_end);
-
-    assert(ip <= in_end);
-
-
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-
-    /* return -1 if op == out to indicate that we
-     * couldn't compress and didn't copy anything.
-     */
-    if (op == out)
-    {
-        *out_len = 0;
-        return LZO_E_NOT_COMPRESSIBLE;
-    }
-
-#endif
-
-    /* store the final literal run */
-    if (pd(in_end + DVAL_LEN, ii) > 0)
-        op = store_run(op, ii, pd(in_end + DVAL_LEN, ii));
-
-    *out_len = pd(op, out);
-    return 0;               /* compression went ok */
-}
-
-
-/***********************************************************************
-// LZO1A compress public entry point.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1a_compress(const lzo_bytep in , lzo_uint  in_len,
-               lzo_bytep out, lzo_uintp out_len,
-               lzo_voidp wrkmem)
-{
-    int r = LZO_E_OK;
-
-
-#if (LZO_COLLECT_STATS)
-    lzo_memset(lzo_stats, 0, sizeof(*lzo_stats));
-    lzo_stats->rbits  = RBITS;
-    lzo_stats->clevel = CLEVEL;
-    lzo_stats->dbits  = DBITS;
-    lzo_stats->lbits  = LBITS;
-    lzo_stats->min_match_short = MIN_MATCH_SHORT;
-    lzo_stats->max_match_short = MAX_MATCH_SHORT;
-    lzo_stats->min_match_long  = MIN_MATCH_LONG;
-    lzo_stats->max_match_long  = MAX_MATCH_LONG;
-    lzo_stats->min_offset      = MIN_OFFSET;
-    lzo_stats->max_offset      = MAX_OFFSET;
-    lzo_stats->r0min  = R0MIN;
-    lzo_stats->r0fast = R0FAST;
-    lzo_stats->r0max  = R0MAX;
-    lzo_stats->in_len = in_len;
-#endif
-
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-        *out_len = 0;
-    else if (in_len <= MIN_MATCH_LONG + DVAL_LEN + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(store_run(out, in, in_len), out);
-#endif
-    }
-    else
-        r = do_compress(in, in_len, out, out_len, wrkmem);
-
-
-#if (LZO_COLLECT_STATS)
-    lzo_stats->short_matches -= lzo_stats->r1_matches;
-    lzo_stats->short_match[MIN_MATCH] -= lzo_stats->r1_matches;
-    lzo_stats->out_len = *out_len;
-#endif
-
-    return r;
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1a_99.c

@@ -1,116 +0,0 @@
-/* lzo1a_99.c -- implementation of the LZO1A-99 algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-#define COMPRESS_ID     99
-
-#define DDBITS          3
-#define CLEVEL          9
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_NEED_DICT_H 1
-#include "config1a.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-static int
-_lzo1a_do_compress(const lzo_bytep in,  lzo_uint  in_len,
-                   lzo_bytep out, lzo_uintp out_len,
-                   lzo_voidp wrkmem,
-                   lzo_compress_t func)
-{
-    int r;
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-    {
-        *out_len = 0;
-        r = LZO_E_OK;
-    }
-    else if (in_len <= MIN_LOOKAHEAD + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        *out_len = 0;
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(STORE_RUN(out, in, in_len), out);
-        r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
-    }
-    else
-        r = func(in, in_len, out, out_len, wrkmem);
-
-    return r;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID     _LZO_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#define LZO_CODE_MATCH_INCLUDE_FILE     "lzo1a_cm.ch"
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
-    LZO_PP_ECONCAT3(lzo1a_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
-    LZO_PP_ECONCAT3(_lzo1a_,COMPRESS_ID,_compress_func)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-LZO_COMPRESS(const lzo_bytep in,  lzo_uint  in_len,
-             lzo_bytep out, lzo_uintp out_len,
-             lzo_voidp wrkmem)
-{
-    return _lzo1a_do_compress(in, in_len, out, out_len, wrkmem, do_compress);
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1a_cm.ch

@@ -1,237 +0,0 @@
-/* lzo1a_cm.ch -- implementation of the LZO1A compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// code the match in LZO1 compatible format
-************************************************************************/
-
-#define THRESHOLD   (M2_MIN_LEN - 1)
-#define MSIZE       LZO_SIZE(M2L_BITS)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if (DD_BITS == 0)
-
-/* we already matched M2_MIN_LEN bytes,
- * m_pos also already advanced M2_MIN_LEN bytes */
-ip += M2_MIN_LEN;
-assert(m_pos < ip);
-
-/* try to match another M2_MAX_LEN + 1 - M2_MIN_LEN bytes
- * to see if we get more than a M2 match */
-#define M2_OR_M3    (MATCH_M2)
-
-#else /* (DD_BITS == 0) */
-
-/* we already matched m_len bytes */
-assert(m_len >= M2_MIN_LEN);
-ip += m_len;
-assert(ip <= in_end);
-
-#define M2_OR_M3    (m_len <= M2_MAX_LEN)
-
-#endif /* (DD_BITS == 0) */
-
-
-if (M2_OR_M3)
-{
-    /* we've found a short match */
-    assert(ip <= in_end);
-
-    /* 2a) compute match parameters */
-#if (DD_BITS == 0)
-    assert(pd(ip, m_pos) == m_off);
-    --ip;   /* ran one too far, point back to non-match */
-    m_len = ip - ii;
-#endif
-    assert(m_len >= M2_MIN_LEN);
-    assert(m_len <= M2_MAX_LEN);
-
-    assert(m_off >= M2_MIN_OFFSET);
-    assert(m_off <= M2_MAX_OFFSET);
-    assert(ii - m_off == m_pos_sav);
-    assert(lzo_memcmp(m_pos_sav, ii, m_len) == 0);
-
-    /* 2b) code the match */
-    m_off -= M2_MIN_OFFSET;
-    /* code short match len + low offset bits */
-    *op++ = LZO_BYTE(((m_len - THRESHOLD) << M2O_BITS) |
-                     (m_off & M2O_MASK));
-    /* code high offset bits */
-    *op++ = LZO_BYTE(m_off >> M2O_BITS);
-
-
-    if (ip >= ip_end)
-    {
-        ii = ip;
-        break;
-    }
-
-
-    /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && M2L_BITS <= 4) || (CLEVEL >= 5 && M2L_BITS <= 3)
-    /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-    ++ii;
-
-    do
-    {
-        DVAL_NEXT(dv, ii);
-#if 0
-        UPDATE_D(dict, drun, dv, ii, in);
-#else
-        dict[ DINDEX(dv, ii) ] = DENTRY(ii, in);
-#endif
-        MI
-    }
-    while (++ii < ip);
-
-    DVAL_NEXT(dv, ii);
-    assert(ii == ip);
-    DVAL_ASSERT(dv, ip);
-#elif (CLEVEL >= 3)
-    SI   DI DI   XI
-#elif (CLEVEL >= 2)
-    SI   DI      XI
-#else
-    XI
-#endif
-}
-
-else
-
-{
-    /* we've found a long match - see how far we can still go */
-    const lzo_bytep end;
-
-    assert(ip <= in_end);
-    assert(ii == ip - (M2_MAX_LEN + 1));
-    assert(lzo_memcmp(m_pos_sav, ii, (lzo_uint)(ip - ii)) == 0);
-
-#if (DD_BITS > 0)
-    assert(m_len == (lzo_uint)(ip - ii));
-    m_pos = ip - m_off;
-    assert(m_pos == m_pos_sav + m_len);
-#endif
-
-    if (pd(in_end, ip) <= (M3_MAX_LEN - M3_MIN_LEN))
-        end = in_end;
-    else
-    {
-        end = ip + (M3_MAX_LEN - M3_MIN_LEN);
-        assert(end < in_end);
-    }
-
-    while (ip < end  &&  *m_pos == *ip)
-        m_pos++, ip++;
-
-    assert(ip <= in_end);
-
-    /* 2a) compute match parameters */
-    m_len = pd(ip, ii);
-    assert(m_len >= M3_MIN_LEN);
-    assert(m_len <= M3_MAX_LEN);
-
-    assert(m_off >= M3_MIN_OFFSET);
-    assert(m_off <= M3_MAX_OFFSET);
-    assert(ii - m_off == m_pos_sav);
-    assert(lzo_memcmp(m_pos_sav, ii, m_len) == 0);
-    assert(pd(ip, m_pos) == m_off);
-
-    /* 2b) code the match */
-    m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
-    /* code long match flag + low offset bits */
-    *op++ = LZO_BYTE(((MSIZE - 1) << M3O_BITS) | (m_off & M3O_MASK));
-    /* code high offset bits */
-    *op++ = LZO_BYTE(m_off >> M3O_BITS);
-    /* code match len */
-    *op++ = LZO_BYTE(m_len - M3_MIN_LEN);
-
-
-    if (ip >= ip_end)
-    {
-        ii = ip;
-        break;
-    }
-
-
-    /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
-    /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-    /* This is not recommended because it can be slow. */
-    ++ii;
-
-    do
-    {
-        DVAL_NEXT(dv, ii);
-#if 0
-        UPDATE_D(dict, drun, dv, ii, in);
-#else
-        dict[ DINDEX(dv, ii) ] = DENTRY(ii, in);
-#endif
-        MI
-    }
-    while (++ii < ip);
-
-    DVAL_NEXT(dv, ii);
-    assert(ii == ip);
-    DVAL_ASSERT(dv, ip);
-#elif (CLEVEL >= 8)
-    SI   DI DI DI DI DI DI DI DI   XI
-#elif (CLEVEL >= 7)
-    SI   DI DI DI DI DI DI DI      XI
-#elif (CLEVEL >= 6)
-    SI   DI DI DI DI DI DI         XI
-#elif (CLEVEL >= 5)
-    SI   DI DI DI DI               XI
-#elif (CLEVEL >= 4)
-    SI   DI DI DI                  XI
-#elif (CLEVEL >= 3)
-    SI   DI DI                     XI
-#elif (CLEVEL >= 2)
-    SI   DI                        XI
-#else
-    XI
-#endif
-}
-
-/* ii now points to the start of the next literal run */
-assert(ii == ip);
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1a_cr.ch

@@ -1,125 +0,0 @@
-/* lzo1a_cr.ch -- literal run handling for the the LZO1A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the LZO package and is subject
-   to change.
- */
-
-
-#ifndef __LZO1A_CR_H
-#define __LZO1A_CR_H 1
-
-
-/***********************************************************************
-// code a literal run
-************************************************************************/
-
-static lzo_bytep
-store_run(lzo_bytep const oo, const lzo_bytep const ii, lzo_uint r_len)
-{
-    lzo_bytep op;
-    const lzo_bytep ip;
-    lzo_uint t;
-
-    op = oo;
-    ip = ii;
-    assert(r_len > 0);
-
-    /* code a long R0 run */
-    if (r_len >= 512)
-    {
-        unsigned r_bits = 6;        /* 256 << 6 == 16384 */
-        lzo_uint tt = 32768u;
-
-        while (r_len >= (t = tt))
-        {
-            r_len -= t;
-            *op++ = 0;
-            *op++ = (R0MAX - R0MIN);
-            MEMCPY8_DS(op, ip, t);
-            LZO_STATS(lzo_stats->r0long_runs++);
-        }
-
-        tt >>= 1;
-
-        do
-        {
-            if (r_len >= (t = tt))
-            {
-                r_len -= t;
-                *op++ = 0;
-                *op++ = LZO_BYTE((R0FAST - R0MIN) + r_bits);
-                MEMCPY8_DS(op, ip, t);
-                LZO_STATS(lzo_stats->r0long_runs++);
-            }
-
-            tt >>= 1;
-        }
-        while (--r_bits > 0);
-    }
-
-    assert(r_len < 512);
-
-    while (r_len >= (t = R0FAST))
-    {
-        r_len -= t;
-        *op++ = 0;
-        *op++ = (R0FAST - R0MIN);
-        MEMCPY8_DS(op, ip, t);
-        LZO_STATS(lzo_stats->r0fast_runs++);
-    }
-
-    t = r_len;
-
-    if (t >= R0MIN)
-    {
-        /* code a short R0 run */
-        *op++ = 0;
-        *op++ = LZO_BYTE(t - R0MIN);
-        MEMCPY_DS(op, ip, t);
-        LZO_STATS(lzo_stats->r0short_runs++);
-    }
-    else if (t > 0)
-    {
-        /* code a short literal run */
-        LZO_STATS(lzo_stats->lit_runs++);
-        LZO_STATS(lzo_stats->lit_run[t]++);
-        *op++ = LZO_BYTE(t);
-        MEMCPY_DS(op, ip, t);
-    }
-
-    return op;
-}
-
-
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1a_de.h

@@ -1,144 +0,0 @@
-/* lzo1a_de.h -- definitions for the the LZO1A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the LZO package and is subject
-   to change.
- */
-
-
-#ifndef __LZO_DEFS_H
-#define __LZO_DEFS_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/*
-     Format of the marker byte
-
-
-     76543210
-     --------
-     00000000   a long literal run ('R0' run) - there are short and long R0 runs
-     000rrrrr   a short literal run with len r
-     mmmooooo   a short match (len = 2+m, o = offset low bits)
-     111ooooo   a long match (o = offset low bits)
-*/
-
-
-#define RSIZE   (1 << RBITS)
-#define RMASK   (RSIZE - 1)
-
-#define MBITS   (8 - OBITS)
-#define MSIZE   (1 << MBITS)
-#define MMASK   (MSIZE - 1)
-
-#define OBITS   RBITS               /* offset and run-length use same bits */
-#define OSIZE   (1 << OBITS)
-#define OMASK   (OSIZE - 1)
-
-
-/* additional bits for coding the length in a long match */
-#define LBITS   8
-#define LSIZE   (1 << LBITS)
-#define LMASK   (LSIZE - 1)
-
-
-/***********************************************************************
-// some macros to improve readability
-************************************************************************/
-
-/* Minimum len of a match */
-#define MIN_MATCH           3
-#define THRESHOLD           (MIN_MATCH - 1)
-
-/* Min-/Maximum len of a match coded in 2 bytes */
-#define MIN_MATCH_SHORT     (MIN_MATCH)
-#define MAX_MATCH_SHORT     (MIN_MATCH_SHORT + (MSIZE - 2) - 1)
-/* why (MSIZE - 2) ? because 0 is used to mark runs,
- *                   and MSIZE-1 is used to mark a long match */
-
-/* Min-/Maximum len of a match coded in 3 bytes */
-#define MIN_MATCH_LONG      (MAX_MATCH_SHORT + 1)
-#define MAX_MATCH_LONG      (MIN_MATCH_LONG + LSIZE - 1)
-
-/* Min-/Maximum offset of a match */
-#define MIN_OFFSET          1
-#define MAX_OFFSET          (1 << (CHAR_BIT + OBITS))
-
-
-/* R0 literal run (a long run) */
-
-#define R0MIN   (RSIZE)             /* Minimum len of R0 run of literals */
-#define R0MAX   (R0MIN + 255)       /* Maximum len of R0 run of literals */
-#define R0FAST  (R0MAX & ~7)        /* R0MAX aligned to 8 byte boundary */
-
-#if (R0MAX - R0FAST != 7) || ((R0FAST & 7) != 0)
-#  error "something went wrong"
-#endif
-
-/* 7 special codes from R0FAST+1 .. R0MAX
- * these codes mean long R0 runs with lengths
- * 512, 1024, 2048, 4096, 8192, 16384, 32768 */
-
-
-/*
-
-RBITS | MBITS  MIN  THR.  MSIZE  MAXS  MINL  MAXL   MAXO  R0MAX R0FAST
-======+===============================================================
-  3   |   5      3    2     32    32    33    288   2048    263   256
-  4   |   4      3    2     16    16    17    272   4096    271   264
-  5   |   3      3    2      8     8     9    264   8192    287   280
-
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define DBITS       13
-#include "lzo_dict.h"
-#define DVAL_LEN    DVAL_LOOKAHEAD
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_1.c

@@ -1,35 +0,0 @@
-/* lzo1b_1.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     1
-
-#define DDBITS          0
-#define CLEVEL          1
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_2.c

@@ -1,35 +0,0 @@
-/* lzo1b_2.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     2
-
-#define DDBITS          0
-#define CLEVEL          2
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_3.c

@@ -1,35 +0,0 @@
-/* lzo1b_3.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     3
-
-#define DDBITS          0
-#define CLEVEL          3
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_4.c

@@ -1,35 +0,0 @@
-/* lzo1b_4.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     4
-
-#define DDBITS          1
-#define CLEVEL          2
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_5.c

@@ -1,35 +0,0 @@
-/* lzo1b_5.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     5
-
-#define DDBITS          1
-#define CLEVEL          3
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_6.c

@@ -1,35 +0,0 @@
-/* lzo1b_6.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     6
-
-#define DDBITS          1
-#define CLEVEL          5
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_7.c

@@ -1,35 +0,0 @@
-/* lzo1b_7.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     7
-
-#define DDBITS          2
-#define CLEVEL          3
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_8.c

@@ -1,35 +0,0 @@
-/* lzo1b_8.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     8
-
-#define DDBITS          2
-#define CLEVEL          8
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_9.c

@@ -1,35 +0,0 @@
-/* lzo1b_9.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     9
-
-#define DDBITS          2
-#define CLEVEL          9
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_99.c

@@ -1,38 +0,0 @@
-/* lzo1b_99.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     99
-
-#define DDBITS          3
-#define CLEVEL          9
-
-#define D_BITS          16
-#define MATCH_IP_END        in_end
-#include "compr1b.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_9x.c

@@ -1,373 +0,0 @@
-/* lzo1b_9x.c -- implementation of the LZO1B-999 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define SWD_N          0xffffL          /* size of ring buffer */
-#define SWD_THRESHOLD       2           /* lower limit for match length */
-#define SWD_F            2048           /* upper limit for match length */
-
-
-#define LZO1B 1
-#define LZO_COMPRESS_T  lzo1b_999_t
-#define lzo_swd_t       lzo1b_999_swd_t
-#include "lzo_mchw.ch"
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_bytep
-code_match(LZO_COMPRESS_T* c, lzo_bytep op, lzo_uint m_len, lzo_uint m_off)
-{
-    if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
-    {
-        assert(m_len >= M2_MIN_LEN);
-        assert(m_off >= M2_MIN_OFFSET);
-
-        m_off -= M2_MIN_OFFSET;
-        /* code match len + low offset bits */
-        *op++ = LZO_BYTE(((m_len - (M2_MIN_LEN - 2)) << M2O_BITS) |
-                         (m_off & M2O_MASK));
-        /* code high offset bits */
-        *op++ = LZO_BYTE(m_off >> M2O_BITS);
-        c->m2_m++;
-    }
-    else
-    {
-        assert(m_len >= M3_MIN_LEN);
-        assert(m_off <= M3_MAX_OFFSET);
-
-        m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
-
-        /* code match len */
-        if (m_len <= M3_MAX_LEN)
-            *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
-        else
-        {
-            assert(m_len >= M4_MIN_LEN);
-            /* code M4 match len flag */
-            *op++ = M4_MARKER;
-            /* code match len */
-            m_len -= M4_MIN_LEN - 1;
-
-            while (m_len > 255)
-            {
-                m_len -= 255;
-                *op++ = 0;
-            }
-
-            assert(m_len > 0);
-            *op++ = LZO_BYTE(m_len);
-        }
-
-        /* code low offset bits */
-        *op++ = LZO_BYTE(m_off & M3O_MASK);
-        /* code high offset bits */
-        *op++ = LZO_BYTE(m_off >> M3O_BITS);
-
-        c->r1_m_len = 0;
-        c->m3_m++;
-    }
-
-    return op;
-}
-
-
-/***********************************************************************
-// this is a public function, but there is no prototype in a header file
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1b_999_compress_callback(const lzo_bytep in , lzo_uint  in_len,
-                            lzo_bytep out, lzo_uintp out_len,
-                            lzo_voidp wrkmem,
-                            lzo_callback_p cb,
-                            lzo_uint max_chain);
-
-LZO_PUBLIC(int)
-lzo1b_999_compress_callback(const lzo_bytep in , lzo_uint  in_len,
-                            lzo_bytep out, lzo_uintp out_len,
-                            lzo_voidp wrkmem,
-                            lzo_callback_p cb,
-                            lzo_uint max_chain)
-{
-    lzo_bytep op;
-    const lzo_bytep ii;
-    lzo_uint lit;
-    lzo_uint m_len, m_off;
-    LZO_COMPRESS_T cc;
-    LZO_COMPRESS_T* const c = &cc;
-    lzo_swd_p const swd = (lzo_swd_p) wrkmem;
-    int r;
-
-    /* sanity check */
-    LZO_COMPILE_TIME_ASSERT(LZO1B_999_MEM_COMPRESS >= SIZEOF_LZO_SWD_T)
-
-    c->init = 0;
-    c->ip = c->in = in;
-    c->in_end = in + in_len;
-    c->cb = cb;
-    c->r1_r = c->m3_r = c->m2_m = c->m3_m = 0;
-
-    op = out;
-    ii = c->ip;             /* point to start of literal run */
-    lit = 0;
-    c->r1_m_len = 0;
-
-    r = init_match(c, swd, NULL, 0, 0);
-
-    if (r != 0)
-        return r;
-
-    if (max_chain > 0)
-        swd->max_chain = max_chain;
-
-    r = find_match(c, swd, 0, 0);
-
-    if (r != 0)
-        return r;
-
-    while (c->look > 0)
-    {
-        int lazy_match_min_gain = -1;
-        lzo_uint ahead = 0;
-
-        m_len = c->m_len;
-        m_off = c->m_off;
-
-#if 0
-        printf("%5ld: %5d len:%3d off:%5d\n", (c->ip - c->look) - in, c->look,
-               m_len, m_off);
-#endif
-
-        assert(c->ip - c->look >= in);
-
-        if (lit == 0)
-            ii = c->ip - c->look;
-
-        assert(ii + lit == c->ip - c->look);
-        assert(swd->b_char == *(c->ip - c->look));
-
-        if ((m_len < M2_MIN_LEN) ||
-                (m_len < M3_MIN_LEN && m_off > M2_MAX_OFFSET))
-        {
-            m_len = 0;
-        }
-        else
-        {
-            assert(c->ip - c->look - m_off >= in);
-            assert(c->ip - c->look - m_off + m_len < c->ip);
-            assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
-                              m_len) == 0);
-
-            if (lit > 0)
-            {
-                /* we have a current literal run: do not try a lazy match,
-                   if the literal could be coded into a r1 match */
-                if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
-                    lazy_match_min_gain = -1;
-                else
-                    lazy_match_min_gain = 1;
-
-#if (M2_MIN_LEN == 2)
-
-                if (m_len == 2)
-                {
-                    /* don't code a match of len 2 if we have to
-                       code a literal run. Code a literal instead. */
-                    m_len = 0;
-                }
-
-#endif
-#if (M2_MIN_LEN == M3_MIN_LEN)
-
-                if (m_len == M2_MIN_LEN && m_off > M2_MAX_OFFSET)
-                {
-                    /* don't code a M3 match of len 3 if we have to
-                       code a literal run. Code a literal instead. */
-                    m_len = 0;
-                }
-
-#endif
-            }
-            else
-            {
-                /* no current literal run: only try a lazy match,
-                   if the literal could be coded into a r1 match */
-                if (c->r1_m_len == M2_MIN_LEN)
-                    lazy_match_min_gain = 0;
-                else
-                    lazy_match_min_gain = -1;
-            }
-        }
-
-
-        /* try a lazy match */
-        if (m_len == 0)
-            lazy_match_min_gain = -1;
-
-        if (lazy_match_min_gain >= 0 && c->look > m_len)
-        {
-            assert(m_len > 0);
-
-            r = find_match(c, swd, 1, 0);
-            assert(r == 0);
-            LZO_UNUSED(r);
-            assert(c->look > 0);
-
-            if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET &&
-                    c->m_off > M2_MAX_OFFSET)
-                lazy_match_min_gain += 1;
-
-            if (c->m_len >= m_len + lazy_match_min_gain)
-            {
-                c->lazy++;
-#if !defined(NDEBUG)
-                m_len = c->m_len;
-                m_off = c->m_off;
-                assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
-                                  m_len) == 0);
-#endif
-                lit++;
-                assert(ii + lit == c->ip - c->look);
-                continue;
-            }
-            else
-            {
-                ahead = 1;
-                assert(ii + lit + 1 == c->ip - c->look);
-            }
-
-            assert(m_len > 0);
-        }
-
-        assert(ii + lit + ahead == c->ip - c->look);
-
-
-        if (m_len == 0)
-        {
-            /* a literal */
-            lit++;
-            r = find_match(c, swd, 1, 0);
-            assert(r == 0);
-            LZO_UNUSED(r);
-        }
-        else
-        {
-            /* 1 - store run */
-            if (lit > 0)
-            {
-                /* code current literal run */
-                if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
-                {
-                    /* Code a context sensitive R1 match. */
-                    assert((op[-2] >> M2O_BITS) == (M2_MARKER >> M2O_BITS));
-                    op[-2] &= M2O_MASK;
-                    assert((op[-2] >> M2O_BITS) == 0);
-                    /* copy 1 literal */
-                    *op++ = *ii++;
-                    assert(ii + ahead == c->ip - c->look);
-                    c->r1_r++;
-                }
-                else
-                {
-                    op = STORE_RUN(op, ii, lit);
-                }
-
-                if (lit < R0FAST)
-                    c->r1_m_len = m_len;
-                else
-                    c->r1_m_len = 0;
-
-                lit = 0;
-            }
-            else
-                c->r1_m_len = 0;
-
-            /* 2 - code match */
-            op = code_match(c, op, m_len, m_off);
-            r = find_match(c, swd, m_len, 1 + ahead);
-            assert(r == 0);
-            LZO_UNUSED(r);
-        }
-
-        c->codesize = pd(op, out);
-    }
-
-
-    /* store final run */
-    if (lit > 0)
-        op = STORE_RUN(op, ii, lit);
-
-#if defined(LZO_EOF_CODE)
-    *op++ = M3_MARKER | 1;
-    *op++ = 0;
-    *op++ = 0;
-#endif
-
-    c->codesize = pd(op, out);
-    assert(c->textsize == in_len);
-
-    *out_len = pd(op, out);
-
-    if (c->cb && c->cb->nprogress)
-        (*c->cb->nprogress)(c->cb, c->textsize, c->codesize, 0);
-
-#if 0
-    printf("%ld %ld -> %ld: %ld %ld %ld %ld %ld\n",
-           (long) c->textsize, (long)in_len, (long) c->codesize,
-           c->r1_r, c->m3_r, c->m2_m, c->m3_m, c->lazy);
-#endif
-    return LZO_E_OK;
-}
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1b_999_compress(const lzo_bytep in , lzo_uint  in_len,
-                   lzo_bytep out, lzo_uintp out_len,
-                   lzo_voidp wrkmem)
-{
-    return lzo1b_999_compress_callback(in, in_len, out, out_len, wrkmem,
-                                       (lzo_callback_p) 0, 0);
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_c.ch

@@ -1,269 +0,0 @@
-/* lzo1b_c.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(LZO_HAVE_R1) && !defined(LZO_NO_R1)
-#  define LZO_HAVE_R1 1
-#endif
-
-#if !defined(LZO_HAVE_M3) && !defined(LZO_NO_M3)
-#  if (M3O_BITS < 8)
-#    define LZO_HAVE_M3 1
-#  endif
-#endif
-
-
-#define MI      /*empty*/
-#define SI      MI
-#if (DD_BITS > 0)
-#define DI      ++ii; DVAL_NEXT(dv,ii); UPDATE_D(dict,drun,dv,ii,in); MI
-#define XI      assert(ii < ip); ii = ip; DVAL_FIRST(dv,(ip));
-#else
-#define DI      ++ii; DINDEX1(dindex,ii); UPDATE_I(dict,0,dindex,ii,in); MI
-#define XI      assert(ii < ip); ii = ip;
-#endif
-
-
-/***********************************************************************
-// compress a block of data.
-//
-// I really apologize for this spaghetti code.
-************************************************************************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-LZO_PRIVATE(int)
-do_compress(const lzo_bytep in , lzo_uint  in_len,
-            lzo_bytep out, lzo_uintp out_len,
-            lzo_voidp wrkmem)
-{
-    const lzo_bytep ip;
-#if (DD_BITS > 0)
-#if defined(__LZO_HASH_INCREMENTAL)
-    lzo_xint dv;
-#endif
-    unsigned drun = 0;
-#endif
-    lzo_bytep op;
-    const lzo_bytep const in_end = in + in_len;
-    const lzo_bytep const ip_end = in + in_len - MIN_LOOKAHEAD;
-    const lzo_bytep ii;
-#if defined(LZO_HAVE_R1)
-    const lzo_bytep r1 = ip_end;    /* pointer for R1 match (none yet) */
-#endif
-#if defined(LZO_HAVE_M3)
-    lzo_bytep m3 = out + 1;         /* pointer after last m3/m4 match */
-#endif
-
-    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
-
-#if (LZO_COLLECT_STATS)
-    lzo_stats->r_bits   = R_BITS;
-    lzo_stats->m3o_bits = M3O_BITS;
-    lzo_stats->dd_bits  = DD_BITS;
-    lzo_stats->clevel   = CLEVEL;
-    lzo_stats->d_bits   = D_BITS;
-    lzo_stats->min_lookahead  = MIN_LOOKAHEAD;
-    lzo_stats->max_lookbehind = MAX_LOOKBEHIND;
-    lzo_stats->compress_id    = LZO_PP_MACRO_EXPAND(COMPRESS_ID);
-#endif
-
-    /* init dictionary */
-#if (LZO_DETERMINISTIC)
-    BZERO8_PTR(wrkmem, sizeof(lzo_dict_t), D_SIZE);
-#endif
-
-
-    op = out;
-    ip = in;
-    ii = ip;            /* point to start of current literal run */
-
-
-#if (DD_BITS > 0)
-    DVAL_FIRST(dv, ip);
-    UPDATE_D(dict, drun, dv, ip, in);
-    ip++;
-    DVAL_NEXT(dv, ip);
-#else
-    ip++;
-#endif
-
-    assert(ip < ip_end);
-
-    for (;;)
-    {
-        const lzo_bytep m_pos;
-#if !defined(NDEBUG)
-        const lzo_bytep m_pos_sav = NULL;
-#endif
-        LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, m_off, 0);
-#if (DD_BITS == 0)
-        lzo_uint dindex;
-#endif
-        lzo_uint m_len;
-
-
-        /***********************************************************************
-        // search for a match
-        ************************************************************************/
-
-#if !defined(LZO_SEARCH_MATCH_INCLUDE_FILE)
-#  define LZO_SEARCH_MATCH_INCLUDE_FILE     "lzo1b_sm.ch"
-#endif
-
-#include LZO_SEARCH_MATCH_INCLUDE_FILE
-
-
-#if !defined(LZO_TEST_MATCH_INCLUDE_FILE)
-#  define LZO_TEST_MATCH_INCLUDE_FILE       "lzo1b_tm.ch"
-#endif
-
-#include LZO_TEST_MATCH_INCLUDE_FILE
-
-
-
-        /***********************************************************************
-        // found a literal
-        ************************************************************************/
-
-
-        /* a literal */
-literal:
-#if (DD_BITS == 0)
-        UPDATE_I(dict, 0, dindex, ip, in);
-#endif
-
-        if (++ip >= ip_end)
-            break;
-
-#if (DD_BITS > 0)
-        DVAL_NEXT(dv, ip);
-#endif
-        continue;
-
-
-
-        /***********************************************************************
-        // found a match
-        ************************************************************************/
-
-match:
-#if (DD_BITS == 0)
-        UPDATE_I(dict, 0, dindex, ip, in);
-#endif
-        /* we have found a match of at least M2_MIN_LEN */
-
-
-#if !defined(LZO_CODE_RUN_INCLUDE_FILE)
-#  define LZO_CODE_RUN_INCLUDE_FILE     "lzo1b_cr.ch"
-#endif
-
-#include LZO_CODE_RUN_INCLUDE_FILE
-
-
-        /* ii now points to the start of the current match */
-        assert(ii == ip);
-
-
-        /***********************************************************************
-        // code the match
-        ************************************************************************/
-
-#if !defined(LZO_CODE_MATCH_INCLUDE_FILE)
-#  define LZO_CODE_MATCH_INCLUDE_FILE   "lzo1b_cm.ch"
-#endif
-
-#include LZO_CODE_MATCH_INCLUDE_FILE
-
-
-        /* ii now points to the start of the next literal run */
-        assert(ii == ip);
-
-    }
-
-
-    /***********************************************************************
-    // end of block
-    ************************************************************************/
-
-    assert(ip <= in_end);
-
-#if (LZO_COLLECT_STATS)
-    {
-        lzo_uint i;
-        const lzo_bytep p;
-
-        for (i = 0; i < D_SIZE; i++)
-        {
-            p = dict[i];
-
-            if (BOUNDS_CHECKING_OFF_IN_EXPR(p == NULL || p < in || p > in_end))
-                lzo_stats->unused_dict_entries++;
-        }
-
-        lzo_stats->unused_dict_entries_percent =
-            100.0 * lzo_stats->unused_dict_entries / D_SIZE;
-    }
-#endif
-
-
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-
-    /* return if op == out to indicate that we
-     * couldn't compress and didn't copy anything.
-     */
-    if (op == out)
-    {
-        *out_len = 0;
-        return LZO_E_NOT_COMPRESSIBLE;
-    }
-
-#endif
-
-    /* store the final literal run */
-    if (pd(in_end, ii) > 0)
-    {
-        lzo_uint t = pd(in_end, ii);
-        op = STORE_RUN(op, ii, t);
-    }
-
-    *out_len = pd(op, out);
-    return LZO_E_OK;                /* compression went ok */
-}
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_cc.c

@@ -1,157 +0,0 @@
-/* lzo1b_cc.c -- LZO1B compression internal entry point
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define LZO_NEED_DICT_H 1
-#include "config1b.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-LZO_LOCAL_IMPL(int)
-_lzo1b_do_compress(const lzo_bytep in,  lzo_uint  in_len,
-                   lzo_bytep out, lzo_uintp out_len,
-                   lzo_voidp wrkmem,
-                   lzo_compress_t func)
-{
-    int r;
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
-    lzo_uint avail_out = *out_len;
-#endif
-
-
-#if (LZO_COLLECT_STATS)
-    _lzo1b_stats_init(lzo_stats);
-    lzo_stats->in_len = in_len;
-#endif
-
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-    {
-        *out_len = 0;
-        r = LZO_E_OK;
-    }
-    else if (in_len <= MIN_LOOKAHEAD + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        *out_len = 0;
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(STORE_RUN(out, in, in_len), out);
-        r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
-    }
-    else
-        r = func(in, in_len, out, out_len, wrkmem);
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
-
-    if (r == LZO_E_OK && avail_out - *out_len < 3)
-        r = LZO_E_COMPRESS_OVERRUN;
-
-#endif
-
-    if (r == LZO_E_OK)
-    {
-        lzo_bytep op = out + *out_len;
-        op[0] = M3_MARKER | 1;
-        op[1] = 0;
-        op[2] = 0;
-        *out_len += 3;
-    }
-
-#endif
-
-
-#if (LZO_COLLECT_STATS)
-    lzo_stats->out_len = *out_len;
-    lzo_stats->match_bytes =
-        1 * lzo_stats->m1_matches + 2 * lzo_stats->m2_matches +
-        3 * lzo_stats->m3_matches + 4 * lzo_stats->m4_matches;
-    _lzo1b_stats_calc(lzo_stats);
-#endif
-
-    return r;
-}
-
-
-/***********************************************************************
-// note: this is not thread safe, but as it is used for finetuning only
-//       we don't care
-************************************************************************/
-
-#undef lzo_stats
-/* lzo_stats_t is still defined */
-
-
-#if (LZO_COLLECT_STATS)
-
-static lzo_stats_t lzo_statistics;
-lzo_stats_t* const lzo1b_stats = &lzo_statistics;
-
-
-void _lzo1b_stats_init(lzo_stats_t* lzo_stats)
-{
-    lzo_memset(lzo_stats, 0, sizeof(*lzo_stats));
-}
-
-
-void _lzo1b_stats_calc(lzo_stats_t* lzo_stats)
-{
-    lzo_stats->matches =
-        lzo_stats->m1_matches + lzo_stats->m2_matches +
-        lzo_stats->m3_matches + lzo_stats->m4_matches;
-
-    lzo_stats->literal_overhead = lzo_stats->lit_runs +
-                                  2 * (lzo_stats->r0short_runs + lzo_stats->r0fast_runs +
-                                       lzo_stats->r0long_runs);
-    lzo_stats->literal_bytes = lzo_stats->literals +
-                               lzo_stats->literal_overhead;
-
-#if 0
-    assert(lzo_stats->match_bytes + lzo_stats->literal_bytes ==
-           lzo_stats->out_len);
-#endif
-
-    lzo_stats->m2_matches -= lzo_stats->r1_matches;
-    lzo_stats->m2_match[M2_MIN_LEN] -= lzo_stats->r1_matches;
-
-    if (lzo_stats->literals > 0)
-        lzo_stats->literal_overhead_percent =
-            100.0 * lzo_stats->literal_overhead / lzo_stats->literals;
-}
-
-
-#endif
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_cc.h

@@ -1,77 +0,0 @@
-/* lzo1b_cc.h -- definitions for the the LZO1B compression driver
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO1B_CC_H
-#define __LZO1B_CC_H 1
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-extern const lzo_compress_t _lzo1b_1_compress_func;
-extern const lzo_compress_t _lzo1b_2_compress_func;
-extern const lzo_compress_t _lzo1b_3_compress_func;
-extern const lzo_compress_t _lzo1b_4_compress_func;
-extern const lzo_compress_t _lzo1b_5_compress_func;
-extern const lzo_compress_t _lzo1b_6_compress_func;
-extern const lzo_compress_t _lzo1b_7_compress_func;
-extern const lzo_compress_t _lzo1b_8_compress_func;
-extern const lzo_compress_t _lzo1b_9_compress_func;
-
-extern const lzo_compress_t _lzo1b_99_compress_func;
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_LOCAL_DECL(lzo_bytep)
-_lzo1b_store_run(lzo_bytep const oo, const lzo_bytep const ii,
-                 lzo_uint r_len);
-
-#define STORE_RUN   _lzo1b_store_run
-
-
-LZO_LOCAL_DECL(int)
-_lzo1b_do_compress(const lzo_bytep in,  lzo_uint  in_len,
-                   lzo_bytep out, lzo_uintp out_len,
-                   lzo_voidp wrkmem,
-                   lzo_compress_t func);
-
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_cm.ch

@@ -1,294 +0,0 @@
-/* lzo1b_cm.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// code the match
-************************************************************************/
-
-#if (DD_BITS == 0)
-
-/* we already matched M2_MIN_LEN bytes,
- * m_pos also already advanced M2_MIN_LEN bytes */
-ip += M2_MIN_LEN;
-assert(m_pos < ip);
-
-/* try to match another M2_MAX_LEN + 1 - M2_MIN_LEN bytes
- * to see if we get more than a M2 match */
-#define M2_OR_M3    (MATCH_M2)
-
-#else /* (DD_BITS == 0) */
-
-/* we already matched m_len bytes */
-assert(m_len >= M2_MIN_LEN);
-ip += m_len;
-assert(ip <= in_end);
-
-#define M2_OR_M3    (m_len <= M2_MAX_LEN)
-
-#endif /* (DD_BITS == 0) */
-
-
-
-if (M2_OR_M3)
-{
-    /* we've found a M2 or M3 match */
-    assert(ip <= in_end);
-
-    /* 2a) compute match parameters */
-#if (DD_BITS == 0)
-    assert(pd(ip, m_pos) == m_off);
-    --ip;   /* ran one too far, point back to non-match */
-    m_len = pd(ip, ii);
-#endif
-
-    /* 2a2) verify match parameters */
-    assert(m_len >= M2_MIN_LEN);
-    assert(m_len <= M2_MAX_LEN);
-    assert(m_len <= M3_MAX_LEN);
-
-    assert(m_off >= M2_MIN_OFFSET);
-    assert(m_off >= M3_MIN_OFFSET);
-    assert(m_off <= M3_MAX_OFFSET);
-    assert(ii - m_off == m_pos_sav);
-    assert(lzo_memcmp(m_pos_sav, ii, m_len) == 0);
-
-    /* 2b) code the match */
-#if (_M2_MAX_OFFSET != _M3_MAX_OFFSET)
-
-    if (m_off <= M2_MAX_OFFSET)
-    {
-#else
-    assert(m_off <= M2_MAX_OFFSET);
-#endif
-        m_off -= M2_MIN_OFFSET;
-        /* code match len + low offset bits */
-        *op++ = LZO_BYTE(((m_len - (M2_MIN_LEN - 2)) << M2O_BITS) |
-                         (m_off & M2O_MASK));
-        /* code high offset bits */
-        *op++ = LZO_BYTE(m_off >> M2O_BITS);
-        LZO_STATS(lzo_stats->m2_matches++);
-        LZO_STATS(lzo_stats->m2_match[m_len]++);
-#if (_M2_MAX_OFFSET != _M3_MAX_OFFSET)
-    }
-    else
-    {
-#if defined(LZO_HAVE_R1)
-#if (M3_MIN_LEN == M2_MIN_LEN)
-        r1 = ip_end;    /* invalidate R1 pointer */
-#endif
-#endif
-        assert(m_len >= M3_MIN_LEN);
-        m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
-        /* code match len */
-        *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
-        /* code low offset bits */
-        *op++ = LZO_BYTE(m_off & M3O_MASK);
-        /* code high offset bits */
-        *op++ = LZO_BYTE(m_off >> M3O_BITS);
-        LZO_STATS(lzo_stats->m3_matches++);
-        LZO_STATS(lzo_stats->m3_match[m_len]++);
-#if defined(LZO_HAVE_M3)
-        m3 = op;        /* set M3 pointer */
-#endif
-    }
-
-#endif /* (_M2_MAX_OFFSET != _M3_MAX_OFFSET) */
-
-
-    if (ip >= ip_end)
-    {
-        ii = ip;
-        break;
-    }
-
-
-    /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && M2L_BITS <= 4) || (CLEVEL >= 5 && M2L_BITS <= 3)
-    /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-    ++ii;
-
-    do
-    {
-        DVAL_NEXT(dv, ii);
-#if 0
-        UPDATE_D(dict, drun, dv, ii, in);
-#else
-        dict[ DINDEX(dv, ii) ] = DENTRY(ii, in);
-#endif
-        MI
-    }
-    while (++ii < ip);
-
-    DVAL_NEXT(dv, ii);
-    assert(ii == ip);
-    DVAL_ASSERT(dv, ip);
-#elif (CLEVEL >= 3)
-    SI   DI DI   XI
-#elif (CLEVEL >= 2)
-    SI   DI      XI
-#else
-    XI
-#endif
-}
-
-else
-
-{
-    /* we've found a M3 or M4 match - see how far we can still go */
-    assert(ip <= in_end);
-    assert(lzo_memcmp(m_pos_sav, ii, (lzo_uint)(ip - ii)) == 0);
-
-    /* 2a) compute match parameters */
-#if !defined(MATCH_IP_END)
-    assert(ii == ip - (M2_MAX_LEN + 1));
-#if (DD_BITS > 0)
-    assert(m_len == (lzo_uint)(ip - ii));
-    m_pos = ip - m_off;
-    assert(m_pos == m_pos_sav + m_len);
-#endif
-    {
-        const lzo_bytep end;
-        end = in_end;
-
-        while (ip < end  &&  *m_pos == *ip)
-            m_pos++, ip++;
-
-        assert(ip <= in_end);
-        m_len = pd(ip, ii);
-    }
-    assert(pd(ip, m_pos) == m_off);
-#endif
-
-    /* 2a2) verify match parameters */
-    assert(m_len >= M3_MIN_LEN);
-
-    assert(m_off >= M3_MIN_OFFSET);
-    assert(m_off >= M4_MIN_OFFSET);
-    assert(m_off <= M3_MAX_OFFSET);
-    assert(m_off <= M4_MAX_OFFSET);
-    assert(ii - m_off == m_pos_sav);
-    assert(lzo_memcmp(m_pos_sav, ii, m_len) == 0);
-
-    /* 2b) code the match */
-    if (m_len <= M3_MAX_LEN)
-    {
-        /* code match len */
-        *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
-        LZO_STATS(lzo_stats->m3_matches++);
-        LZO_STATS(lzo_stats->m3_match[m_len]++);
-    }
-    else
-    {
-        assert(m_len >= M4_MIN_LEN);
-        /* code M4 match len flag */
-        *op++ = M4_MARKER;
-        /* code match len */
-        m_len -= M4_MIN_LEN - 1;
-
-        while (m_len > 255)
-        {
-            m_len -= 255;
-            *op++ = 0;
-        }
-
-        assert(m_len > 0);
-        *op++ = LZO_BYTE(m_len);
-        LZO_STATS(lzo_stats->m4_matches++);
-    }
-
-    m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
-    /* code low offset bits */
-    *op++ = LZO_BYTE(m_off & M3O_MASK);
-    /* code high offset bits */
-    *op++ = LZO_BYTE(m_off >> M3O_BITS);
-
-#if defined(LZO_HAVE_M3)
-    m3 = op;        /* set M3 pointer */
-#endif
-
-
-    if (ip >= ip_end)
-    {
-        ii = ip;
-        break;
-    }
-
-
-    /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
-    /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-    /* This is not recommended because it can be slow. */
-    ++ii;
-
-    do
-    {
-        DVAL_NEXT(dv, ii);
-#if 0
-        UPDATE_D(dict, drun, dv, ii, in);
-#else
-        dict[ DINDEX(dv, ii) ] = DENTRY(ii, in);
-#endif
-        MI
-    }
-    while (++ii < ip);
-
-    DVAL_NEXT(dv, ii);
-    assert(ii == ip);
-    DVAL_ASSERT(dv, ip);
-#elif (CLEVEL >= 8)
-    SI   DI DI DI DI DI DI DI DI   XI
-#elif (CLEVEL >= 7)
-    SI   DI DI DI DI DI DI DI      XI
-#elif (CLEVEL >= 6)
-    SI   DI DI DI DI DI DI         XI
-#elif (CLEVEL >= 5)
-    SI   DI DI DI DI               XI
-#elif (CLEVEL >= 4)
-    SI   DI DI DI                  XI
-#elif (CLEVEL >= 3)
-    SI   DI DI                     XI
-#elif (CLEVEL >= 2)
-    SI   DI                        XI
-#else
-    XI
-#endif
-}
-
-/* ii now points to the start of the next literal run */
-assert(ii == ip);
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_cr.ch

@@ -1,117 +0,0 @@
-/* lzo1b_cr.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// store the current literal run
-************************************************************************/
-
-assert(ip < ip_end);
-
-if (pd(ip, ii) > 0)
-{
-    lzo_uint t = pd(ip, ii);
-
-#if defined(LZO_HAVE_R1)
-
-    if (ip == r1)
-    {
-        /* Code a context sensitive R1 match. */
-        LZO_STATS(lzo_stats->literals += t);
-        LZO_STATS(lzo_stats->r1_matches++);
-        assert(t == 1);
-        /* modify marker byte */
-        assert((op[-2] >> M2O_BITS) == (M2_MARKER >> M2O_BITS));
-        op[-2] &= M2O_MASK;
-        assert((op[-2] >> M2O_BITS) == 0);
-        /* copy 1 literal */
-        *op++ = *ii++;
-        r1 = ip + (M2_MIN_LEN + 1);     /* set new R1 pointer */
-    }
-    else
-#endif
-        if (t < R0MIN)
-        {
-            /* inline the copying of a short run */
-            LZO_STATS(lzo_stats->literals += t);
-            LZO_STATS(lzo_stats->lit_runs++);
-            LZO_STATS(lzo_stats->lit_run[t]++);
-#if defined(LZO_HAVE_M3)
-
-            if (t < LZO_SIZE(8 - M3O_BITS) && op == m3)
-            {
-                /* Code a very short literal run into the low offset bits
-                 * of the previous M3/M4 match.
-                 */
-                LZO_STATS(lzo_stats->lit_runs_after_m3_match++);
-                LZO_STATS(lzo_stats->lit_run_after_m3_match[t]++);
-                assert((m3[-2] >> M3O_BITS) == 0);
-                m3[-2] = LZO_BYTE(m3[-2] | (t << M3O_BITS));
-            }
-            else
-#endif
-            {
-                *op++ = LZO_BYTE(t);
-            }
-
-            MEMCPY_DS(op, ii, t);
-#if defined(LZO_HAVE_R1)
-            r1 = ip + (M2_MIN_LEN + 1);     /* set new R1 pointer */
-#endif
-        }
-        else if (t < R0FAST)
-        {
-            /* inline the copying of a short R0 run */
-            LZO_STATS(lzo_stats->literals += t);
-            LZO_STATS(lzo_stats->r0short_runs++);
-            *op++ = 0;
-            *op++ = LZO_BYTE(t - R0MIN);
-            MEMCPY_DS(op, ii, t);
-#if defined(LZO_HAVE_R1)
-            r1 = ip + (M2_MIN_LEN + 1);     /* set new R1 pointer */
-#endif
-        }
-        else
-        {
-            op = STORE_RUN(op, ii, t);
-            ii = ip;
-        }
-}
-
-
-/* ii now points to the start of the current match */
-assert(ii == ip);
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_d.ch

@@ -1,321 +0,0 @@
-/* lzo1b_d.ch -- implementation of the LZO1B decompression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo1_d.ch"
-
-
-/***********************************************************************
-// decompress a block of data.
-************************************************************************/
-
-LZO_PUBLIC(int)
-DO_DECOMPRESS(const lzo_bytep in , lzo_uint  in_len,
-              lzo_bytep out, lzo_uintp out_len,
-              lzo_voidp wrkmem)
-{
-    lzo_bytep op;
-    const lzo_bytep ip;
-    lzo_uint t;
-    const lzo_bytep m_pos;
-
-    const lzo_bytep const ip_end = in + in_len;
-#if defined(HAVE_ANY_OP)
-    lzo_bytep const op_end = out + *out_len;
-#endif
-
-    LZO_UNUSED(wrkmem);
-
-    op = out;
-    ip = in;
-
-    while (TEST_IP_AND_TEST_OP)
-    {
-        t = *ip++;      /* get marker */
-
-        if (t < R0MIN)      /* a literal run */
-        {
-            if (t == 0)             /* a R0 literal run */
-            {
-                NEED_IP(1);
-                t = *ip++;
-
-                if (t >= R0FAST - R0MIN)            /* a long R0 run */
-                {
-                    t -= R0FAST - R0MIN;
-
-                    if (t == 0)
-                        t = R0FAST;
-                    else
-                    {
-#if 0
-                        t = 256u << ((unsigned) t);
-#else
-                        /* help the optimizer */
-                        lzo_uint tt = 256;
-
-                        do tt <<= 1;
-
-                        while (--t > 0);
-
-                        t = tt;
-#endif
-                    }
-
-                    NEED_IP(t);
-                    NEED_OP(t);
-#if 1 && (LZO_OPT_UNALIGNED32)
-
-                    do
-                    {
-                        UA_COPY4(op + 0, ip + 0);
-                        UA_COPY4(op + 4, ip + 4);
-                        op += 8;
-                        ip += 8;
-                        t -= 8;
-                    }
-                    while (t > 0);
-
-#else
-                    MEMCPY8_DS(op, ip, t);
-#endif
-                    continue;
-                }
-
-                t += R0MIN;                         /* a short R0 run */
-            }
-
-            NEED_IP(t);
-            NEED_OP(t);
-            /* copy literal run */
-#if 1 && (LZO_OPT_UNALIGNED32)
-
-            if (t >= 4)
-            {
-                do
-                {
-                    UA_COPY4(op, ip);
-                    op += 4;
-                    ip += 4;
-                    t -= 4;
-                }
-                while (t >= 4);
-
-                if (t > 0) do* op++ = *ip++;
-
-                    while (--t > 0);
-            }
-            else
-#endif
-            {
-#if (M3O_BITS < 7)
-literal1:
-#endif
-
-                do* op++ = *ip++;
-
-                while (--t > 0);
-            }
-
-#if (M3O_BITS == 7)
-literal2:
-#endif
-
-            /* after a literal a match must follow */
-            while (TEST_IP_AND_TEST_OP)
-            {
-                t = *ip++;          /* get R1 marker */
-
-                if (t >= R0MIN)
-                    goto match;
-
-                NEED_IP(2);
-                NEED_OP(M2_MIN_LEN + 1);
-
-                /* R1 match - a M2_MIN_LEN match + 1 byte literal */
-                assert((t & M2O_MASK) == t);
-                m_pos = op - M2_MIN_OFFSET;
-                m_pos -= t | (((lzo_uint) * ip++) << M2O_BITS);
-                assert(m_pos >= out);
-                assert(m_pos < op);
-                TEST_LB(m_pos);
-                COPY_M2;
-                *op++ = *ip++;
-            }
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
-            break;
-#endif
-        }
-
-match:
-
-        if (t >= M2_MARKER)             /* a M2 match */
-        {
-            /* get match offset */
-            NEED_IP(1);
-            m_pos = op - M2_MIN_OFFSET;
-            m_pos -= (t & M2O_MASK) | (((lzo_uint) * ip++) << M2O_BITS);
-            assert(m_pos >= out);
-            assert(m_pos < op);
-            TEST_LB(m_pos);
-
-            /* get match len */
-            t = (t >> M2O_BITS) - 1;
-            NEED_OP(t + M2_MIN_LEN - 1);
-            COPY_M2X;
-            MEMCPY_DS(op, m_pos, t);
-        }
-        else                            /* a M3 or M4 match */
-        {
-            /* get match len */
-            t &= M3L_MASK;
-
-            if (t == 0)         /* a M4 match */
-            {
-                NEED_IP(1);
-
-                while (*ip == 0)
-                {
-                    t += 255;
-                    ip++;
-                    TEST_OV(t);
-                    NEED_IP(1);
-                }
-
-                t += (M4_MIN_LEN - M3_MIN_LEN) + *ip++;
-            }
-
-            /* get match offset */
-            NEED_IP(2);
-            m_pos = op - (M3_MIN_OFFSET - M3_EOF_OFFSET);
-            m_pos -= *ip++ & M3O_MASK;
-            m_pos -= (lzo_uint)(*ip++) << M3O_BITS;
-#if defined(LZO_EOF_CODE)
-
-            if (m_pos == op)
-                goto eof_found;
-
-#endif
-
-            /* copy match */
-            assert(m_pos >= out);
-            assert(m_pos < op);
-            TEST_LB(m_pos);
-            NEED_OP(t + M3_MIN_LEN - 1);
-#if (LZO_OPT_UNALIGNED32)
-
-            if (t >= 2 * 4 - (M3_MIN_LEN - 1) && (op - m_pos) >= 4)
-            {
-                UA_COPY4(op, m_pos);
-                op += 4;
-                m_pos += 4;
-                t -= 4 - (M3_MIN_LEN - 1);
-
-                do
-                {
-                    UA_COPY4(op, m_pos);
-                    op += 4;
-                    m_pos += 4;
-                    t -= 4;
-                }
-                while (t >= 4);
-
-                if (t > 0) do* op++ = *m_pos++;
-
-                    while (--t > 0);
-            }
-            else
-#endif
-            {
-                COPY_M3X;
-                MEMCPY_DS(op, m_pos, t);
-            }
-
-
-#if (M3O_BITS < 7)
-            t = ip[-2] >> M3O_BITS;
-
-            if (t)
-            {
-                NEED_IP(t);
-                NEED_OP(t);
-                goto literal1;
-            }
-
-#elif (M3O_BITS == 7)
-
-            /* optimized version */
-            if (ip[-2] & (1 << M3O_BITS))
-            {
-                NEED_IP(1);
-                NEED_OP(1);
-                *op++ = *ip++;
-                goto literal2;
-            }
-
-#endif
-        }
-    }
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
-    /* no EOF code was found */
-    *out_len = pd(op, out);
-    return LZO_E_EOF_NOT_FOUND;
-#endif
-
-eof_found:
-    assert(t == 1);
-#endif
-    *out_len = pd(op, out);
-    return (ip == ip_end ? LZO_E_OK :
-            (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-
-
-#if defined(HAVE_NEED_IP)
-input_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_INPUT_OVERRUN;
-#endif
-
-#if defined(HAVE_NEED_OP)
-output_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_OUTPUT_OVERRUN;
-#endif
-
-#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
-lookbehind_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_LOOKBEHIND_OVERRUN;
-#endif
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_d1.c

@@ -1,36 +0,0 @@
-/* lzo1b_d1.c -- LZO1B decompression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-#undef LZO_TEST_OVERRUN
-#define DO_DECOMPRESS       lzo1b_decompress
-
-#include "lzo1b_d.ch"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_d2.c

@@ -1,36 +0,0 @@
-/* lzo1b_d2.c -- LZO1B decompression with overrun testing
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-#define LZO_TEST_OVERRUN 1
-#define DO_DECOMPRESS       lzo1b_decompress_safe
-
-#include "lzo1b_d.ch"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_de.h

@@ -1,330 +0,0 @@
-/* lzo1b_de.h -- definitions for the the LZO1B/LZO1C algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_DEFS_H
-#define __LZO_DEFS_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/*
-     Format of the marker byte
-
-     76543210
-     --------
-     00000000   R0 - a long literal run ('R0' run)
-     000rrrrr   R  - a short literal run with len r
-     00100000   M4 - a very long match
-     001mmmmm   M3 - a long match  (len = m+M3_MIN_LEN)
-     mmmooooo   M2 - a short match (len = m+M2_MIN_LEN, o = offset low bits)
-
-                M1 is not used !
-*/
-
-
-#ifndef R_BITS
-#define R_BITS              (5)
-#endif
-
-
-#ifndef M1L_BITS
-#define M1L_BITS            (0)
-#endif
-#ifndef M2L_BITS
-#define M2L_BITS            (CHAR_BIT - M2O_BITS)
-#endif
-#ifndef M3L_BITS
-#define M3L_BITS            (R_BITS)
-#endif
-#ifndef M4L_BITS
-#define M4L_BITS            (CHAR_BIT)
-#endif
-
-#ifndef M1O_BITS
-#define M1O_BITS            (6)
-#endif
-#ifndef M2O_BITS
-#define M2O_BITS            (R_BITS)
-#endif
-#ifndef M3O_BITS
-#define M3O_BITS            (CHAR_BIT)
-#endif
-#ifndef M4O_BITS
-#define M4O_BITS            (M3O_BITS)              /* must be the same */
-#endif
-
-#ifndef M1X_BITS
-#define M1X_BITS            (M1O_BITS)
-#endif
-#ifndef M2X_BITS
-#define M2X_BITS            (M2O_BITS + CHAR_BIT)
-#endif
-#ifndef M3X_BITS
-#define M3X_BITS            (M3O_BITS + CHAR_BIT)
-#endif
-#ifndef M4X_BITS
-#define M4X_BITS            M3X_BITS
-#endif
-
-
-#define __MIN_OFFSET(bits)  1
-#define __MAX_OFFSET(bits)  LZO_SIZE(bits)
-
-#define M1_MIN_OFFSET       __MIN_OFFSET(M1X_BITS)
-#define M2_MIN_OFFSET       __MIN_OFFSET(M2X_BITS)
-#define M3_MIN_OFFSET       __MIN_OFFSET(M3X_BITS)
-#define M4_MIN_OFFSET       M3_MIN_OFFSET
-
-#if defined(LZO_EOF_CODE) && !defined(M3_EOF_OFFSET)
-#define M3_EOF_OFFSET       1
-#else
-#define M3_EOF_OFFSET       0
-#endif
-
-#ifndef _M1_MAX_OFFSET
-#define _M1_MAX_OFFSET      __MAX_OFFSET(M1X_BITS)
-#endif
-#ifndef _M2_MAX_OFFSET
-#define _M2_MAX_OFFSET      __MAX_OFFSET(M2X_BITS)
-#endif
-#ifndef _M3_MAX_OFFSET
-#define _M3_MAX_OFFSET      (__MAX_OFFSET(M3X_BITS) - M3_EOF_OFFSET)
-#endif
-#ifndef _M4_MAX_OFFSET
-#define _M4_MAX_OFFSET      _M3_MAX_OFFSET
-#endif
-#ifndef _MAX_OFFSET
-#define _MAX_OFFSET         _M4_MAX_OFFSET
-#endif
-
-#if (M3_EOF_OFFSET > 0) && (_M2_MAX_OFFSET == _M3_MAX_OFFSET + M3_EOF_OFFSET)
-#  undef _M2_MAX_OFFSET
-#  define _M2_MAX_OFFSET    _M3_MAX_OFFSET
-#endif
-#if (_M2_MAX_OFFSET > _M3_MAX_OFFSET)
-#  error
-#endif
-
-#define M1_MAX_OFFSET       ((lzo_uint) _M1_MAX_OFFSET)
-#define M2_MAX_OFFSET       ((lzo_uint) _M2_MAX_OFFSET)
-#define M3_MAX_OFFSET       ((lzo_uint) _M3_MAX_OFFSET)
-#define M4_MAX_OFFSET       ((lzo_uint) _M4_MAX_OFFSET)
-#define MAX_OFFSET          ((lzo_uint) _MAX_OFFSET)
-
-
-#ifndef M1_MIN_LEN
-#define M1_MIN_LEN          (2)
-#endif
-#ifndef M2_MIN_LEN
-#define M2_MIN_LEN          (3)
-#endif
-#ifndef M3_MIN_LEN
-#if (M3X_BITS == M2X_BITS)
-#define M3_MIN_LEN          (M2_MAX_LEN + 1)
-#else
-#define M3_MIN_LEN          (4)
-#endif
-#endif
-#ifndef M4_MIN_LEN
-#define M4_MIN_LEN          (M3_MAX_LEN + 1)
-#endif
-
-#ifndef M1_MAX_LEN
-#define M1_MAX_LEN          (M1_MIN_LEN + LZO_SIZE(M1L_BITS) - 1)
-#endif
-#ifndef M2_MAX_LEN
-#define M2_MAX_LEN          (M2_MIN_LEN + LZO_SIZE(M2L_BITS) - 3)
-#endif
-#ifndef M3_MAX_LEN
-#define M3_MAX_LEN          (M3_MIN_LEN + LZO_SIZE(M3L_BITS) - 2)
-#endif
-#ifndef M4_MAX_LEN
-#define M4_MAX_LEN          (ULONG_MAX)
-#endif
-
-
-#define M1O_MASK            LZO_MASK(M1O_BITS)
-#define M1L_MASK            LZO_MASK(M1L_BITS)
-#define M2O_MASK            LZO_MASK(M2O_BITS)
-#define M2L_MASK            LZO_MASK(M2L_BITS)
-#define M3O_MASK            LZO_MASK(M3O_BITS)
-#define M3L_MASK            LZO_MASK(M3L_BITS)
-#define M4O_MASK            LZO_MASK(M4O_BITS)
-#define M4L_MASK            LZO_MASK(M4L_BITS)
-
-
-#define M1_MARKER           (1 << M1O_BITS)
-#define M2_MARKER           (2 << M2O_BITS)
-#define M3_MARKER           (1 << M3L_BITS)
-#define M4_MARKER           M3_MARKER
-
-
-/***********************************************************************
-// R0 literal run (a long run)
-************************************************************************/
-
-#ifndef R0MIN
-#define R0MIN   (LZO_SIZE(R_BITS))  /* Minimum len of R0 run of literals */
-#endif
-#define R0MAX   (R0MIN + 256 - 1)   /* Maximum len of R0 run of literals */
-
-#if (R0MAX - (R0MAX & ~7u) >= 7)
-#define R0FAST  (R0MAX & ~7u)       /* R0MAX aligned to 8 byte boundary */
-#else
-#define R0FAST  (R0MAX & ~15u)      /* R0MAX aligned to 8 byte boundary */
-#endif
-
-#if (R0MAX - R0FAST < 7) || ((R0FAST & 7) != 0)
-#  error "something went wrong"
-#endif
-#if (R0FAST * 2 < 512)
-#  error "R0FAST is not big enough"
-#endif
-
-/* 7 special codes from R0FAST+1 .. R0MAX
- * these codes mean long R0 runs with lengths
- * 512, 1024, 2048, 4096, 8192, 16384, 32768
- */
-
-
-
-/***********************************************************************
-// matching
-************************************************************************/
-
-#define PS  *m_pos++ != *ip++
-
-
-/* We already matched M2_MIN_LEN bytes.
- * Try to match another M2_MAX_LEN - M2_MIN_LEN bytes. */
-
-#if (M2_MAX_LEN - M2_MIN_LEN == 4)
-#  define MATCH_M2X     (PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 5)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 6)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 7)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 13)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 14)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 16)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 29)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS)
-#else
-#  error "MATCH_M2X not yet implemented"
-#endif
-
-
-/* We already matched M2_MIN_LEN bytes.
- * Try to match another M2_MAX_LEN + 1 - M2_MIN_LEN bytes
- * to see if we get more than a M2 match */
-
-#define MATCH_M2        (MATCH_M2X || PS)
-
-
-/***********************************************************************
-// copying
-************************************************************************/
-
-#define _CP             *op++ = *m_pos++
-
-#if (M2_MIN_LEN == 2)
-#  define COPY_M2X      _CP
-#elif (M2_MIN_LEN == 3)
-#  define COPY_M2X      _CP; _CP
-#elif (M2_MIN_LEN == 4)
-#  define COPY_M2X      _CP; _CP; _CP
-#else
-#  error "COPY_M2X not yet implemented"
-#endif
-
-#if (M3_MIN_LEN == 3)
-#  define COPY_M3X      _CP; _CP
-#elif (M3_MIN_LEN == 4)
-#  define COPY_M3X      _CP; _CP; _CP
-#elif (M3_MIN_LEN == 9)
-#  define COPY_M3X      _CP; _CP; _CP; _CP; _CP; _CP; _CP; _CP
-#else
-#  error "COPY_M3X not yet implemented"
-#endif
-
-#define COPY_M2         COPY_M2X; *op++ = *m_pos++
-#define COPY_M3         COPY_M3X; *op++ = *m_pos++
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if defined(LZO_NEED_DICT_H)
-
-#define DL_MIN_LEN          M2_MIN_LEN
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX3(p,5,5,6)) >> 5)
-#define D_INDEX2(d,p)       d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-#include "lzo_dict.h"
-
-#ifndef MIN_LOOKAHEAD
-#define MIN_LOOKAHEAD       (M2_MAX_LEN + 1)
-#endif
-#ifndef MAX_LOOKBEHIND
-#define MAX_LOOKBEHIND      (MAX_OFFSET)
-#endif
-
-#endif /* defined(LZO_NEED_DICT_H) */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_r.ch

@@ -1,113 +0,0 @@
-/* lzo1b_r.ch -- literal run handling for the the LZO1B/LZO1C algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-// store a literal run (internal)
-************************************************************************/
-
-LZO_LOCAL_IMPL(lzo_bytep)
-STORE_RUN(lzo_bytep const oo, const lzo_bytep const ii, lzo_uint r_len)
-{
-    lzo_bytep op;
-    const lzo_bytep ip;
-    lzo_uint t;
-
-    LZO_STATS(lzo_stats->literals += r_len);
-
-    op = oo;
-    ip = ii;
-    assert(r_len > 0);
-
-    /* code a long R0 run */
-    if (r_len >= 512)
-    {
-        unsigned r_bits = 6;        /* 256 << 6 == 16384 */
-        lzo_uint tt = 32768u;
-
-        while (r_len >= (t = tt))
-        {
-            r_len -= t;
-            *op++ = 0;
-            *op++ = (R0FAST - R0MIN) + 7;
-            MEMCPY8_DS(op, ip, t);
-            LZO_STATS(lzo_stats->r0long_runs++);
-        }
-
-        tt >>= 1;
-
-        do
-        {
-            if (r_len >= (t = tt))
-            {
-                r_len -= t;
-                *op++ = 0;
-                *op++ = LZO_BYTE((R0FAST - R0MIN) + r_bits);
-                MEMCPY8_DS(op, ip, t);
-                LZO_STATS(lzo_stats->r0long_runs++);
-            }
-
-            tt >>= 1;
-        }
-        while (--r_bits > 0);
-    }
-
-    assert(r_len < 512);
-
-    while (r_len >= (t = R0FAST))
-    {
-        r_len -= t;
-        *op++ = 0;
-        *op++ = (R0FAST - R0MIN);
-        MEMCPY8_DS(op, ip, t);
-        LZO_STATS(lzo_stats->r0fast_runs++);
-    }
-
-    t = r_len;
-
-    if (t >= R0MIN)
-    {
-        /* code a short R0 run */
-        *op++ = 0;
-        *op++ = LZO_BYTE(t - R0MIN);
-        MEMCPY_DS(op, ip, t);
-        LZO_STATS(lzo_stats->r0short_runs++);
-    }
-    else if (t > 0)
-    {
-        /* code a short literal run */
-        LZO_STATS(lzo_stats->lit_runs++);
-        LZO_STATS(lzo_stats->lit_run[t]++);
-        *op++ = LZO_BYTE(t);
-        MEMCPY_DS(op, ip, t);
-    }
-
-    return op;
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_rr.c

@@ -1,33 +0,0 @@
-/* lzo1b_rr.c -- literal run handling
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-#include "lzo1b_r.ch"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_sm.ch

@@ -1,221 +0,0 @@
-/* lzo1b_sm.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// search for a match
-************************************************************************/
-
-#if (DD_BITS == 0)
-
-/* search ip in the dictionary */
-DINDEX1(dindex, ip);
-GINDEX(m_pos, m_off, dict, dindex, in);
-
-if (LZO_CHECK_MPOS_NON_DET(m_pos, m_off, in, ip, M3_MAX_OFFSET))
-    goto literal;
-
-#if 1
-
-if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
-    goto try_match;
-
-DINDEX2(dindex, ip);
-#endif
-GINDEX(m_pos, m_off, dict, dindex, in);
-
-if (LZO_CHECK_MPOS_NON_DET(m_pos, m_off, in, ip, M3_MAX_OFFSET))
-    goto literal;
-
-if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
-    goto try_match;
-
-goto literal;
-
-
-#else /* (DD_BITS == 0) */
-
-
-
-/* search ip in the deepened dictionary */
-{
-    lzo_dict_p d = &dict [ DINDEX(dv, ip) ];
-    const lzo_bytep ip_sav;
-    unsigned j = DD_SIZE;
-    lzo_uint x_len;
-    LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, x_off, 0);
-
-    DVAL_ASSERT(dv, ip);
-
-    ip_sav = ip;
-    m_len = 0;
-
-    do
-    {
-#if !defined(NDEBUG)
-        const lzo_bytep z_pos = NULL;
-#endif
-#if (LZO_DICT_USE_PTR)
-        m_pos = *d;
-        assert((z_pos = m_pos) == *d);
-#if (LZO_DETERMINISTIC)
-        assert(m_pos == NULL || m_pos >= in);
-        assert(m_pos == NULL || m_pos < ip);
-#endif
-#else
-        x_off = *d;
-#endif
-        assert(ip == ip_sav);
-
-        if (LZO_CHECK_MPOS(m_pos, x_off, in, ip, MAX_OFFSET))
-#if (CLEVEL == 9)
-            *d = DENTRY(ip, in);
-
-#else
-            ((void)(0));
-#endif
-        else if (m_pos[m_len] != ip[m_len])
-            ((void)(0));
-        else if (*m_pos++ == *ip++ && *m_pos++ == *ip++ && *m_pos++ == *ip++)
-        {
-#if !(LZO_DICT_USE_PTR)
-            assert((z_pos = ip - 3 - x_off) == (m_pos - 3));
-#endif
-
-            /* a match */
-            if (MATCH_M2)
-            {
-                x_len = pd((ip - 1), ip_sav);
-
-                if (x_len > m_len)
-                {
-                    m_len = x_len;
-                    m_off = x_off;
-                    assert((m_pos_sav = z_pos) != NULL);
-                }
-
-#if (CLEVEL == 9)
-                /* try to find a closer match */
-                else if (x_len == m_len && x_off < m_off)
-                {
-                    m_off = x_off;
-                    assert((m_pos_sav = z_pos) != NULL);
-                }
-
-#endif
-            }
-            else
-            {
-                assert((ip - ip_sav) == M2_MAX_LEN + 1);
-#if (CLEVEL == 9)
-#if defined(MATCH_IP_END)
-                {
-                    const lzo_bytep end;
-                    end = MATCH_IP_END;
-
-                    while (ip < end  &&  *m_pos == *ip)
-                        m_pos++, ip++;
-
-                    assert(ip <= in_end);
-                    x_len = pd(ip, ip_sav);
-                }
-
-                if (x_len > m_len)
-                {
-                    m_len = x_len;
-                    m_off = x_off;
-                    assert((m_pos_sav = z_pos) != NULL);
-
-                    if (ip >= MATCH_IP_END)
-                    {
-                        ip = ip_sav;
-#if 0
-                        /* not needed - we are at the end */
-                        d -= DD_SIZE - j;
-                        assert(d == &dict [ DINDEX(dv, ip) ]);
-                        UPDATE_P(d, drun, ip, in);
-#endif
-                        goto match;
-                    }
-                }
-                else if (x_len == m_len && x_off < m_off)
-                {
-                    m_off = x_off;
-                    assert((m_pos_sav = z_pos) != NULL);
-                }
-
-#else
-
-                /* try to find a closer match */
-                if (m_len < M2_MAX_LEN + 1 || x_off < m_off)
-                {
-                    m_len = M2_MAX_LEN + 1;
-                    m_off = x_off;
-                    assert((m_pos_sav = z_pos) != NULL);
-                }
-
-#endif
-#else
-                /* don't search for a longer/closer match */
-                m_len = M2_MAX_LEN + 1;
-                m_off = x_off;
-                assert((m_pos_sav = z_pos) != NULL);
-                ip = ip_sav;
-                d -= DD_SIZE - j;
-                assert(d == &dict [ DINDEX(dv, ip) ]);
-                UPDATE_P(d, drun, ip, in);
-                goto match;
-#endif
-            }
-
-            ip = ip_sav;
-        }
-        else
-            ip = ip_sav;
-
-        d++;
-    }
-    while (--j > 0);
-
-    assert(ip == ip_sav);
-
-    d -= DD_SIZE;
-    assert(d == &dict [ DINDEX(dv, ip) ]);
-    UPDATE_P(d, drun, ip, in);
-}
-
-#endif /* (DD_BITS == 0) */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_tm.ch

@@ -1,91 +0,0 @@
-/* lzo1b_tm.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// test for a potential match
-************************************************************************/
-
-
-#if (DD_BITS == 0)
-
-try_match:
-#if !defined(NDEBUG) && (LZO_DICT_USE_PTR)
-#if (LZO_DETERMINISTIC)
-assert(m_pos == NULL || m_pos >= in);
-assert(m_pos == NULL || m_pos < ip);
-#endif
-m_pos_sav = m_pos;
-#endif
-
-if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-{
-    m_pos += 3;
-    goto match;
-}
-
-
-#else /* (DD_BITS == 0) */
-
-
-/* test potential match */
-
-if (m_len > M2_MIN_LEN)
-    goto match;
-
-if (m_len == M2_MIN_LEN)
-{
-#if (_MAX_OFFSET == _M2_MAX_OFFSET)
-    goto match;
-#else
-
-    if (m_off <= M2_MAX_OFFSET)
-        goto match;
-
-#if 0 && (M3_MIN_LEN == M2_MIN_LEN)
-
-    if (ip == ii)
-        goto match;
-
-#endif
-#endif
-}
-
-goto literal;
-
-
-#endif /* (DD_BITS == 0) */
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1b_xx.c

@@ -1,85 +0,0 @@
-/* lzo1b_xx.c -- LZO1B compression public entry point
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static const lzo_compress_t* const c_funcs [9] =
-{
-    &_lzo1b_1_compress_func,
-    &_lzo1b_2_compress_func,
-    &_lzo1b_3_compress_func,
-    &_lzo1b_4_compress_func,
-    &_lzo1b_5_compress_func,
-    &_lzo1b_6_compress_func,
-    &_lzo1b_7_compress_func,
-    &_lzo1b_8_compress_func,
-    &_lzo1b_9_compress_func
-};
-
-
-static lzo_compress_t lzo1b_get_compress_func(int clevel)
-{
-    const lzo_compress_t* f;
-
-    if (clevel < LZO1B_BEST_SPEED || clevel > LZO1B_BEST_COMPRESSION)
-    {
-        if (clevel == LZO1B_DEFAULT_COMPRESSION)
-            clevel = LZO1B_BEST_SPEED;
-        else
-            return (lzo_compress_t) 0;
-    }
-
-    f = c_funcs[clevel - 1];
-    assert(f && *f);
-    return *f;
-}
-
-
-LZO_PUBLIC(int)
-lzo1b_compress(const lzo_bytep src, lzo_uint  src_len,
-               lzo_bytep dst, lzo_uintp dst_len,
-               lzo_voidp wrkmem,
-               int clevel)
-{
-    lzo_compress_t f;
-
-    f = lzo1b_get_compress_func(clevel);
-
-    if (!f)
-        return LZO_E_ERROR;
-
-    return _lzo1b_do_compress(src, src_len, dst, dst_len, wrkmem, f);
-}
-
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1c_1.c

@@ -1,35 +0,0 @@
-/* lzo1c_1.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     1
-
-#define DDBITS          0
-#define CLEVEL          1
-#include "compr1c.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1c_2.c

@@ -1,35 +0,0 @@
-/* lzo1c_2.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     2
-
-#define DDBITS          0
-#define CLEVEL          2
-#include "compr1c.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1c_3.c

@@ -1,35 +0,0 @@
-/* lzo1c_3.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     3
-
-#define DDBITS          0
-#define CLEVEL          3
-#include "compr1c.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1c_4.c

@@ -1,35 +0,0 @@
-/* lzo1c_4.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     4
-
-#define DDBITS          1
-#define CLEVEL          2
-#include "compr1c.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1c_5.c

@@ -1,35 +0,0 @@
-/* lzo1c_5.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     5
-
-#define DDBITS          1
-#define CLEVEL          3
-#include "compr1c.h"
-
-/* vim:set ts=4 sw=4 et: */

extern/lzo/src/lzo1c_6.c

@@ -1,35 +0,0 @@
-/* lzo1c_6.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     6
-
-#define DDBITS          1
-#define CLEVEL          5
-#include "compr1c.h"
-
-/* vim:set ts=4 sw=4 et: */