diff --git a/.gitignore b/.gitignore
index 796b96d1..189b414f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/build
+/CMakeLists.txt.user
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2005d74d..8a40a859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,85 @@
+# v2.4.3
+ - [#184](https://github.com/xmrig/xmrig/issues/184) Fixed cache size detection for CPUs with disabled Hyper-Threading.
+
+# v2.4.2
+ - [#60](https://github.com/xmrig/xmrig/issues/60) Added FreeBSD support, thanks [vcambur](https://github.com/vcambur).
+ - [#153](https://github.com/xmrig/xmrig/issues/153) Fixed issues with dwarfpool.com.
+
+# v2.4.1
+ - [#147](https://github.com/xmrig/xmrig/issues/147) Fixed comparability with monero-stratum.
+
+# v2.4.0
+ - Added [HTTP API](https://github.com/xmrig/xmrig/wiki/API).
+ - Added comments support in config file.
+ - libjansson replaced to rapidjson.
+ - [#98](https://github.com/xmrig/xmrig/issues/98) Ignore `keepalive` option with minergate.com and nicehash.com.
+ - [#101](https://github.com/xmrig/xmrig/issues/101) Fixed MSVC 2017 (15.3) compile time version detection.
+ - [#108](https://github.com/xmrig/xmrig/issues/108) Silently ignore invalid values for `donate-level` option.
+ - [#111](https://github.com/xmrig/xmrig/issues/111) Fixed build without AEON support.
+
+# v2.3.1
+- [#68](https://github.com/xmrig/xmrig/issues/68) Fixed compatibility with Docker containers, was nothing print on console.
+
+# v2.3.0
+- Added `--cpu-priority` option (0 idle, 2 normal to 5 highest).
+- Added `--user-agent` option, to set custom user-agent string for pool. For example `cpuminer-multi/0.1`.
+- Added `--no-huge-pages` option, to disable huge pages support.
+- [#62](https://github.com/xmrig/xmrig/issues/62) Don't send the login to the dev pool.
+- Force reconnect if pool block miner IP address. helps switch to backup pool.
+- Fixed: failed open default config file if path contains non English characters.
+- Fixed: error occurred if try use unavailable stdin or stdout, regression since version 2.2.0.
+- Fixed: message about huge pages support successfully enabled on Windows was not shown in release builds.
+
+# v2.2.1
+- Fixed [terminal issues](https://github.com/xmrig/xmrig-proxy/issues/2#issuecomment-319914085) after exit on Linux and OS X.
+
+# v2.2.0
+- [#46](https://github.com/xmrig/xmrig/issues/46) Restored config file support. Now possible use multiple config files and combine with command line options also added support for default config.
+- Improved colors support on Windows, now used uv_tty, legacy code removed.
+- QuickEdit Mode now disabled on Windows.
+- Added interactive commands in console window:: **h**ashrate, **p**ause, **r**esume.
+- Fixed autoconf mode for AMD FX CPUs.
+
+# v2.1.0
+- [#40](https://github.com/xmrig/xmrig/issues/40)
+Improved miner shutdown, fixed crash on exit for Linux and OS X.
+- Fixed, login request was contain malformed JSON if username or password has some special characters for example `\`.
+- [#220](https://github.com/fireice-uk/xmr-stak-cpu/pull/220) Better support for Round Robin DNS, IP address now always chosen randomly instead of stuck on first one.
+- Changed donation address, new [xmrig-proxy](https://github.com/xmrig/xmrig-proxy) is coming soon.
+
+# v2.0.2
+- Better deal with possible duplicate jobs from pool, show warning and ignore duplicates.
+- For Windows builds libuv updated to version 1.13.1 and gcc to 7.1.0.
+
+# v2.0.1
+ - [#27](https://github.com/xmrig/xmrig/issues/27) Fixed possibility crash on 32bit systems.
+
+# v2.0.0
+ - Option `--backup-url` removed, instead now possibility specify multiple pools for example: `-o example1.com:3333 -u user1 -p password1 -k -o example2.com:5555 -u user2 -o example3.com:4444 -u user3`
+ - [#15](https://github.com/xmrig/xmrig/issues/15) Added option `-l, --log-file=FILE` to write log to file.
+ - [#15](https://github.com/xmrig/xmrig/issues/15) Added option `-S, --syslog` to use syslog for logging, Linux only.
+ - [#18](https://github.com/xmrig/xmrig/issues/18) Added nice messages for accepted/rejected shares with diff and network latency.
+ - [#20](https://github.com/xmrig/xmrig/issues/20) Fixed `--cpu-affinity` for more than 32 threads.
+ - Fixed Windows XP support.
+ - Fixed regression, option `--no-color` was not fully disable colored output.
+ - Show resolved pool IP address in miner output.
+
+# v1.0.1
+- Fix broken software AES implementation, app has crashed if CPU not support AES-NI, only version 1.0.0 affected.
+
+# v1.0.0
+- Miner complete rewritten in C++ with libuv.
+- This version should be fully compatible (except config file) with previos versions, many new nice features will come in next versions.
+- This is still beta. If you found regression, stability or perfomance issues or have an idea for new feature please fell free to open new [issue](https://github.com/xmrig/xmrig/issues/new).
+- Added new option `--print-time=N`, print hashrate report every N seconds.
+- New hashrate reports, by default every 60 secons.
+- Added Microsoft Visual C++ 2015 and 2017 support.
+- Removed dependency on libcurl.
+- To compile this version from source please switch to [dev](https://github.com/xmrig/xmrig/tree/dev) branch.
+
+# v0.8.2
+- Fixed L2 cache size detection for AMD CPUs (Bulldozer/Piledriver/Steamroller/Excavator architecture).
+
# v0.8.2
- Fixed L2 cache size detection for AMD CPUs (Bulldozer/Piledriver/Steamroller/Excavator architecture).
- Fixed gcc 7.1 support.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d30acd3..c86fe953 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,146 +1,239 @@
cmake_minimum_required(VERSION 3.0)
-project(xmrig C)
+project(xmrig)
option(WITH_LIBCPUID "Use Libcpuid" ON)
option(WITH_AEON "CryptoNight-Lite support" ON)
+option(WITH_HTTPD "HTTP REST API" ON)
+
+include (CheckIncludeFile)
+
set(HEADERS
- compat.h
- algo/cryptonight/cryptonight.h
- algo/cryptonight/cryptonight_aesni.h
- algo/cryptonight/cryptonight_softaes.h
- elist.h
- xmrig.h
- version.h
- options.h
- cpu.h
- persistent_memory.h
- stratum.h
- stats.h
- util.h
- donate.h
+ src/3rdparty/align.h
+ src/api/Api.h
+ src/api/ApiState.h
+ src/api/NetworkState.h
+ src/App.h
+ src/Console.h
+ src/Cpu.h
+ src/interfaces/IClientListener.h
+ src/interfaces/IConsoleListener.h
+ src/interfaces/IJobResultListener.h
+ src/interfaces/ILogBackend.h
+ src/interfaces/IStrategy.h
+ src/interfaces/IStrategyListener.h
+ src/interfaces/IWorker.h
+ src/log/ConsoleLog.h
+ src/log/FileLog.h
+ src/log/Log.h
+ src/Mem.h
+ src/net/Client.h
+ src/net/Job.h
+ src/net/JobId.h
+ src/net/JobResult.h
+ src/net/Network.h
+ src/net/strategies/DonateStrategy.h
+ src/net/strategies/FailoverStrategy.h
+ src/net/strategies/SinglePoolStrategy.h
+ src/net/SubmitResult.h
+ src/net/Url.h
+ src/Options.h
+ src/Platform.h
+ src/Summary.h
+ src/version.h
+ src/workers/DoubleWorker.h
+ src/workers/Handle.h
+ src/workers/Hashrate.h
+ src/workers/SingleWorker.h
+ src/workers/Worker.h
+ src/workers/Workers.h
)
set(HEADERS_CRYPTO
- crypto/c_groestl.h
- crypto/c_blake256.h
- crypto/c_jh.h
- crypto/c_skein.h
- )
-
-set(HEADERS_COMPAT
- compat/winansi.h
- )
-
-set(HEADERS_UTILS
- utils/applog.h
- utils/threads.h
- utils/summary.h
+ src/crypto/c_blake256.h
+ src/crypto/c_groestl.h
+ src/crypto/c_jh.h
+ src/crypto/c_keccak.h
+ src/crypto/c_skein.h
+ src/crypto/CryptoNight.h
+ src/crypto/CryptoNight_p.h
+ src/crypto/CryptoNight_test.h
+ src/crypto/groestl_tables.h
+ src/crypto/hash.h
+ src/crypto/skein_port.h
+ src/crypto/soft_aes.h
)
set(SOURCES
- xmrig.c
- algo/cryptonight/cryptonight.c
- algo/cryptonight/cryptonight_av1_aesni.c
- algo/cryptonight/cryptonight_av2_aesni_double.c
- algo/cryptonight/cryptonight_av3_softaes.c
- algo/cryptonight/cryptonight_av4_softaes_double.c
- util.c
- options.c
- stratum.c
- stats.c
- memory.c
+ src/api/Api.cpp
+ src/api/ApiState.cpp
+ src/api/NetworkState.cpp
+ src/App.cpp
+ src/Console.cpp
+ src/log/ConsoleLog.cpp
+ src/log/FileLog.cpp
+ src/log/Log.cpp
+ src/Mem.cpp
+ src/net/Client.cpp
+ src/net/Job.cpp
+ src/net/Network.cpp
+ src/net/strategies/DonateStrategy.cpp
+ src/net/strategies/FailoverStrategy.cpp
+ src/net/strategies/SinglePoolStrategy.cpp
+ src/net/SubmitResult.cpp
+ src/net/Url.cpp
+ src/Options.cpp
+ src/Platform.cpp
+ src/Summary.cpp
+ src/workers/DoubleWorker.cpp
+ src/workers/Handle.cpp
+ src/workers/Hashrate.cpp
+ src/workers/SingleWorker.cpp
+ src/workers/Worker.cpp
+ src/workers/Workers.cpp
+ src/xmrig.cpp
)
set(SOURCES_CRYPTO
- crypto/c_keccak.c
- crypto/c_groestl.c
- crypto/c_blake256.c
- crypto/c_jh.c
- crypto/c_skein.c
- crypto/soft_aes.c
- )
-
-set(SOURCES_UTILS
- utils/applog.c
- utils/summary.c
+ src/crypto/c_keccak.c
+ src/crypto/c_groestl.c
+ src/crypto/c_blake256.c
+ src/crypto/c_jh.c
+ src/crypto/c_skein.c
+ src/crypto/CryptoNight.cpp
)
if (WIN32)
- set(SOURCES_OS win/cpu_win.c win/memory_win.c win/xmrig_win.c win/app.rc compat/winansi.c)
- set(EXTRA_LIBS ws2_32)
- add_definitions(/D_WIN32_WINNT=0x600)
+ set(SOURCES_OS
+ res/app.rc
+ src/App_win.cpp
+ src/Cpu_win.cpp
+ src/Mem_win.cpp
+ src/Platform_win.cpp
+ )
+
+ add_definitions(/DWIN32)
+ set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv)
elseif (APPLE)
- set(SOURCES_OS mac/cpu_mac.c mac/memory_mac.c mac/xmrig_mac.c)
+ set(SOURCES_OS
+ src/App_unix.cpp
+ src/Cpu_mac.cpp
+ src/Mem_unix.cpp
+ src/Platform_mac.cpp
+ )
else()
- set(SOURCES_OS unix/cpu_unix.c unix/memory_unix.c unix/xmrig_unix.c)
- set(EXTRA_LIBS pthread)
+ set(SOURCES_OS
+ src/App_unix.cpp
+ src/Cpu_unix.cpp
+ src/Mem_unix.cpp
+ src/Platform_unix.cpp
+ )
+
+ set(EXTRA_LIBS pthread rt)
endif()
-include_directories(.)
-add_definitions(/DUSE_NATIVE_THREADS)
-add_definitions(/D_GNU_SOURCE)
+if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+ set(EXTRA_LIBS ${EXTRA_LIBS} kvm)
+endif()
+
+add_definitions(/D__STDC_FORMAT_MACROS)
add_definitions(/DUNICODE)
+add_definitions(/DRAPIDJSON_SSE2)
+#add_definitions(/DAPP_DEBUG)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+
+find_package(UV REQUIRED)
if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
set(CMAKE_BUILD_TYPE Release)
endif()
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wno-pointer-to-int-cast")
-if (CMAKE_C_COMPILER_ID MATCHES "Clang")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fvariable-expansion-in-unroller -fmerge-all-constants")
-else()
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 11)
+
+
+# https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_ID.html
+if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall -Wno-strict-aliasing")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2")
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions -fno-rtti")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2")
+
+ if (WIN32)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+ else()
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+ endif()
+
+ add_definitions(/D_GNU_SOURCE)
+
+ if (${CMAKE_VERSION} VERSION_LESS "3.1.0")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+
+ #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -gdwarf-2")
+
+elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Ox /Ot /Oi /MT /GL")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox /Ot /Oi /MT /GL")
+ add_definitions(/D_CRT_SECURE_NO_WARNINGS)
+ add_definitions(/D_CRT_NONSTDC_NO_WARNINGS)
+ add_definitions(/DNOMINMAX)
+
+elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions -fno-rtti -Wno-missing-braces")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
+
endif()
-#set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -gdwarf-2")
-#set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fprofile-generate")
-#set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fprofile-use -fprofile-correction")
-
-if (WIN32)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-endif()
-
-include_directories(compat/jansson)
-add_subdirectory(compat/jansson)
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
-
-find_package(CURL REQUIRED)
-include_directories(${CURL_INCLUDE_DIRS})
-add_definitions(/DCURL_STATICLIB)
-link_directories(${CURL_LIBRARIES})
-
if (WITH_LIBCPUID)
- add_subdirectory(compat/libcpuid)
+ add_subdirectory(src/3rdparty/libcpuid)
- include_directories(compat/libcpuid)
+ include_directories(src/3rdparty/libcpuid)
set(CPUID_LIB cpuid)
- set(SOURCES_CPUID cpu.c)
+ set(SOURCES_CPUID src/Cpu.cpp)
else()
add_definitions(/DXMRIG_NO_LIBCPUID)
- set(SOURCES_CPUID cpu_stub.c)
+ set(SOURCES_CPUID src/Cpu_stub.cpp)
endif()
-if (WITH_AEON)
- set(SOURCES_AEON
- algo/cryptonight-lite/cryptonight_lite_av1_aesni.c
- algo/cryptonight-lite/cryptonight_lite_av2_aesni_double.c
- algo/cryptonight-lite/cryptonight_lite_av3_softaes.c
- algo/cryptonight-lite/cryptonight_lite_av4_softaes_double.c
- algo/cryptonight-lite/cryptonight_lite_aesni.h
- algo/cryptonight-lite/cryptonight_lite_softaes.h
- )
-else()
+CHECK_INCLUDE_FILE (syslog.h HAVE_SYSLOG_H)
+if (HAVE_SYSLOG_H)
+ add_definitions(/DHAVE_SYSLOG_H)
+ set(SOURCES_SYSLOG src/log/SysLog.h src/log/SysLog.cpp)
+endif()
+
+if (NOT WITH_AEON)
add_definitions(/DXMRIG_NO_AEON)
endif()
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
- add_executable(xmrig ${HEADERS} ${HEADERS_CRYPTO} ${SOURCES} ${SOURCES_CRYPTO} ${HEADERS_UTILS} ${SOURCES_UTILS} ${HEADERS_COMPAT} ${SOURCES_COMPAT} ${SOURCES_OS} ${SOURCES_CPUID} ${SOURCES_AEON})
- target_link_libraries(xmrig jansson curl ${CPUID_LIB} ${EXTRA_LIBS})
+if (WITH_HTTPD)
+ find_package(MHD)
+
+ if (MHD_FOUND)
+ include_directories(${MHD_INCLUDE_DIRS})
+ set(HTTPD_SOURCES src/api/Httpd.h src/api/Httpd.cpp)
+ else()
+ message(FATAL_ERROR "microhttpd NOT found: use `-DWITH_HTTPD=OFF` to build without http deamon support")
+ endif()
else()
- add_executable(xmrig32 ${HEADERS} ${HEADERS_CRYPTO} ${SOURCES} ${SOURCES_CRYPTO} ${HEADERS_UTILS} ${SOURCES_UTILS} ${HEADERS_COMPAT} ${SOURCES_COMPAT} ${SOURCES_OS} ${SOURCES_CPUID} ${SOURCES_AEON})
- target_link_libraries(xmrig32 jansson curl ${CPUID_LIB} ${EXTRA_LIBS})
+ add_definitions(/DXMRIG_NO_HTTPD)
+ add_definitions(/DXMRIG_NO_API)
endif()
+include_directories(src)
+include_directories(src/3rdparty)
+include_directories(${UV_INCLUDE_DIR})
+
+add_executable(xmrig ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${HTTPD_SOURCES})
+target_link_libraries(xmrig ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB})
diff --git a/README.md b/README.md
index fb3f44e2..50ab830b 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,28 @@
# XMRig
XMRig is high performance Monero (XMR) CPU miner, with the official full Windows support.
-Based on cpuminer-multi with heavy optimizations/rewrites and removing a lot of legacy code.
+Originally based on cpuminer-multi with heavy optimizations/rewrites and removing a lot of legacy code, since version 1.0.0 complete rewritten from scratch on C++.
-
+* This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd).
+* [Roadmap](https://github.com/xmrig/xmrig/issues/106) for next releases.
+
+
#### Table of contents
* [Features](#features)
* [Download](#download)
* [Usage](#usage)
* [Algorithm variations](#algorithm-variations)
-* [Build](#build)
+* [Build](https://github.com/xmrig/xmrig/wiki/Build)
* [Common Issues](#common-issues)
* [Other information](#other-information)
* [Donations](#donations)
* [Contacts](#contacts)
## Features
-* High performance (290+ H/s on i7 6700).
+* High performance.
* Official Windows support.
-* Small Windows executable, only 535 KB without dependencies.
+* Small Windows executable, without dependencies.
+* x86/x64 support.
* Support for backup (failover) mining server.
* keepalived support.
* Command line options compatible with cpuminer.
@@ -30,19 +34,24 @@ Based on cpuminer-multi with heavy optimizations/rewrites and removing a lot of
## Download
* Binary releases: https://github.com/xmrig/xmrig/releases
* Git tree: https://github.com/xmrig/xmrig.git
- * Clone with `git clone https://github.com/xmrig/xmrig.git`
+ * Clone with `git clone https://github.com/xmrig/xmrig.git` :hammer: [Build instructions](https://github.com/xmrig/xmrig/wiki/Build).
## Usage
### Basic example
```
-xmrig.exe -o xmr-eu.dwarfpool.com:8005 -u YOUR_WALLET -p x -k
+xmrig.exe -o pool.monero.hashvault.pro:5555 -u YOUR_WALLET -p x -k
```
+### Failover
+```
+xmrig.exe -o pool.monero.hashvault.pro:5555 -u YOUR_WALLET1 -p x -k -o pool.supportxmr.com:5555 -u YOUR_WALLET2 -p x -k
+```
+For failover you can add multiple pools, maximum count not limited.
+
### Options
```
-a, --algo=ALGO cryptonight (default) or cryptonight-lite
-o, --url=URL URL of mining server
- -b, --backup-url=URL URL of backup mining server
-O, --userpass=U:P username:password pair for mining server
-u, --user=USERNAME username for mining server
-p, --pass=PASSWORD password for mining server
@@ -51,18 +60,25 @@ xmrig.exe -o xmr-eu.dwarfpool.com:8005 -u YOUR_WALLET -p x -k
-k, --keepalive send keepalived for prevent timeout (need pool support)
-r, --retries=N number of times to retry before switch to backup server (default: 5)
-R, --retry-pause=N time to pause between retries (default: 5)
- --cpu-affinity set process affinity to cpu core(s), mask 0x3 for cores 0 and 1
+ --cpu-affinity set process affinity to CPU core(s), mask 0x3 for cores 0 and 1
+ --cpu-priority set process priority (0 idle, 2 normal to 5 highest)
+ --no-huge-pages disable huge pages support
--no-color disable colored output
--donate-level=N donate level, default 5% (5 minutes in 100 minutes)
+ --user-agent set custom user-agent string for pool
-B, --background run the miner in the background
-c, --config=FILE load a JSON-format configuration file
- --max-cpu-usage=N maximum cpu usage for automatic threads mode (default 75)
- --safe safe adjust threads and av settings for current cpu
+ -l, --log-file=FILE log all output to a file
+ --max-cpu-usage=N maximum CPU usage for automatic threads mode (default 75)
+ --safe safe adjust threads and av settings for current CPU
--nicehash enable nicehash support
+ --print-time=N print hashrate report every N seconds
-h, --help display this help and exit
-V, --version output version information and exit
```
+Also you can use configuration via config file, default **config.json**. You can load multiple config files and combine it with command line options.
+
## Algorithm variations
Since version 0.8.0.
* `--av=1` For CPUs with hardware AES.
@@ -70,42 +86,6 @@ Since version 0.8.0.
* `--av=3` Software AES implementation.
* `--av=4` Lower power mode (double hash) of `3`.
-## Build
-### Ubuntu (Debian-based distros)
-```
-sudo apt-get install git build-essential cmake libcurl4-openssl-dev
-git clone https://github.com/xmrig/xmrig.git
-cd xmrig
-mkdir build
-cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release
-make
-```
-
-### Windows
-It's complicated, you need [MSYS2](http://www.msys2.org/), custom libcurl build, and of course CMake too.
-
-Necessary MSYS2 packages:
-```
-pacman -Sy
-pacman -S mingw-w64-x86_64-gcc
-pacman -S make
-pacman -S mingw-w64-x86_64-cmake
-pacman -S mingw-w64-x86_64-pkg-config
-```
-Configure options for libcurl:
-```
-./configure --disable-shared --enable-optimize --enable-threaded-resolver --disable-libcurl-option --disable-ares --disable-rt --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --disable-unix-sockets --without-zlib --without-winssl --without-ssl --without-libssh2 --without-nghttp2 --disable-cookies --without-ca-bundle --without-librtmp
-```
-CMake options:
-```
-cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCURL_INCLUDE_DIR="c:\\curl-7.53.1\include" -DCURL_LIBRARY="c:\\curl-7.53.1\lib\.libs"
-```
-
-### Optional features
-`-DWITH_LIBCPUID=OFF` Disable libcpuid. Auto configuration of CPU after this will be very limited.
-`-DWITH_AEON=OFF` Disable CryptoNight-Lite support.
-
## Common Issues
### HUGE PAGES unavailable
* Run XMRig as Administrator.
@@ -118,8 +98,8 @@ cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCURL_INCLUDE_DIR="c:\<
### CPU mining performance
-* **i7-6700** - 290+ H/s (4 threads, cpu affinity 0xAA)
-* **Dual E5620** - 377 H/s (12 threads, cpu affinity 0xEEEE)
+* **Intel i7-7700** - 307 H/s (4 threads)
+* **AMD Ryzen 7 1700X** - 560 H/s (8 threads)
Please note performance is highly dependent on system load. The numbers above are obtained on an idle system. Tasks heavily using a processor cache, such as video playback, can greatly degrade hashrate. Optimal number of threads depends on the size of the L3 cache of a processor, 1 thread requires 2 MB of cache.
diff --git a/algo/cryptonight-lite/cryptonight_lite_aesni.h b/algo/cryptonight-lite/cryptonight_lite_aesni.h
deleted file mode 100644
index bb528cfb..00000000
--- a/algo/cryptonight-lite/cryptonight_lite_aesni.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#ifndef __CRYPTONIGHT_LITE_AESNI_H__
-#define __CRYPTONIGHT_LITE_AESNI_H__
-
-#include
-
-
-#define aes_genkey_sub(imm8) \
- __m128i xout1 = _mm_aeskeygenassist_si128(*xout2, (imm8)); \
- xout1 = _mm_shuffle_epi32(xout1, 0xFF); \
- *xout0 = sl_xor(*xout0); \
- *xout0 = _mm_xor_si128(*xout0, xout1); \
- xout1 = _mm_aeskeygenassist_si128(*xout0, 0x00);\
- xout1 = _mm_shuffle_epi32(xout1, 0xAA); \
- *xout2 = sl_xor(*xout2); \
- *xout2 = _mm_xor_si128(*xout2, xout1); \
-
-
-// This will shift and xor tmp1 into itself as 4 32-bit vals such as
-// sl_xor(a1 a2 a3 a4) = a1 (a2^a1) (a3^a2^a1) (a4^a3^a2^a1)
-static inline __m128i sl_xor(__m128i tmp1)
-{
- __m128i tmp4;
- tmp4 = _mm_slli_si128(tmp1, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- tmp4 = _mm_slli_si128(tmp4, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- tmp4 = _mm_slli_si128(tmp4, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- return tmp1;
-}
-
-
-static inline void aes_genkey_sub1(__m128i* xout0, __m128i* xout2)
-{
- aes_genkey_sub(0x1)
-}
-
-
-static inline void aes_genkey_sub2(__m128i* xout0, __m128i* xout2)
-{
- aes_genkey_sub(0x2)
-}
-
-
-static inline void aes_genkey_sub4(__m128i* xout0, __m128i* xout2)
-{
- aes_genkey_sub(0x4)
-}
-
-
-static inline void aes_genkey_sub8(__m128i* xout0, __m128i* xout2)
-{
- aes_genkey_sub(0x8)
-}
-
-
-static inline void aes_round(__m128i key, __m128i* x0, __m128i* x1, __m128i* x2, __m128i* x3, __m128i* x4, __m128i* x5, __m128i* x6, __m128i* x7)
-{
- *x0 = _mm_aesenc_si128(*x0, key);
- *x1 = _mm_aesenc_si128(*x1, key);
- *x2 = _mm_aesenc_si128(*x2, key);
- *x3 = _mm_aesenc_si128(*x3, key);
- *x4 = _mm_aesenc_si128(*x4, key);
- *x5 = _mm_aesenc_si128(*x5, key);
- *x6 = _mm_aesenc_si128(*x6, key);
- *x7 = _mm_aesenc_si128(*x7, key);
-}
-
-
-static inline void aes_genkey(const __m128i* memory, __m128i* k0, __m128i* k1, __m128i* k2, __m128i* k3, __m128i* k4, __m128i* k5, __m128i* k6, __m128i* k7, __m128i* k8, __m128i* k9)
-{
- __m128i xout0 = _mm_load_si128(memory);
- __m128i xout2 = _mm_load_si128(memory + 1);
- *k0 = xout0;
- *k1 = xout2;
-
- aes_genkey_sub1(&xout0, &xout2);
- *k2 = xout0;
- *k3 = xout2;
-
- aes_genkey_sub2(&xout0, &xout2);
- *k4 = xout0;
- *k5 = xout2;
-
- aes_genkey_sub4(&xout0, &xout2);
- *k6 = xout0;
- *k7 = xout2;
-
- aes_genkey_sub8(&xout0, &xout2);
- *k8 = xout0;
- *k9 = xout2;
-}
-
-
-static inline void cn_explode_scratchpad(const __m128i* input, __m128i* output)
-{
- // This is more than we have registers, compiler will assign 2 keys on the stack
- __m128i xin0, xin1, xin2, xin3, xin4, xin5, xin6, xin7;
- __m128i k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-
- aes_genkey(input, &k0, &k1, &k2, &k3, &k4, &k5, &k6, &k7, &k8, &k9);
-
- xin0 = _mm_load_si128(input + 4);
- xin1 = _mm_load_si128(input + 5);
- xin2 = _mm_load_si128(input + 6);
- xin3 = _mm_load_si128(input + 7);
- xin4 = _mm_load_si128(input + 8);
- xin5 = _mm_load_si128(input + 9);
- xin6 = _mm_load_si128(input + 10);
- xin7 = _mm_load_si128(input + 11);
-
- for (size_t i = 0; __builtin_expect(i < MEMORY_LITE / sizeof(__m128i), 1); i += 8) {
- aes_round(k0, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k1, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k2, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k3, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k4, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k5, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k6, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k7, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k8, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k9, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
-
- _mm_store_si128(output + i + 0, xin0);
- _mm_store_si128(output + i + 1, xin1);
- _mm_store_si128(output + i + 2, xin2);
- _mm_store_si128(output + i + 3, xin3);
- _mm_store_si128(output + i + 4, xin4);
- _mm_store_si128(output + i + 5, xin5);
- _mm_store_si128(output + i + 6, xin6);
- _mm_store_si128(output + i + 7, xin7);
- }
-}
-
-
-static inline void cn_implode_scratchpad(const __m128i* input, __m128i* output)
-{
- // This is more than we have registers, compiler will assign 2 keys on the stack
- __m128i xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7;
- __m128i k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-
- aes_genkey(output + 2, &k0, &k1, &k2, &k3, &k4, &k5, &k6, &k7, &k8, &k9);
-
- xout0 = _mm_load_si128(output + 4);
- xout1 = _mm_load_si128(output + 5);
- xout2 = _mm_load_si128(output + 6);
- xout3 = _mm_load_si128(output + 7);
- xout4 = _mm_load_si128(output + 8);
- xout5 = _mm_load_si128(output + 9);
- xout6 = _mm_load_si128(output + 10);
- xout7 = _mm_load_si128(output + 11);
-
- for (size_t i = 0; __builtin_expect(i < MEMORY_LITE / sizeof(__m128i), 1); i += 8)
- {
- xout0 = _mm_xor_si128(_mm_load_si128(input + i + 0), xout0);
- xout1 = _mm_xor_si128(_mm_load_si128(input + i + 1), xout1);
- xout2 = _mm_xor_si128(_mm_load_si128(input + i + 2), xout2);
- xout3 = _mm_xor_si128(_mm_load_si128(input + i + 3), xout3);
- xout4 = _mm_xor_si128(_mm_load_si128(input + i + 4), xout4);
- xout5 = _mm_xor_si128(_mm_load_si128(input + i + 5), xout5);
- xout6 = _mm_xor_si128(_mm_load_si128(input + i + 6), xout6);
- xout7 = _mm_xor_si128(_mm_load_si128(input + i + 7), xout7);
-
- aes_round(k0, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k1, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k2, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k3, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k4, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k5, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k6, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- }
-
- _mm_store_si128(output + 4, xout0);
- _mm_store_si128(output + 5, xout1);
- _mm_store_si128(output + 6, xout2);
- _mm_store_si128(output + 7, xout3);
- _mm_store_si128(output + 8, xout4);
- _mm_store_si128(output + 9, xout5);
- _mm_store_si128(output + 10, xout6);
- _mm_store_si128(output + 11, xout7);
-}
-
-
-#if defined(__x86_64__)
-# define EXTRACT64(X) _mm_cvtsi128_si64(X)
-
-static inline uint64_t _umul128(uint64_t a, uint64_t b, uint64_t* hi)
-{
- unsigned __int128 r = (unsigned __int128) a * (unsigned __int128) b;
- *hi = r >> 64;
- return (uint64_t) r;
-}
-#elif defined(__i386__)
-# define HI32(X) \
- _mm_srli_si128((X), 4)
-
-
-# define EXTRACT64(X) \
- ((uint64_t)(uint32_t)_mm_cvtsi128_si32(X) | \
- ((uint64_t)(uint32_t)_mm_cvtsi128_si32(HI32(X)) << 32))
-
-static inline uint64_t _umul128(uint64_t multiplier, uint64_t multiplicand, uint64_t *product_hi) {
- // multiplier = ab = a * 2^32 + b
- // multiplicand = cd = c * 2^32 + d
- // ab * cd = a * c * 2^64 + (a * d + b * c) * 2^32 + b * d
- uint64_t a = multiplier >> 32;
- uint64_t b = multiplier & 0xFFFFFFFF;
- uint64_t c = multiplicand >> 32;
- uint64_t d = multiplicand & 0xFFFFFFFF;
-
- //uint64_t ac = a * c;
- uint64_t ad = a * d;
- //uint64_t bc = b * c;
- uint64_t bd = b * d;
-
- uint64_t adbc = ad + (b * c);
- uint64_t adbc_carry = adbc < ad ? 1 : 0;
-
- // multiplier * multiplicand = product_hi * 2^64 + product_lo
- uint64_t product_lo = bd + (adbc << 32);
- uint64_t product_lo_carry = product_lo < bd ? 1 : 0;
- *product_hi = (a * c) + (adbc >> 32) + (adbc_carry << 32) + product_lo_carry;
-
- return product_lo;
-}
-#endif
-
-
-#endif /* __CRYPTONIGHT_LITE_AESNI_H__ */
diff --git a/algo/cryptonight-lite/cryptonight_lite_av1_aesni.c b/algo/cryptonight-lite/cryptonight_lite_av1_aesni.c
deleted file mode 100644
index 80110fb2..00000000
--- a/algo/cryptonight-lite/cryptonight_lite_av1_aesni.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#include
-#include
-
-#include "algo/cryptonight/cryptonight.h"
-#include "cryptonight_lite_aesni.h"
-#include "crypto/c_keccak.h"
-
-
-void cryptonight_lite_av1_aesni(const void *restrict input, size_t size, void *restrict output, struct cryptonight_ctx *restrict ctx)
-{
- keccak((const uint8_t *) input, size, ctx->state0, 200);
-
- cn_explode_scratchpad((__m128i*) ctx->state0, (__m128i*) ctx->memory);
-
- const uint8_t* l0 = ctx->memory;
- uint64_t* h0 = (uint64_t*) ctx->state0;
-
- uint64_t al0 = h0[0] ^ h0[4];
- uint64_t ah0 = h0[1] ^ h0[5];
- __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
-
- uint64_t idx0 = h0[0] ^ h0[4];
-
- for (size_t i = 0; __builtin_expect(i < 0x40000, 1); i++) {
- __m128i cx;
- cx = _mm_load_si128((__m128i *) &l0[idx0 & 0xFFFF0]);
- cx = _mm_aesenc_si128(cx, _mm_set_epi64x(ah0, al0));
-
- _mm_store_si128((__m128i *) &l0[idx0 & 0xFFFF0], _mm_xor_si128(bx0, cx));
- idx0 = EXTRACT64(cx);
- bx0 = cx;
-
- uint64_t hi, lo, cl, ch;
- cl = ((uint64_t*) &l0[idx0 & 0xFFFF0])[0];
- ch = ((uint64_t*) &l0[idx0 & 0xFFFF0])[1];
- lo = _umul128(idx0, cl, &hi);
-
- al0 += hi;
- ah0 += lo;
-
- ((uint64_t*)&l0[idx0 & 0xFFFF0])[0] = al0;
- ((uint64_t*)&l0[idx0 & 0xFFFF0])[1] = ah0;
-
- ah0 ^= ch;
- al0 ^= cl;
- idx0 = al0;
- }
-
- cn_implode_scratchpad((__m128i*) ctx->memory, (__m128i*) ctx->state0);
-
- keccakf(h0, 24);
- extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
-}
diff --git a/algo/cryptonight-lite/cryptonight_lite_av2_aesni_double.c b/algo/cryptonight-lite/cryptonight_lite_av2_aesni_double.c
deleted file mode 100644
index 055435c6..00000000
--- a/algo/cryptonight-lite/cryptonight_lite_av2_aesni_double.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#include
-#include
-
-#include "algo/cryptonight/cryptonight.h"
-#include "cryptonight_lite_aesni.h"
-#include "crypto/c_keccak.h"
-
-
-void cryptonight_lite_av2_aesni_double(const void *restrict input, size_t size, void *restrict output, struct cryptonight_ctx *restrict ctx)
-{
- keccak((const uint8_t *) input, size, ctx->state0, 200);
- keccak((const uint8_t *) input + size, size, ctx->state1, 200);
-
- const uint8_t* l0 = ctx->memory;
- const uint8_t* l1 = ctx->memory + MEMORY_LITE;
- uint64_t* h0 = (uint64_t*) ctx->state0;
- uint64_t* h1 = (uint64_t*) ctx->state1;
-
- cn_explode_scratchpad((__m128i*) h0, (__m128i*) l0);
- cn_explode_scratchpad((__m128i*) h1, (__m128i*) l1);
-
- uint64_t al0 = h0[0] ^ h0[4];
- uint64_t al1 = h1[0] ^ h1[4];
- uint64_t ah0 = h0[1] ^ h0[5];
- uint64_t ah1 = h1[1] ^ h1[5];
-
- __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
- __m128i bx1 = _mm_set_epi64x(h1[3] ^ h1[7], h1[2] ^ h1[6]);
-
- uint64_t idx0 = h0[0] ^ h0[4];
- uint64_t idx1 = h1[0] ^ h1[4];
-
- for (size_t i = 0; __builtin_expect(i < 0x40000, 1); i++) {
- __m128i cx0 = _mm_load_si128((__m128i *) &l0[idx0 & 0xFFFF0]);
- __m128i cx1 = _mm_load_si128((__m128i *) &l1[idx1 & 0xFFFF0]);
-
- cx0 = _mm_aesenc_si128(cx0, _mm_set_epi64x(ah0, al0));
- cx1 = _mm_aesenc_si128(cx1, _mm_set_epi64x(ah1, al1));
-
- _mm_store_si128((__m128i *) &l0[idx0 & 0xFFFF0], _mm_xor_si128(bx0, cx0));
- _mm_store_si128((__m128i *) &l1[idx1 & 0xFFFF0], _mm_xor_si128(bx1, cx1));
-
- idx0 = EXTRACT64(cx0);
- idx1 = EXTRACT64(cx1);
-
- bx0 = cx0;
- bx1 = cx1;
-
- uint64_t hi, lo, cl, ch;
- cl = ((uint64_t*) &l0[idx0 & 0xFFFF0])[0];
- ch = ((uint64_t*) &l0[idx0 & 0xFFFF0])[1];
- lo = _umul128(idx0, cl, &hi);
-
- al0 += hi;
- ah0 += lo;
-
- ((uint64_t*) &l0[idx0 & 0xFFFF0])[0] = al0;
- ((uint64_t*) &l0[idx0 & 0xFFFF0])[1] = ah0;
-
- ah0 ^= ch;
- al0 ^= cl;
- idx0 = al0;
-
- cl = ((uint64_t*) &l1[idx1 & 0xFFFF0])[0];
- ch = ((uint64_t*) &l1[idx1 & 0xFFFF0])[1];
- lo = _umul128(idx1, cl, &hi);
-
- al1 += hi;
- ah1 += lo;
-
- ((uint64_t*) &l1[idx1 & 0xFFFF0])[0] = al1;
- ((uint64_t*) &l1[idx1 & 0xFFFF0])[1] = ah1;
-
- ah1 ^= ch;
- al1 ^= cl;
- idx1 = al1;
- }
-
- cn_implode_scratchpad((__m128i*) l0, (__m128i*) h0);
- cn_implode_scratchpad((__m128i*) l1, (__m128i*) h1);
-
- keccakf(h0, 24);
- keccakf(h1, 24);
-
- extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
- extra_hashes[ctx->state1[0] & 3](ctx->state1, 200, (char*) output + 32);
-}
diff --git a/algo/cryptonight-lite/cryptonight_lite_av3_softaes.c b/algo/cryptonight-lite/cryptonight_lite_av3_softaes.c
deleted file mode 100644
index 3dec6e33..00000000
--- a/algo/cryptonight-lite/cryptonight_lite_av3_softaes.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#include
-#include
-
-#include "algo/cryptonight/cryptonight.h"
-#include "cryptonight_lite_softaes.h"
-#include "crypto/c_keccak.h"
-
-
-void cryptonight_lite_av3_softaes(const void *restrict input, size_t size, void *restrict output, struct cryptonight_ctx *restrict ctx)
-{
- keccak((const uint8_t *) input, size, ctx->state0, 200);
-
- cn_explode_scratchpad((__m128i*) ctx->state0, (__m128i*) ctx->memory);
-
- const uint8_t* l0 = ctx->memory;
- uint64_t* h0 = (uint64_t*) ctx->state0;
-
- uint64_t al0 = h0[0] ^ h0[4];
- uint64_t ah0 = h0[1] ^ h0[5];
- __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
-
- uint64_t idx0 = h0[0] ^ h0[4];
-
- for (size_t i = 0; __builtin_expect(i < 0x40000, 1); i++) {
- __m128i cx;
- cx = _mm_load_si128((__m128i *)&l0[idx0 & 0xFFFF0]);
- cx = soft_aesenc(cx, _mm_set_epi64x(ah0, al0));
-
- _mm_store_si128((__m128i *)&l0[idx0 & 0xFFFF0], _mm_xor_si128(bx0, cx));
- idx0 = EXTRACT64(cx);
- bx0 = cx;
-
- uint64_t hi, lo, cl, ch;
- cl = ((uint64_t*)&l0[idx0 & 0xFFFF0])[0];
- ch = ((uint64_t*)&l0[idx0 & 0xFFFF0])[1];
- lo = _umul128(idx0, cl, &hi);
-
- al0 += hi;
- ah0 += lo;
-
- ((uint64_t*)&l0[idx0 & 0xFFFF0])[0] = al0;
- ((uint64_t*)&l0[idx0 & 0xFFFF0])[1] = ah0;
-
- ah0 ^= ch;
- al0 ^= cl;
- idx0 = al0;
- }
-
- cn_implode_scratchpad((__m128i*) ctx->memory, (__m128i*) ctx->state0);
-
- keccakf(h0, 24);
- extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
-}
diff --git a/algo/cryptonight-lite/cryptonight_lite_av4_softaes_double.c b/algo/cryptonight-lite/cryptonight_lite_av4_softaes_double.c
deleted file mode 100644
index 873b8cac..00000000
--- a/algo/cryptonight-lite/cryptonight_lite_av4_softaes_double.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#include
-#include
-
-#include "algo/cryptonight/cryptonight.h"
-#include "cryptonight_lite_softaes.h"
-#include "crypto/c_keccak.h"
-
-
-void cryptonight_lite_av4_softaes_double(const void *restrict input, size_t size, void *restrict output, struct cryptonight_ctx *restrict ctx)
-{
- keccak((const uint8_t *) input, size, ctx->state0, 200);
- keccak((const uint8_t *) input + size, size, ctx->state1, 200);
-
- const uint8_t* l0 = ctx->memory;
- const uint8_t* l1 = ctx->memory + MEMORY_LITE;
- uint64_t* h0 = (uint64_t*) ctx->state0;
- uint64_t* h1 = (uint64_t*) ctx->state1;
-
- cn_explode_scratchpad((__m128i*) h0, (__m128i*) l0);
- cn_explode_scratchpad((__m128i*) h1, (__m128i*) l1);
-
- uint64_t al0 = h0[0] ^ h0[4];
- uint64_t al1 = h1[0] ^ h1[4];
- uint64_t ah0 = h0[1] ^ h0[5];
- uint64_t ah1 = h1[1] ^ h1[5];
-
- __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
- __m128i bx1 = _mm_set_epi64x(h1[3] ^ h1[7], h1[2] ^ h1[6]);
-
- uint64_t idx0 = h0[0] ^ h0[4];
- uint64_t idx1 = h1[0] ^ h1[4];
-
- for (size_t i = 0; __builtin_expect(i < 0x40000, 1); i++) {
- __m128i cx0 = _mm_load_si128((__m128i *) &l0[idx0 & 0xFFFF0]);
- __m128i cx1 = _mm_load_si128((__m128i *) &l1[idx1 & 0xFFFF0]);
-
- cx0 = soft_aesenc(cx0, _mm_set_epi64x(ah0, al0));
- cx1 = soft_aesenc(cx1, _mm_set_epi64x(ah1, al1));
-
- _mm_store_si128((__m128i *) &l0[idx0 & 0xFFFF0], _mm_xor_si128(bx0, cx0));
- _mm_store_si128((__m128i *) &l1[idx1 & 0xFFFF0], _mm_xor_si128(bx1, cx1));
-
- idx0 = EXTRACT64(cx0);
- idx1 = EXTRACT64(cx1);
-
- bx0 = cx0;
- bx1 = cx1;
-
- uint64_t hi, lo, cl, ch;
- cl = ((uint64_t*) &l0[idx0 & 0xFFFF0])[0];
- ch = ((uint64_t*) &l0[idx0 & 0xFFFF0])[1];
- lo = _umul128(idx0, cl, &hi);
-
- al0 += hi;
- ah0 += lo;
-
- ((uint64_t*) &l0[idx0 & 0xFFFF0])[0] = al0;
- ((uint64_t*) &l0[idx0 & 0xFFFF0])[1] = ah0;
-
- ah0 ^= ch;
- al0 ^= cl;
- idx0 = al0;
-
- cl = ((uint64_t*) &l1[idx1 & 0xFFFF0])[0];
- ch = ((uint64_t*) &l1[idx1 & 0xFFFF0])[1];
- lo = _umul128(idx1, cl, &hi);
-
- al1 += hi;
- ah1 += lo;
-
- ((uint64_t*) &l1[idx1 & 0xFFFF0])[0] = al1;
- ((uint64_t*) &l1[idx1 & 0xFFFF0])[1] = ah1;
-
- ah1 ^= ch;
- al1 ^= cl;
- idx1 = al1;
- }
-
- cn_implode_scratchpad((__m128i*) l0, (__m128i*) h0);
- cn_implode_scratchpad((__m128i*) l1, (__m128i*) h1);
-
- keccakf(h0, 24);
- keccakf(h1, 24);
-
- extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
- extra_hashes[ctx->state1[0] & 3](ctx->state1, 200, (char*) output + 32);
-}
diff --git a/algo/cryptonight-lite/cryptonight_lite_softaes.h b/algo/cryptonight-lite/cryptonight_lite_softaes.h
deleted file mode 100644
index bab3dcaf..00000000
--- a/algo/cryptonight-lite/cryptonight_lite_softaes.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#ifndef __CRYPTONIGHT_LITE_SOFTAES_H__
-#define __CRYPTONIGHT_LITE_SOFTAES_H__
-
-#include
-
-extern __m128i soft_aesenc(__m128i in, __m128i key);
-extern __m128i soft_aeskeygenassist(__m128i key, uint8_t rcon);
-
-
-// This will shift and xor tmp1 into itself as 4 32-bit vals such as
-// sl_xor(a1 a2 a3 a4) = a1 (a2^a1) (a3^a2^a1) (a4^a3^a2^a1)
-static inline __m128i sl_xor(__m128i tmp1)
-{
- __m128i tmp4;
- tmp4 = _mm_slli_si128(tmp1, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- tmp4 = _mm_slli_si128(tmp4, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- tmp4 = _mm_slli_si128(tmp4, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- return tmp1;
-}
-
-
-static inline void aes_genkey_sub(__m128i* xout0, __m128i* xout2, uint8_t rcon)
-{
- __m128i xout1 = soft_aeskeygenassist(*xout2, rcon);
- xout1 = _mm_shuffle_epi32(xout1, 0xFF); // see PSHUFD, set all elems to 4th elem
- *xout0 = sl_xor(*xout0);
- *xout0 = _mm_xor_si128(*xout0, xout1);
- xout1 = soft_aeskeygenassist(*xout0, 0x00);
- xout1 = _mm_shuffle_epi32(xout1, 0xAA); // see PSHUFD, set all elems to 3rd elem
- *xout2 = sl_xor(*xout2);
- *xout2 = _mm_xor_si128(*xout2, xout1);
-}
-
-
-static inline void aes_round(__m128i key, __m128i* x0, __m128i* x1, __m128i* x2, __m128i* x3, __m128i* x4, __m128i* x5, __m128i* x6, __m128i* x7)
-{
- *x0 = soft_aesenc(*x0, key);
- *x1 = soft_aesenc(*x1, key);
- *x2 = soft_aesenc(*x2, key);
- *x3 = soft_aesenc(*x3, key);
- *x4 = soft_aesenc(*x4, key);
- *x5 = soft_aesenc(*x5, key);
- *x6 = soft_aesenc(*x6, key);
- *x7 = soft_aesenc(*x7, key);
-}
-
-
-static inline void aes_genkey(const __m128i* memory, __m128i* k0, __m128i* k1, __m128i* k2, __m128i* k3, __m128i* k4, __m128i* k5, __m128i* k6, __m128i* k7, __m128i* k8, __m128i* k9)
-{
- __m128i xout0 = _mm_load_si128(memory);
- __m128i xout2 = _mm_load_si128(memory + 1);
- *k0 = xout0;
- *k1 = xout2;
-
- aes_genkey_sub(&xout0, &xout2, 0x1);
- *k2 = xout0;
- *k3 = xout2;
-
- aes_genkey_sub(&xout0, &xout2, 0x2);
- *k4 = xout0;
- *k5 = xout2;
-
- aes_genkey_sub(&xout0, &xout2, 0x4);
- *k6 = xout0;
- *k7 = xout2;
-
- aes_genkey_sub(&xout0, &xout2, 0x8);
- *k8 = xout0;
- *k9 = xout2;
-}
-
-
-static inline void cn_explode_scratchpad(const __m128i* input, __m128i* output)
-{
- // This is more than we have registers, compiler will assign 2 keys on the stack
- __m128i xin0, xin1, xin2, xin3, xin4, xin5, xin6, xin7;
- __m128i k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-
- aes_genkey(input, &k0, &k1, &k2, &k3, &k4, &k5, &k6, &k7, &k8, &k9);
-
- xin0 = _mm_load_si128(input + 4);
- xin1 = _mm_load_si128(input + 5);
- xin2 = _mm_load_si128(input + 6);
- xin3 = _mm_load_si128(input + 7);
- xin4 = _mm_load_si128(input + 8);
- xin5 = _mm_load_si128(input + 9);
- xin6 = _mm_load_si128(input + 10);
- xin7 = _mm_load_si128(input + 11);
-
- for (size_t i = 0; i < MEMORY_LITE / sizeof(__m128i); i += 8) {
- aes_round(k0, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k1, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k2, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k3, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k4, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k5, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k6, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k7, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k8, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k9, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
-
- _mm_store_si128(output + i + 0, xin0);
- _mm_store_si128(output + i + 1, xin1);
- _mm_store_si128(output + i + 2, xin2);
- _mm_store_si128(output + i + 3, xin3);
- _mm_store_si128(output + i + 4, xin4);
- _mm_store_si128(output + i + 5, xin5);
- _mm_store_si128(output + i + 6, xin6);
- _mm_store_si128(output + i + 7, xin7);
- }
-}
-
-
-static inline void cn_implode_scratchpad(const __m128i* input, __m128i* output)
-{
- // This is more than we have registers, compiler will assign 2 keys on the stack
- __m128i xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7;
- __m128i k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-
- aes_genkey(output + 2, &k0, &k1, &k2, &k3, &k4, &k5, &k6, &k7, &k8, &k9);
-
- xout0 = _mm_load_si128(output + 4);
- xout1 = _mm_load_si128(output + 5);
- xout2 = _mm_load_si128(output + 6);
- xout3 = _mm_load_si128(output + 7);
- xout4 = _mm_load_si128(output + 8);
- xout5 = _mm_load_si128(output + 9);
- xout6 = _mm_load_si128(output + 10);
- xout7 = _mm_load_si128(output + 11);
-
- for (size_t i = 0; __builtin_expect(i < MEMORY_LITE / sizeof(__m128i), 1); i += 8)
- {
- xout0 = _mm_xor_si128(_mm_load_si128(input + i + 0), xout0);
- xout1 = _mm_xor_si128(_mm_load_si128(input + i + 1), xout1);
- xout2 = _mm_xor_si128(_mm_load_si128(input + i + 2), xout2);
- xout3 = _mm_xor_si128(_mm_load_si128(input + i + 3), xout3);
- xout4 = _mm_xor_si128(_mm_load_si128(input + i + 4), xout4);
- xout5 = _mm_xor_si128(_mm_load_si128(input + i + 5), xout5);
- xout6 = _mm_xor_si128(_mm_load_si128(input + i + 6), xout6);
- xout7 = _mm_xor_si128(_mm_load_si128(input + i + 7), xout7);
-
- aes_round(k0, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k1, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k2, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k3, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k4, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k5, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k6, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- }
-
- _mm_store_si128(output + 4, xout0);
- _mm_store_si128(output + 5, xout1);
- _mm_store_si128(output + 6, xout2);
- _mm_store_si128(output + 7, xout3);
- _mm_store_si128(output + 8, xout4);
- _mm_store_si128(output + 9, xout5);
- _mm_store_si128(output + 10, xout6);
- _mm_store_si128(output + 11, xout7);
-}
-
-
-#if defined(__x86_64__)
-# define EXTRACT64(X) _mm_cvtsi128_si64(X)
-
-static inline uint64_t _umul128(uint64_t a, uint64_t b, uint64_t* hi)
-{
- unsigned __int128 r = (unsigned __int128) a * (unsigned __int128) b;
- *hi = r >> 64;
- return (uint64_t) r;
-}
-#elif defined(__i386__)
-# define HI32(X) \
- _mm_srli_si128((X), 4)
-
-
-# define EXTRACT64(X) \
- ((uint64_t)(uint32_t)_mm_cvtsi128_si32(X) | \
- ((uint64_t)(uint32_t)_mm_cvtsi128_si32(HI32(X)) << 32))
-
-static inline uint64_t _umul128(uint64_t multiplier, uint64_t multiplicand, uint64_t *product_hi) {
- // multiplier = ab = a * 2^32 + b
- // multiplicand = cd = c * 2^32 + d
- // ab * cd = a * c * 2^64 + (a * d + b * c) * 2^32 + b * d
- uint64_t a = multiplier >> 32;
- uint64_t b = multiplier & 0xFFFFFFFF;
- uint64_t c = multiplicand >> 32;
- uint64_t d = multiplicand & 0xFFFFFFFF;
-
- //uint64_t ac = a * c;
- uint64_t ad = a * d;
- //uint64_t bc = b * c;
- uint64_t bd = b * d;
-
- uint64_t adbc = ad + (b * c);
- uint64_t adbc_carry = adbc < ad ? 1 : 0;
-
- // multiplier * multiplicand = product_hi * 2^64 + product_lo
- uint64_t product_lo = bd + (adbc << 32);
- uint64_t product_lo_carry = product_lo < bd ? 1 : 0;
- *product_hi = (a * c) + (adbc >> 32) + (adbc_carry << 32) + product_lo_carry;
-
- return product_lo;
-}
-#endif
-
-
-#endif /* __CRYPTONIGHT_LITE_SOFTAES_H__ */
diff --git a/algo/cryptonight/cryptonight.c b/algo/cryptonight/cryptonight.c
deleted file mode 100644
index 73018728..00000000
--- a/algo/cryptonight/cryptonight.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-
-#include
-#include
-#include
-
-#ifndef BUILD_TEST
-# include "xmrig.h"
-#endif
-
-#include "crypto/c_groestl.h"
-#include "crypto/c_blake256.h"
-#include "crypto/c_jh.h"
-#include "crypto/c_skein.h"
-#include "cryptonight.h"
-#include "options.h"
-
-
-const static char test_input[152] = {
- 0x01, 0x00, 0xFB, 0x8E, 0x8A, 0xC8, 0x05, 0x89, 0x93, 0x23, 0x37, 0x1B, 0xB7, 0x90, 0xDB, 0x19,
- 0x21, 0x8A, 0xFD, 0x8D, 0xB8, 0xE3, 0x75, 0x5D, 0x8B, 0x90, 0xF3, 0x9B, 0x3D, 0x55, 0x06, 0xA9,
- 0xAB, 0xCE, 0x4F, 0xA9, 0x12, 0x24, 0x45, 0x00, 0x00, 0x00, 0x00, 0xEE, 0x81, 0x46, 0xD4, 0x9F,
- 0xA9, 0x3E, 0xE7, 0x24, 0xDE, 0xB5, 0x7D, 0x12, 0xCB, 0xC6, 0xC6, 0xF3, 0xB9, 0x24, 0xD9, 0x46,
- 0x12, 0x7C, 0x7A, 0x97, 0x41, 0x8F, 0x93, 0x48, 0x82, 0x8F, 0x0F, 0x02,
- 0x03, 0x05, 0xA0, 0xDB, 0xD6, 0xBF, 0x05, 0xCF, 0x16, 0xE5, 0x03, 0xF3, 0xA6, 0x6F, 0x78, 0x00,
- 0x7C, 0xBF, 0x34, 0x14, 0x43, 0x32, 0xEC, 0xBF, 0xC2, 0x2E, 0xD9, 0x5C, 0x87, 0x00, 0x38, 0x3B,
- 0x30, 0x9A, 0xCE, 0x19, 0x23, 0xA0, 0x96, 0x4B, 0x00, 0x00, 0x00, 0x08, 0xBA, 0x93, 0x9A, 0x62,
- 0x72, 0x4C, 0x0D, 0x75, 0x81, 0xFC, 0xE5, 0x76, 0x1E, 0x9D, 0x8A, 0x0E, 0x6A, 0x1C, 0x3F, 0x92,
- 0x4F, 0xDD, 0x84, 0x93, 0xD1, 0x11, 0x56, 0x49, 0xC0, 0x5E, 0xB6, 0x01
-};
-
-
-const static char test_output0[64] = {
- 0x1B, 0x60, 0x6A, 0x3F, 0x4A, 0x07, 0xD6, 0x48, 0x9A, 0x1B, 0xCD, 0x07, 0x69, 0x7B, 0xD1, 0x66,
- 0x96, 0xB6, 0x1C, 0x8A, 0xE9, 0x82, 0xF6, 0x1A, 0x90, 0x16, 0x0F, 0x4E, 0x52, 0x82, 0x8A, 0x7F,
- 0x1A, 0x3F, 0xFB, 0xEE, 0x90, 0x9B, 0x42, 0x0D, 0x91, 0xF7, 0xBE, 0x6E, 0x5F, 0xB5, 0x6D, 0xB7,
- 0x1B, 0x31, 0x10, 0xD8, 0x86, 0x01, 0x1E, 0x87, 0x7E, 0xE5, 0x78, 0x6A, 0xFD, 0x08, 0x01, 0x00
-};
-
-
-void cryptonight_av1_aesni(const void* input, size_t size, void* output, struct cryptonight_ctx* ctx);
-void cryptonight_av2_aesni_double(const void* input, size_t size, void* output, struct cryptonight_ctx* ctx);
-void cryptonight_av3_softaes(const void* input, size_t size, void* output, struct cryptonight_ctx* ctx);
-void cryptonight_av4_softaes_double(const void* input, size_t size, void* output, struct cryptonight_ctx* ctx);
-
-#ifndef XMRIG_NO_AEON
-const static char test_output1[64] = {
- 0x28, 0xA2, 0x2B, 0xAD, 0x3F, 0x93, 0xD1, 0x40, 0x8F, 0xCA, 0x47, 0x2E, 0xB5, 0xAD, 0x1C, 0xBE,
- 0x75, 0xF2, 0x1D, 0x05, 0x3C, 0x8C, 0xE5, 0xB3, 0xAF, 0x10, 0x5A, 0x57, 0x71, 0x3E, 0x21, 0xDD,
- 0x36, 0x95, 0xB4, 0xB5, 0x3B, 0xB0, 0x03, 0x58, 0xB0, 0xAD, 0x38, 0xDC, 0x16, 0x0F, 0xEB, 0x9E,
- 0x00, 0x4E, 0xEC, 0xE0, 0x9B, 0x83, 0xA7, 0x2E, 0xF6, 0xBA, 0x98, 0x64, 0xD3, 0x51, 0x0C, 0x88,
-};
-
-void cryptonight_lite_av1_aesni(const void* input, size_t size, void* output, struct cryptonight_ctx* ctx);
-void cryptonight_lite_av2_aesni_double(const void* input, size_t size, void* output, struct cryptonight_ctx* ctx);
-void cryptonight_lite_av3_softaes(const void* input, size_t size, void* output, struct cryptonight_ctx* ctx);
-void cryptonight_lite_av4_softaes_double(const void* input, size_t size, void* output, struct cryptonight_ctx* ctx);
-#endif
-
-void (*cryptonight_hash_ctx)(const void* input, size_t size, void* output, struct cryptonight_ctx* ctx) = NULL;
-
-
-static bool self_test() {
- if (cryptonight_hash_ctx == NULL) {
- return false;
- }
-
- char output[64];
-
- struct cryptonight_ctx *ctx = (struct cryptonight_ctx*) _mm_malloc(sizeof(struct cryptonight_ctx), 16);
- ctx->memory = (uint8_t *) _mm_malloc(MEMORY * 2, 16);
-
- cryptonight_hash_ctx(test_input, 76, output, ctx);
-
- _mm_free(ctx->memory);
- _mm_free(ctx);
-
-# ifndef XMRIG_NO_AEON
- if (opt_algo == ALGO_CRYPTONIGHT_LITE) {
- return memcmp(output, test_output1, (opt_double_hash ? 64 : 32)) == 0;
- }
-# endif
-
- return memcmp(output, test_output0, (opt_double_hash ? 64 : 32)) == 0;
-}
-
-
-#ifndef XMRIG_NO_AEON
-bool cryptonight_lite_init(int variant) {
- switch (variant) {
- case AEON_AV1_AESNI:
- cryptonight_hash_ctx = cryptonight_lite_av1_aesni;
- break;
-
- case AEON_AV2_AESNI_DOUBLE:
- opt_double_hash = true;
- cryptonight_hash_ctx = cryptonight_lite_av2_aesni_double;
- break;
-
- case AEON_AV3_SOFT_AES:
- cryptonight_hash_ctx = cryptonight_lite_av3_softaes;
- break;
-
- case AEON_AV4_SOFT_AES_DOUBLE:
- opt_double_hash = true;
- cryptonight_hash_ctx = cryptonight_lite_av4_softaes_double;
- break;
-
- default:
- break;
- }
-
- return self_test();
-}
-#endif
-
-
-bool cryptonight_init(int variant)
-{
-# ifndef XMRIG_NO_AEON
- if (opt_algo == ALGO_CRYPTONIGHT_LITE) {
- return cryptonight_lite_init(variant);
- }
-# endif
-
- switch (variant) {
- case XMR_AV1_AESNI:
- cryptonight_hash_ctx = cryptonight_av1_aesni;
- break;
-
- case XMR_AV2_AESNI_DOUBLE:
- opt_double_hash = true;
- cryptonight_hash_ctx = cryptonight_av2_aesni_double;
- break;
-
- case XMR_AV3_SOFT_AES:
- cryptonight_hash_ctx = cryptonight_av3_softaes;
- break;
-
- case XMR_AV4_SOFT_AES_DOUBLE:
- opt_double_hash = true;
- cryptonight_hash_ctx = cryptonight_av4_softaes_double;
- break;
-
- default:
- break;
- }
-
- return self_test();
-}
-
-
-static inline void do_blake_hash(const void* input, size_t len, char* output) {
- blake256_hash((uint8_t*)output, input, len);
-}
-
-
-static inline void do_groestl_hash(const void* input, size_t len, char* output) {
- groestl(input, len * 8, (uint8_t*)output);
-}
-
-
-static inline void do_jh_hash(const void* input, size_t len, char* output) {
- jh_hash(32 * 8, input, 8 * len, (uint8_t*)output);
-}
-
-
-static inline void do_skein_hash(const void* input, size_t len, char* output) {
- skein_hash(8 * 32, input, 8 * len, (uint8_t*)output);
-}
-
-
-void (* const extra_hashes[4])(const void *, size_t, char *) = {do_blake_hash, do_groestl_hash, do_jh_hash, do_skein_hash};
-
-
-#ifndef BUILD_TEST
-int scanhash_cryptonight(int thr_id, uint32_t *hash, uint32_t *restrict blob, size_t blob_size, uint32_t target, uint32_t max_nonce, unsigned long *restrict hashes_done, struct cryptonight_ctx *restrict ctx) {
- uint32_t *nonceptr = (uint32_t*) (((char*) blob) + 39);
-
- do {
- cryptonight_hash_ctx(blob, blob_size, hash, ctx);
- (*hashes_done)++;
-
- if (unlikely(hash[7] < target)) {
- return 1;
- }
-
- (*nonceptr)++;
- } while (likely(((*nonceptr) < max_nonce && !work_restart[thr_id].restart)));
-
- return 0;
-}
-
-
-int scanhash_cryptonight_double(int thr_id, uint32_t *hash, uint8_t *restrict blob, size_t blob_size, uint32_t target, uint32_t max_nonce, unsigned long *restrict hashes_done, struct cryptonight_ctx *restrict ctx) {
- int rc = 0;
- uint32_t *nonceptr0 = (uint32_t*) (((char*) blob) + 39);
- uint32_t *nonceptr1 = (uint32_t*) (((char*) blob) + 39 + blob_size);
-
- do {
- cryptonight_hash_ctx(blob, blob_size, hash, ctx);
- (*hashes_done) += 2;
-
- if (unlikely(hash[7] < target)) {
- return rc |= 1;
- }
-
- if (unlikely(hash[15] < target)) {
- return rc |= 2;
- }
-
- if (rc) {
- break;
- }
-
- (*nonceptr0)++;
- (*nonceptr1)++;
- } while (likely(((*nonceptr0) < max_nonce && !work_restart[thr_id].restart)));
-
- return rc;
-}
-#endif
diff --git a/algo/cryptonight/cryptonight_aesni.h b/algo/cryptonight/cryptonight_aesni.h
deleted file mode 100644
index e4d6d42f..00000000
--- a/algo/cryptonight/cryptonight_aesni.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#ifndef __CRYPTONIGHT_AESNI_H__
-#define __CRYPTONIGHT_AESNI_H__
-
-#include
-
-
-#define aes_genkey_sub(imm8) \
- __m128i xout1 = _mm_aeskeygenassist_si128(*xout2, (imm8)); \
- xout1 = _mm_shuffle_epi32(xout1, 0xFF); \
- *xout0 = sl_xor(*xout0); \
- *xout0 = _mm_xor_si128(*xout0, xout1); \
- xout1 = _mm_aeskeygenassist_si128(*xout0, 0x00);\
- xout1 = _mm_shuffle_epi32(xout1, 0xAA); \
- *xout2 = sl_xor(*xout2); \
- *xout2 = _mm_xor_si128(*xout2, xout1); \
-
-
-// This will shift and xor tmp1 into itself as 4 32-bit vals such as
-// sl_xor(a1 a2 a3 a4) = a1 (a2^a1) (a3^a2^a1) (a4^a3^a2^a1)
-static inline __m128i sl_xor(__m128i tmp1)
-{
- __m128i tmp4;
- tmp4 = _mm_slli_si128(tmp1, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- tmp4 = _mm_slli_si128(tmp4, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- tmp4 = _mm_slli_si128(tmp4, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- return tmp1;
-}
-
-
-static inline void aes_genkey_sub1(__m128i* xout0, __m128i* xout2)
-{
- aes_genkey_sub(0x1)
-}
-
-
-static inline void aes_genkey_sub2(__m128i* xout0, __m128i* xout2)
-{
- aes_genkey_sub(0x2)
-}
-
-
-static inline void aes_genkey_sub4(__m128i* xout0, __m128i* xout2)
-{
- aes_genkey_sub(0x4)
-}
-
-
-static inline void aes_genkey_sub8(__m128i* xout0, __m128i* xout2)
-{
- aes_genkey_sub(0x8)
-}
-
-
-static inline void aes_round(__m128i key, __m128i* x0, __m128i* x1, __m128i* x2, __m128i* x3, __m128i* x4, __m128i* x5, __m128i* x6, __m128i* x7)
-{
- *x0 = _mm_aesenc_si128(*x0, key);
- *x1 = _mm_aesenc_si128(*x1, key);
- *x2 = _mm_aesenc_si128(*x2, key);
- *x3 = _mm_aesenc_si128(*x3, key);
- *x4 = _mm_aesenc_si128(*x4, key);
- *x5 = _mm_aesenc_si128(*x5, key);
- *x6 = _mm_aesenc_si128(*x6, key);
- *x7 = _mm_aesenc_si128(*x7, key);
-}
-
-
-static inline void aes_genkey(const __m128i* memory, __m128i* k0, __m128i* k1, __m128i* k2, __m128i* k3, __m128i* k4, __m128i* k5, __m128i* k6, __m128i* k7, __m128i* k8, __m128i* k9)
-{
- __m128i xout0 = _mm_load_si128(memory);
- __m128i xout2 = _mm_load_si128(memory + 1);
- *k0 = xout0;
- *k1 = xout2;
-
- aes_genkey_sub1(&xout0, &xout2);
- *k2 = xout0;
- *k3 = xout2;
-
- aes_genkey_sub2(&xout0, &xout2);
- *k4 = xout0;
- *k5 = xout2;
-
- aes_genkey_sub4(&xout0, &xout2);
- *k6 = xout0;
- *k7 = xout2;
-
- aes_genkey_sub8(&xout0, &xout2);
- *k8 = xout0;
- *k9 = xout2;
-}
-
-
-static inline void cn_explode_scratchpad(const __m128i* input, __m128i* output)
-{
- // This is more than we have registers, compiler will assign 2 keys on the stack
- __m128i xin0, xin1, xin2, xin3, xin4, xin5, xin6, xin7;
- __m128i k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-
- aes_genkey(input, &k0, &k1, &k2, &k3, &k4, &k5, &k6, &k7, &k8, &k9);
-
- xin0 = _mm_load_si128(input + 4);
- xin1 = _mm_load_si128(input + 5);
- xin2 = _mm_load_si128(input + 6);
- xin3 = _mm_load_si128(input + 7);
- xin4 = _mm_load_si128(input + 8);
- xin5 = _mm_load_si128(input + 9);
- xin6 = _mm_load_si128(input + 10);
- xin7 = _mm_load_si128(input + 11);
-
- for (size_t i = 0; __builtin_expect(i < MEMORY / sizeof(__m128i), 1); i += 8) {
- aes_round(k0, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k1, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k2, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k3, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k4, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k5, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k6, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k7, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k8, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k9, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
-
- _mm_store_si128(output + i + 0, xin0);
- _mm_store_si128(output + i + 1, xin1);
- _mm_store_si128(output + i + 2, xin2);
- _mm_store_si128(output + i + 3, xin3);
- _mm_store_si128(output + i + 4, xin4);
- _mm_store_si128(output + i + 5, xin5);
- _mm_store_si128(output + i + 6, xin6);
- _mm_store_si128(output + i + 7, xin7);
- }
-}
-
-
-static inline void cn_implode_scratchpad(const __m128i* input, __m128i* output)
-{
- // This is more than we have registers, compiler will assign 2 keys on the stack
- __m128i xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7;
- __m128i k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-
- aes_genkey(output + 2, &k0, &k1, &k2, &k3, &k4, &k5, &k6, &k7, &k8, &k9);
-
- xout0 = _mm_load_si128(output + 4);
- xout1 = _mm_load_si128(output + 5);
- xout2 = _mm_load_si128(output + 6);
- xout3 = _mm_load_si128(output + 7);
- xout4 = _mm_load_si128(output + 8);
- xout5 = _mm_load_si128(output + 9);
- xout6 = _mm_load_si128(output + 10);
- xout7 = _mm_load_si128(output + 11);
-
- for (size_t i = 0; __builtin_expect(i < MEMORY / sizeof(__m128i), 1); i += 8)
- {
- xout0 = _mm_xor_si128(_mm_load_si128(input + i + 0), xout0);
- xout1 = _mm_xor_si128(_mm_load_si128(input + i + 1), xout1);
- xout2 = _mm_xor_si128(_mm_load_si128(input + i + 2), xout2);
- xout3 = _mm_xor_si128(_mm_load_si128(input + i + 3), xout3);
- xout4 = _mm_xor_si128(_mm_load_si128(input + i + 4), xout4);
- xout5 = _mm_xor_si128(_mm_load_si128(input + i + 5), xout5);
- xout6 = _mm_xor_si128(_mm_load_si128(input + i + 6), xout6);
- xout7 = _mm_xor_si128(_mm_load_si128(input + i + 7), xout7);
-
- aes_round(k0, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k1, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k2, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k3, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k4, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k5, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k6, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- }
-
- _mm_store_si128(output + 4, xout0);
- _mm_store_si128(output + 5, xout1);
- _mm_store_si128(output + 6, xout2);
- _mm_store_si128(output + 7, xout3);
- _mm_store_si128(output + 8, xout4);
- _mm_store_si128(output + 9, xout5);
- _mm_store_si128(output + 10, xout6);
- _mm_store_si128(output + 11, xout7);
-}
-
-
-#if defined(__x86_64__)
-# define EXTRACT64(X) _mm_cvtsi128_si64(X)
-
-static inline uint64_t _umul128(uint64_t a, uint64_t b, uint64_t* hi)
-{
- unsigned __int128 r = (unsigned __int128) a * (unsigned __int128) b;
- *hi = r >> 64;
- return (uint64_t) r;
-}
-#elif defined(__i386__)
-# define HI32(X) \
- _mm_srli_si128((X), 4)
-
-
-# define EXTRACT64(X) \
- ((uint64_t)(uint32_t)_mm_cvtsi128_si32(X) | \
- ((uint64_t)(uint32_t)_mm_cvtsi128_si32(HI32(X)) << 32))
-
-static inline uint64_t _umul128(uint64_t multiplier, uint64_t multiplicand, uint64_t *product_hi) {
- // multiplier = ab = a * 2^32 + b
- // multiplicand = cd = c * 2^32 + d
- // ab * cd = a * c * 2^64 + (a * d + b * c) * 2^32 + b * d
- uint64_t a = multiplier >> 32;
- uint64_t b = multiplier & 0xFFFFFFFF;
- uint64_t c = multiplicand >> 32;
- uint64_t d = multiplicand & 0xFFFFFFFF;
-
- //uint64_t ac = a * c;
- uint64_t ad = a * d;
- //uint64_t bc = b * c;
- uint64_t bd = b * d;
-
- uint64_t adbc = ad + (b * c);
- uint64_t adbc_carry = adbc < ad ? 1 : 0;
-
- // multiplier * multiplicand = product_hi * 2^64 + product_lo
- uint64_t product_lo = bd + (adbc << 32);
- uint64_t product_lo_carry = product_lo < bd ? 1 : 0;
- *product_hi = (a * c) + (adbc >> 32) + (adbc_carry << 32) + product_lo_carry;
-
- return product_lo;
-}
-#endif
-
-
-#endif /* __CRYPTONIGHT_AESNI_H__ */
diff --git a/algo/cryptonight/cryptonight_av1_aesni.c b/algo/cryptonight/cryptonight_av1_aesni.c
deleted file mode 100644
index 3f30544e..00000000
--- a/algo/cryptonight/cryptonight_av1_aesni.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#include
-#include
-
-#include "cryptonight.h"
-#include "cryptonight_aesni.h"
-#include "crypto/c_keccak.h"
-
-
-void cryptonight_av1_aesni(const void *restrict input, size_t size, void *restrict output, struct cryptonight_ctx *restrict ctx)
-{
- keccak((const uint8_t *) input, size, ctx->state0, 200);
-
- cn_explode_scratchpad((__m128i*) ctx->state0, (__m128i*) ctx->memory);
-
- const uint8_t* l0 = ctx->memory;
- uint64_t* h0 = (uint64_t*) ctx->state0;
-
- uint64_t al0 = h0[0] ^ h0[4];
- uint64_t ah0 = h0[1] ^ h0[5];
- __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
-
- uint64_t idx0 = h0[0] ^ h0[4];
-
- for (size_t i = 0; __builtin_expect(i < 0x80000, 1); i++) {
- __m128i cx;
- cx = _mm_load_si128((__m128i *) &l0[idx0 & 0x1FFFF0]);
- cx = _mm_aesenc_si128(cx, _mm_set_epi64x(ah0, al0));
-
- _mm_store_si128((__m128i *) &l0[idx0 & 0x1FFFF0], _mm_xor_si128(bx0, cx));
- idx0 = EXTRACT64(cx);
- bx0 = cx;
-
- uint64_t hi, lo, cl, ch;
- cl = ((uint64_t*) &l0[idx0 & 0x1FFFF0])[0];
- ch = ((uint64_t*) &l0[idx0 & 0x1FFFF0])[1];
- lo = _umul128(idx0, cl, &hi);
-
- al0 += hi;
- ah0 += lo;
-
- ((uint64_t*)&l0[idx0 & 0x1FFFF0])[0] = al0;
- ((uint64_t*)&l0[idx0 & 0x1FFFF0])[1] = ah0;
-
- ah0 ^= ch;
- al0 ^= cl;
- idx0 = al0;
- }
-
- cn_implode_scratchpad((__m128i*) ctx->memory, (__m128i*) ctx->state0);
-
- keccakf(h0, 24);
- extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
-}
diff --git a/algo/cryptonight/cryptonight_av2_aesni_double.c b/algo/cryptonight/cryptonight_av2_aesni_double.c
deleted file mode 100644
index 779b9bc3..00000000
--- a/algo/cryptonight/cryptonight_av2_aesni_double.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#include
-#include
-
-#include "cryptonight.h"
-#include "cryptonight_aesni.h"
-#include "crypto/c_keccak.h"
-
-
-void cryptonight_av2_aesni_double(const void *restrict input, size_t size, void *restrict output, struct cryptonight_ctx *restrict ctx)
-{
- keccak((const uint8_t *) input, size, ctx->state0, 200);
- keccak((const uint8_t *) input + size, size, ctx->state1, 200);
-
- const uint8_t* l0 = ctx->memory;
- const uint8_t* l1 = ctx->memory + MEMORY;
- uint64_t* h0 = (uint64_t*) ctx->state0;
- uint64_t* h1 = (uint64_t*) ctx->state1;
-
- cn_explode_scratchpad((__m128i*) h0, (__m128i*) l0);
- cn_explode_scratchpad((__m128i*) h1, (__m128i*) l1);
-
- uint64_t al0 = h0[0] ^ h0[4];
- uint64_t al1 = h1[0] ^ h1[4];
- uint64_t ah0 = h0[1] ^ h0[5];
- uint64_t ah1 = h1[1] ^ h1[5];
-
- __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
- __m128i bx1 = _mm_set_epi64x(h1[3] ^ h1[7], h1[2] ^ h1[6]);
-
- uint64_t idx0 = h0[0] ^ h0[4];
- uint64_t idx1 = h1[0] ^ h1[4];
-
- for (size_t i = 0; __builtin_expect(i < 0x80000, 1); i++) {
- __m128i cx0 = _mm_load_si128((__m128i *) &l0[idx0 & 0x1FFFF0]);
- __m128i cx1 = _mm_load_si128((__m128i *) &l1[idx1 & 0x1FFFF0]);
-
- cx0 = _mm_aesenc_si128(cx0, _mm_set_epi64x(ah0, al0));
- cx1 = _mm_aesenc_si128(cx1, _mm_set_epi64x(ah1, al1));
-
- _mm_store_si128((__m128i *) &l0[idx0 & 0x1FFFF0], _mm_xor_si128(bx0, cx0));
- _mm_store_si128((__m128i *) &l1[idx1 & 0x1FFFF0], _mm_xor_si128(bx1, cx1));
-
- idx0 = EXTRACT64(cx0);
- idx1 = EXTRACT64(cx1);
-
- bx0 = cx0;
- bx1 = cx1;
-
- uint64_t hi, lo, cl, ch;
- cl = ((uint64_t*) &l0[idx0 & 0x1FFFF0])[0];
- ch = ((uint64_t*) &l0[idx0 & 0x1FFFF0])[1];
- lo = _umul128(idx0, cl, &hi);
-
- al0 += hi;
- ah0 += lo;
-
- ((uint64_t*) &l0[idx0 & 0x1FFFF0])[0] = al0;
- ((uint64_t*) &l0[idx0 & 0x1FFFF0])[1] = ah0;
-
- ah0 ^= ch;
- al0 ^= cl;
- idx0 = al0;
-
- cl = ((uint64_t*) &l1[idx1 & 0x1FFFF0])[0];
- ch = ((uint64_t*) &l1[idx1 & 0x1FFFF0])[1];
- lo = _umul128(idx1, cl, &hi);
-
- al1 += hi;
- ah1 += lo;
-
- ((uint64_t*) &l1[idx1 & 0x1FFFF0])[0] = al1;
- ((uint64_t*) &l1[idx1 & 0x1FFFF0])[1] = ah1;
-
- ah1 ^= ch;
- al1 ^= cl;
- idx1 = al1;
- }
-
- cn_implode_scratchpad((__m128i*) l0, (__m128i*) h0);
- cn_implode_scratchpad((__m128i*) l1, (__m128i*) h1);
-
- keccakf(h0, 24);
- keccakf(h1, 24);
-
- extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
- extra_hashes[ctx->state1[0] & 3](ctx->state1, 200, (char*) output + 32);
-}
diff --git a/algo/cryptonight/cryptonight_av3_softaes.c b/algo/cryptonight/cryptonight_av3_softaes.c
deleted file mode 100644
index 22be894d..00000000
--- a/algo/cryptonight/cryptonight_av3_softaes.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#include
-#include
-
-#include "cryptonight.h"
-#include "cryptonight_softaes.h"
-#include "crypto/c_keccak.h"
-
-
-void cryptonight_av3_softaes(const void *restrict input, size_t size, void *restrict output, struct cryptonight_ctx *restrict ctx)
-{
- keccak((const uint8_t *) input, size, ctx->state0, 200);
-
- cn_explode_scratchpad((__m128i*) ctx->state0, (__m128i*) ctx->memory);
-
- const uint8_t* l0 = ctx->memory;
- uint64_t* h0 = (uint64_t*) ctx->state0;
-
- uint64_t al0 = h0[0] ^ h0[4];
- uint64_t ah0 = h0[1] ^ h0[5];
- __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
-
- uint64_t idx0 = h0[0] ^ h0[4];
-
- for (size_t i = 0; __builtin_expect(i < 0x80000, 1); i++) {
- __m128i cx;
- cx = _mm_load_si128((__m128i *)&l0[idx0 & 0x1FFFF0]);
- cx = soft_aesenc(cx, _mm_set_epi64x(ah0, al0));
-
- _mm_store_si128((__m128i *)&l0[idx0 & 0x1FFFF0], _mm_xor_si128(bx0, cx));
- idx0 = EXTRACT64(cx);
- bx0 = cx;
-
- uint64_t hi, lo, cl, ch;
- cl = ((uint64_t*)&l0[idx0 & 0x1FFFF0])[0];
- ch = ((uint64_t*)&l0[idx0 & 0x1FFFF0])[1];
- lo = _umul128(idx0, cl, &hi);
-
- al0 += hi;
- ah0 += lo;
-
- ((uint64_t*)&l0[idx0 & 0x1FFFF0])[0] = al0;
- ((uint64_t*)&l0[idx0 & 0x1FFFF0])[1] = ah0;
-
- ah0 ^= ch;
- al0 ^= cl;
- idx0 = al0;
- }
-
- cn_implode_scratchpad((__m128i*) ctx->memory, (__m128i*) ctx->state0);
-
- keccakf(h0, 24);
- extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
-}
diff --git a/algo/cryptonight/cryptonight_av4_softaes_double.c b/algo/cryptonight/cryptonight_av4_softaes_double.c
deleted file mode 100644
index afd4bebe..00000000
--- a/algo/cryptonight/cryptonight_av4_softaes_double.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#include
-#include
-
-#include "cryptonight.h"
-#include "cryptonight_softaes.h"
-#include "crypto/c_keccak.h"
-
-
-void cryptonight_av4_softaes_double(const void *restrict input, size_t size, void *restrict output, struct cryptonight_ctx *restrict ctx)
-{
- keccak((const uint8_t *) input, size, ctx->state0, 200);
- keccak((const uint8_t *) input + size, size, ctx->state1, 200);
-
- const uint8_t* l0 = ctx->memory;
- const uint8_t* l1 = ctx->memory + MEMORY;
- uint64_t* h0 = (uint64_t*) ctx->state0;
- uint64_t* h1 = (uint64_t*) ctx->state1;
-
- cn_explode_scratchpad((__m128i*) h0, (__m128i*) l0);
- cn_explode_scratchpad((__m128i*) h1, (__m128i*) l1);
-
- uint64_t al0 = h0[0] ^ h0[4];
- uint64_t al1 = h1[0] ^ h1[4];
- uint64_t ah0 = h0[1] ^ h0[5];
- uint64_t ah1 = h1[1] ^ h1[5];
-
- __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
- __m128i bx1 = _mm_set_epi64x(h1[3] ^ h1[7], h1[2] ^ h1[6]);
-
- uint64_t idx0 = h0[0] ^ h0[4];
- uint64_t idx1 = h1[0] ^ h1[4];
-
- for (size_t i = 0; __builtin_expect(i < 0x80000, 1); i++) {
- __m128i cx0 = _mm_load_si128((__m128i *) &l0[idx0 & 0x1FFFF0]);
- __m128i cx1 = _mm_load_si128((__m128i *) &l1[idx1 & 0x1FFFF0]);
-
- cx0 = soft_aesenc(cx0, _mm_set_epi64x(ah0, al0));
- cx1 = soft_aesenc(cx1, _mm_set_epi64x(ah1, al1));
-
- _mm_store_si128((__m128i *) &l0[idx0 & 0x1FFFF0], _mm_xor_si128(bx0, cx0));
- _mm_store_si128((__m128i *) &l1[idx1 & 0x1FFFF0], _mm_xor_si128(bx1, cx1));
-
- idx0 = EXTRACT64(cx0);
- idx1 = EXTRACT64(cx1);
-
- bx0 = cx0;
- bx1 = cx1;
-
- uint64_t hi, lo, cl, ch;
- cl = ((uint64_t*) &l0[idx0 & 0x1FFFF0])[0];
- ch = ((uint64_t*) &l0[idx0 & 0x1FFFF0])[1];
- lo = _umul128(idx0, cl, &hi);
-
- al0 += hi;
- ah0 += lo;
-
- ((uint64_t*) &l0[idx0 & 0x1FFFF0])[0] = al0;
- ((uint64_t*) &l0[idx0 & 0x1FFFF0])[1] = ah0;
-
- ah0 ^= ch;
- al0 ^= cl;
- idx0 = al0;
-
- cl = ((uint64_t*) &l1[idx1 & 0x1FFFF0])[0];
- ch = ((uint64_t*) &l1[idx1 & 0x1FFFF0])[1];
- lo = _umul128(idx1, cl, &hi);
-
- al1 += hi;
- ah1 += lo;
-
- ((uint64_t*) &l1[idx1 & 0x1FFFF0])[0] = al1;
- ((uint64_t*) &l1[idx1 & 0x1FFFF0])[1] = ah1;
-
- ah1 ^= ch;
- al1 ^= cl;
- idx1 = al1;
- }
-
- cn_implode_scratchpad((__m128i*) l0, (__m128i*) h0);
- cn_implode_scratchpad((__m128i*) l1, (__m128i*) h1);
-
- keccakf(h0, 24);
- keccakf(h1, 24);
-
- extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
- extra_hashes[ctx->state1[0] & 3](ctx->state1, 200, (char*) output + 32);
-}
diff --git a/algo/cryptonight/cryptonight_softaes.h b/algo/cryptonight/cryptonight_softaes.h
deleted file mode 100644
index f12ab8c6..00000000
--- a/algo/cryptonight/cryptonight_softaes.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* XMRig
- * Copyright 2010 Jeff Garzik
- * Copyright 2012-2014 pooler
- * Copyright 2014 Lucas Jones
- * Copyright 2014-2016 Wolf9466
- * Copyright 2016 Jay D Dee
- * Copyright 2017 fireice-uk
- * Copyright 2016-2017 XMRig
- *
- *
- * 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 3 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, see .
- */
-
-#ifndef __CRYPTONIGHT_SOFTAES_H__
-#define __CRYPTONIGHT_SOFTAES_H__
-
-#include
-
-extern __m128i soft_aesenc(__m128i in, __m128i key);
-extern __m128i soft_aeskeygenassist(__m128i key, uint8_t rcon);
-
-
-// This will shift and xor tmp1 into itself as 4 32-bit vals such as
-// sl_xor(a1 a2 a3 a4) = a1 (a2^a1) (a3^a2^a1) (a4^a3^a2^a1)
-static inline __m128i sl_xor(__m128i tmp1)
-{
- __m128i tmp4;
- tmp4 = _mm_slli_si128(tmp1, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- tmp4 = _mm_slli_si128(tmp4, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- tmp4 = _mm_slli_si128(tmp4, 0x04);
- tmp1 = _mm_xor_si128(tmp1, tmp4);
- return tmp1;
-}
-
-
-static inline void aes_genkey_sub(__m128i* xout0, __m128i* xout2, uint8_t rcon)
-{
- __m128i xout1 = soft_aeskeygenassist(*xout2, rcon);
- xout1 = _mm_shuffle_epi32(xout1, 0xFF); // see PSHUFD, set all elems to 4th elem
- *xout0 = sl_xor(*xout0);
- *xout0 = _mm_xor_si128(*xout0, xout1);
- xout1 = soft_aeskeygenassist(*xout0, 0x00);
- xout1 = _mm_shuffle_epi32(xout1, 0xAA); // see PSHUFD, set all elems to 3rd elem
- *xout2 = sl_xor(*xout2);
- *xout2 = _mm_xor_si128(*xout2, xout1);
-}
-
-
-static inline void aes_round(__m128i key, __m128i* x0, __m128i* x1, __m128i* x2, __m128i* x3, __m128i* x4, __m128i* x5, __m128i* x6, __m128i* x7)
-{
- *x0 = soft_aesenc(*x0, key);
- *x1 = soft_aesenc(*x1, key);
- *x2 = soft_aesenc(*x2, key);
- *x3 = soft_aesenc(*x3, key);
- *x4 = soft_aesenc(*x4, key);
- *x5 = soft_aesenc(*x5, key);
- *x6 = soft_aesenc(*x6, key);
- *x7 = soft_aesenc(*x7, key);
-}
-
-
-static inline void aes_genkey(const __m128i* memory, __m128i* k0, __m128i* k1, __m128i* k2, __m128i* k3, __m128i* k4, __m128i* k5, __m128i* k6, __m128i* k7, __m128i* k8, __m128i* k9)
-{
- __m128i xout0 = _mm_load_si128(memory);
- __m128i xout2 = _mm_load_si128(memory + 1);
- *k0 = xout0;
- *k1 = xout2;
-
- aes_genkey_sub(&xout0, &xout2, 0x1);
- *k2 = xout0;
- *k3 = xout2;
-
- aes_genkey_sub(&xout0, &xout2, 0x2);
- *k4 = xout0;
- *k5 = xout2;
-
- aes_genkey_sub(&xout0, &xout2, 0x4);
- *k6 = xout0;
- *k7 = xout2;
-
- aes_genkey_sub(&xout0, &xout2, 0x8);
- *k8 = xout0;
- *k9 = xout2;
-}
-
-
-static inline void cn_explode_scratchpad(const __m128i* input, __m128i* output)
-{
- // This is more than we have registers, compiler will assign 2 keys on the stack
- __m128i xin0, xin1, xin2, xin3, xin4, xin5, xin6, xin7;
- __m128i k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-
- aes_genkey(input, &k0, &k1, &k2, &k3, &k4, &k5, &k6, &k7, &k8, &k9);
-
- xin0 = _mm_load_si128(input + 4);
- xin1 = _mm_load_si128(input + 5);
- xin2 = _mm_load_si128(input + 6);
- xin3 = _mm_load_si128(input + 7);
- xin4 = _mm_load_si128(input + 8);
- xin5 = _mm_load_si128(input + 9);
- xin6 = _mm_load_si128(input + 10);
- xin7 = _mm_load_si128(input + 11);
-
- for (size_t i = 0; i < MEMORY / sizeof(__m128i); i += 8) {
- aes_round(k0, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k1, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k2, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k3, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k4, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k5, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k6, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k7, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k8, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
- aes_round(k9, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
-
- _mm_store_si128(output + i + 0, xin0);
- _mm_store_si128(output + i + 1, xin1);
- _mm_store_si128(output + i + 2, xin2);
- _mm_store_si128(output + i + 3, xin3);
- _mm_store_si128(output + i + 4, xin4);
- _mm_store_si128(output + i + 5, xin5);
- _mm_store_si128(output + i + 6, xin6);
- _mm_store_si128(output + i + 7, xin7);
- }
-}
-
-
-static inline void cn_implode_scratchpad(const __m128i* input, __m128i* output)
-{
- // This is more than we have registers, compiler will assign 2 keys on the stack
- __m128i xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7;
- __m128i k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-
- aes_genkey(output + 2, &k0, &k1, &k2, &k3, &k4, &k5, &k6, &k7, &k8, &k9);
-
- xout0 = _mm_load_si128(output + 4);
- xout1 = _mm_load_si128(output + 5);
- xout2 = _mm_load_si128(output + 6);
- xout3 = _mm_load_si128(output + 7);
- xout4 = _mm_load_si128(output + 8);
- xout5 = _mm_load_si128(output + 9);
- xout6 = _mm_load_si128(output + 10);
- xout7 = _mm_load_si128(output + 11);
-
- for (size_t i = 0; __builtin_expect(i < MEMORY / sizeof(__m128i), 1); i += 8)
- {
- xout0 = _mm_xor_si128(_mm_load_si128(input + i + 0), xout0);
- xout1 = _mm_xor_si128(_mm_load_si128(input + i + 1), xout1);
- xout2 = _mm_xor_si128(_mm_load_si128(input + i + 2), xout2);
- xout3 = _mm_xor_si128(_mm_load_si128(input + i + 3), xout3);
- xout4 = _mm_xor_si128(_mm_load_si128(input + i + 4), xout4);
- xout5 = _mm_xor_si128(_mm_load_si128(input + i + 5), xout5);
- xout6 = _mm_xor_si128(_mm_load_si128(input + i + 6), xout6);
- xout7 = _mm_xor_si128(_mm_load_si128(input + i + 7), xout7);
-
- aes_round(k0, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k1, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k2, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k3, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k4, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k5, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k6, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- aes_round(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
- }
-
- _mm_store_si128(output + 4, xout0);
- _mm_store_si128(output + 5, xout1);
- _mm_store_si128(output + 6, xout2);
- _mm_store_si128(output + 7, xout3);
- _mm_store_si128(output + 8, xout4);
- _mm_store_si128(output + 9, xout5);
- _mm_store_si128(output + 10, xout6);
- _mm_store_si128(output + 11, xout7);
-}
-
-
-#if defined(__x86_64__)
-# define EXTRACT64(X) _mm_cvtsi128_si64(X)
-
-static inline uint64_t _umul128(uint64_t a, uint64_t b, uint64_t* hi)
-{
- unsigned __int128 r = (unsigned __int128) a * (unsigned __int128) b;
- *hi = r >> 64;
- return (uint64_t) r;
-}
-#elif defined(__i386__)
-# define HI32(X) \
- _mm_srli_si128((X), 4)
-
-
-# define EXTRACT64(X) \
- ((uint64_t)(uint32_t)_mm_cvtsi128_si32(X) | \
- ((uint64_t)(uint32_t)_mm_cvtsi128_si32(HI32(X)) << 32))
-
-inline uint64_t _umul128(uint64_t multiplier, uint64_t multiplicand, uint64_t *product_hi) {
- // multiplier = ab = a * 2^32 + b
- // multiplicand = cd = c * 2^32 + d
- // ab * cd = a * c * 2^64 + (a * d + b * c) * 2^32 + b * d
- uint64_t a = multiplier >> 32;
- uint64_t b = multiplier & 0xFFFFFFFF;
- uint64_t c = multiplicand >> 32;
- uint64_t d = multiplicand & 0xFFFFFFFF;
-
- //uint64_t ac = a * c;
- uint64_t ad = a * d;
- //uint64_t bc = b * c;
- uint64_t bd = b * d;
-
- uint64_t adbc = ad + (b * c);
- uint64_t adbc_carry = adbc < ad ? 1 : 0;
-
- // multiplier * multiplicand = product_hi * 2^64 + product_lo
- uint64_t product_lo = bd + (adbc << 32);
- uint64_t product_lo_carry = product_lo < bd ? 1 : 0;
- *product_hi = (a * c) + (adbc >> 32) + (adbc_carry << 32) + product_lo_carry;
-
- return product_lo;
-}
-#endif
-
-
-#endif /* __CRYPTONIGHT_SOFTAES_H__ */
diff --git a/cmake/FindMHD.cmake b/cmake/FindMHD.cmake
new file mode 100644
index 00000000..8505b337
--- /dev/null
+++ b/cmake/FindMHD.cmake
@@ -0,0 +1,39 @@
+# - Try to find MHD
+# Once done this will define
+#
+# MHD_FOUND - system has MHD
+# MHD_INCLUDE_DIRS - the MHD include directory
+# MHD_LIBRARY - Link these to use MHD
+
+find_path(
+ MHD_INCLUDE_DIR
+ NAMES microhttpd.h
+ DOC "microhttpd include dir"
+)
+
+find_library(
+ MHD_LIBRARY
+ NAMES microhttpd microhttpd-10 libmicrohttpd libmicrohttpd-dll
+ DOC "microhttpd library"
+)
+
+set(MHD_INCLUDE_DIRS ${MHD_INCLUDE_DIR})
+set(MHD_LIBRARIES ${MHD_LIBRARY})
+
+# debug library on windows
+# same naming convention as in qt (appending debug library with d)
+# boost is using the same "hack" as us with "optimized" and "debug"
+# official MHD project actually uses _d suffix
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
+ find_library(
+ MHD_LIBRARY_DEBUG
+ NAMES microhttpd_d microhttpd-10_d libmicrohttpd_d libmicrohttpd-dll_d
+ DOC "mhd debug library"
+ )
+ set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(mhd DEFAULT_MSG MHD_INCLUDE_DIR MHD_LIBRARY)
+mark_as_advanced(MHD_INCLUDE_DIR MHD_LIBRARY)
+
diff --git a/cmake/FindUV.cmake b/cmake/FindUV.cmake
new file mode 100644
index 00000000..e3c22d28
--- /dev/null
+++ b/cmake/FindUV.cmake
@@ -0,0 +1,8 @@
+find_path(UV_INCLUDE_DIR NAMES uv.h)
+find_library(UV_LIBRARY NAMES uv libuv)
+
+set(UV_LIBRARIES ${UV_LIBRARY})
+set(UV_INCLUDE_DIRS ${UV_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(UV DEFAULT_MSG UV_LIBRARY UV_INCLUDE_DIR)
diff --git a/compat/jansson/CMakeLists.txt b/compat/jansson/CMakeLists.txt
deleted file mode 100644
index 7bd74c67..00000000
--- a/compat/jansson/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.8)
-project (jansson C)
-
-add_definitions(-DHAVE_CONFIG_H)
-
-# Add the lib sources.
-file(GLOB JANSSON_SRC *.c)
-
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os")
-
-set(JANSSON_HDR_PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/hashtable.h
- ${CMAKE_CURRENT_SOURCE_DIR}/jansson_private.h
- ${CMAKE_CURRENT_SOURCE_DIR}/strbuffer.h
- ${CMAKE_CURRENT_SOURCE_DIR}/utf.h
- ${CMAKE_CURRENT_SOURCE_DIR}/jansson_private_config.h)
-
-set(JANSSON_HDR_PUBLIC
- ${CMAKE_CURRENT_SOURCE_DIR}/jansson_config.h
- ${CMAKE_CURRENT_SOURCE_DIR}/jansson.h)
-
-add_library(jansson STATIC
- ${JANSSON_SRC}
- ${JANSSON_HDR_PRIVATE}
- ${JANSSON_HDR_PUBLIC})
diff --git a/compat/jansson/LICENSE b/compat/jansson/LICENSE
deleted file mode 100644
index 8ae43e02..00000000
--- a/compat/jansson/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2009-2014 Petri Lehtinen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 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.
diff --git a/compat/jansson/dump.c b/compat/jansson/dump.c
deleted file mode 100644
index a23fabb7..00000000
--- a/compat/jansson/dump.c
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include "jansson_private.h"
-
-#include
-#include
-#include
-#include
-#ifdef HAVE_UNISTD_H
-#include
-#endif
-
-#include "jansson.h"
-#include "strbuffer.h"
-#include "utf.h"
-
-#define MAX_INTEGER_STR_LENGTH 100
-#define MAX_REAL_STR_LENGTH 100
-
-#define FLAGS_TO_INDENT(f) ((f) & 0x1F)
-#define FLAGS_TO_PRECISION(f) (((f) >> 11) & 0x1F)
-
-struct buffer {
- const size_t size;
- size_t used;
- char *data;
-};
-
-static int dump_to_strbuffer(const char *buffer, size_t size, void *data)
-{
- return strbuffer_append_bytes((strbuffer_t *)data, buffer, size);
-}
-
-static int dump_to_buffer(const char *buffer, size_t size, void *data)
-{
- struct buffer *buf = (struct buffer *)data;
-
- if(buf->used + size <= buf->size)
- memcpy(&buf->data[buf->used], buffer, size);
-
- buf->used += size;
- return 0;
-}
-
-static int dump_to_file(const char *buffer, size_t size, void *data)
-{
- FILE *dest = (FILE *)data;
- if(fwrite(buffer, size, 1, dest) != 1)
- return -1;
- return 0;
-}
-
-static int dump_to_fd(const char *buffer, size_t size, void *data)
-{
- int *dest = (int *)data;
-#ifdef HAVE_UNISTD_H
- if(write(*dest, buffer, size) == (ssize_t)size)
- return 0;
-#endif
- return -1;
-}
-
-/* 32 spaces (the maximum indentation size) */
-static const char whitespace[] = " ";
-
-static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t dump, void *data)
-{
- if(FLAGS_TO_INDENT(flags) > 0)
- {
- unsigned int ws_count = FLAGS_TO_INDENT(flags), n_spaces = depth * ws_count;
-
- if(dump("\n", 1, data))
- return -1;
-
- while(n_spaces > 0)
- {
- int cur_n = n_spaces < sizeof whitespace - 1 ? n_spaces : sizeof whitespace - 1;
-
- if(dump(whitespace, cur_n, data))
- return -1;
-
- n_spaces -= cur_n;
- }
- }
- else if(space && !(flags & JSON_COMPACT))
- {
- return dump(" ", 1, data);
- }
- return 0;
-}
-
-static int dump_string(const char *str, size_t len, json_dump_callback_t dump, void *data, size_t flags)
-{
- const char *pos, *end, *lim;
- int32_t codepoint;
-
- if(dump("\"", 1, data))
- return -1;
-
- end = pos = str;
- lim = str + len;
- while(1)
- {
- const char *text;
- char seq[13];
- int length;
-
- while(end < lim)
- {
- end = utf8_iterate(pos, lim - pos, &codepoint);
- if(!end)
- return -1;
-
- /* mandatory escape or control char */
- if(codepoint == '\\' || codepoint == '"' || codepoint < 0x20)
- break;
-
- /* slash */
- if((flags & JSON_ESCAPE_SLASH) && codepoint == '/')
- break;
-
- /* non-ASCII */
- if((flags & JSON_ENSURE_ASCII) && codepoint > 0x7F)
- break;
-
- pos = end;
- }
-
- if(pos != str) {
- if(dump(str, pos - str, data))
- return -1;
- }
-
- if(end == pos)
- break;
-
- /* handle \, /, ", and control codes */
- length = 2;
- switch(codepoint)
- {
- case '\\': text = "\\\\"; break;
- case '\"': text = "\\\""; break;
- case '\b': text = "\\b"; break;
- case '\f': text = "\\f"; break;
- case '\n': text = "\\n"; break;
- case '\r': text = "\\r"; break;
- case '\t': text = "\\t"; break;
- case '/': text = "\\/"; break;
- default:
- {
- /* codepoint is in BMP */
- if(codepoint < 0x10000)
- {
- snprintf(seq, sizeof(seq), "\\u%04X", (unsigned int)codepoint);
- length = 6;
- }
-
- /* not in BMP -> construct a UTF-16 surrogate pair */
- else
- {
- int32_t first, last;
-
- codepoint -= 0x10000;
- first = 0xD800 | ((codepoint & 0xffc00) >> 10);
- last = 0xDC00 | (codepoint & 0x003ff);
-
- snprintf(seq, sizeof(seq), "\\u%04X\\u%04X", (unsigned int)first, (unsigned int)last);
- length = 12;
- }
-
- text = seq;
- break;
- }
- }
-
- if(dump(text, length, data))
- return -1;
-
- str = pos = end;
- }
-
- return dump("\"", 1, data);
-}
-
-static int compare_keys(const void *key1, const void *key2)
-{
- return strcmp(*(const char **)key1, *(const char **)key2);
-}
-
-static int do_dump(const json_t *json, size_t flags, int depth,
- json_dump_callback_t dump, void *data)
-{
- int embed = flags & JSON_EMBED;
-
- flags &= ~JSON_EMBED;
-
- if(!json)
- return -1;
-
- switch(json_typeof(json)) {
- case JSON_NULL:
- return dump("null", 4, data);
-
- case JSON_TRUE:
- return dump("true", 4, data);
-
- case JSON_FALSE:
- return dump("false", 5, data);
-
- case JSON_INTEGER:
- {
- char buffer[MAX_INTEGER_STR_LENGTH];
- int size;
-
- size = snprintf(buffer, MAX_INTEGER_STR_LENGTH,
- "%" JSON_INTEGER_FORMAT,
- json_integer_value(json));
- if(size < 0 || size >= MAX_INTEGER_STR_LENGTH)
- return -1;
-
- return dump(buffer, size, data);
- }
-
- case JSON_REAL:
- {
- char buffer[MAX_REAL_STR_LENGTH];
- int size;
- double value = json_real_value(json);
-
- size = jsonp_dtostr(buffer, MAX_REAL_STR_LENGTH, value,
- FLAGS_TO_PRECISION(flags));
- if(size < 0)
- return -1;
-
- return dump(buffer, size, data);
- }
-
- case JSON_STRING:
- return dump_string(json_string_value(json), json_string_length(json), dump, data, flags);
-
- case JSON_ARRAY:
- {
- size_t n;
- size_t i;
-
- json_array_t *array;
-
- /* detect circular references */
- array = json_to_array(json);
- if(array->visited)
- goto array_error;
- array->visited = 1;
-
- n = json_array_size(json);
-
- if(!embed && dump("[", 1, data))
- goto array_error;
- if(n == 0) {
- array->visited = 0;
- return embed ? 0 : dump("]", 1, data);
- }
- if(dump_indent(flags, depth + 1, 0, dump, data))
- goto array_error;
-
- for(i = 0; i < n; ++i) {
- if(do_dump(json_array_get(json, i), flags, depth + 1,
- dump, data))
- goto array_error;
-
- if(i < n - 1)
- {
- if(dump(",", 1, data) ||
- dump_indent(flags, depth + 1, 1, dump, data))
- goto array_error;
- }
- else
- {
- if(dump_indent(flags, depth, 0, dump, data))
- goto array_error;
- }
- }
-
- array->visited = 0;
- return embed ? 0 : dump("]", 1, data);
-
- array_error:
- array->visited = 0;
- return -1;
- }
-
- case JSON_OBJECT:
- {
- json_object_t *object;
- void *iter;
- const char *separator;
- int separator_length;
-
- if(flags & JSON_COMPACT) {
- separator = ":";
- separator_length = 1;
- }
- else {
- separator = ": ";
- separator_length = 2;
- }
-
- /* detect circular references */
- object = json_to_object(json);
- if(object->visited)
- goto object_error;
- object->visited = 1;
-
- iter = json_object_iter((json_t *)json);
-
- if(!embed && dump("{", 1, data))
- goto object_error;
- if(!iter) {
- object->visited = 0;
- return embed ? 0 : dump("}", 1, data);
- }
- if(dump_indent(flags, depth + 1, 0, dump, data))
- goto object_error;
-
- if(flags & JSON_SORT_KEYS)
- {
- const char **keys;
- size_t size, i;
-
- size = json_object_size(json);
- keys = jsonp_malloc(size * sizeof(const char *));
- if(!keys)
- goto object_error;
-
- i = 0;
- while(iter)
- {
- keys[i] = json_object_iter_key(iter);
- iter = json_object_iter_next((json_t *)json, iter);
- i++;
- }
- assert(i == size);
-
- qsort(keys, size, sizeof(const char *), compare_keys);
-
- for(i = 0; i < size; i++)
- {
- const char *key;
- json_t *value;
-
- key = keys[i];
- value = json_object_get(json, key);
- assert(value);
-
- dump_string(key, strlen(key), dump, data, flags);
- if(dump(separator, separator_length, data) ||
- do_dump(value, flags, depth + 1, dump, data))
- {
- jsonp_free(keys);
- goto object_error;
- }
-
- if(i < size - 1)
- {
- if(dump(",", 1, data) ||
- dump_indent(flags, depth + 1, 1, dump, data))
- {
- jsonp_free(keys);
- goto object_error;
- }
- }
- else
- {
- if(dump_indent(flags, depth, 0, dump, data))
- {
- jsonp_free(keys);
- goto object_error;
- }
- }
- }
-
- jsonp_free(keys);
- }
- else
- {
- /* Don't sort keys */
-
- while(iter)
- {
- void *next = json_object_iter_next((json_t *)json, iter);
- const char *key = json_object_iter_key(iter);
-
- dump_string(key, strlen(key), dump, data, flags);
- if(dump(separator, separator_length, data) ||
- do_dump(json_object_iter_value(iter), flags, depth + 1,
- dump, data))
- goto object_error;
-
- if(next)
- {
- if(dump(",", 1, data) ||
- dump_indent(flags, depth + 1, 1, dump, data))
- goto object_error;
- }
- else
- {
- if(dump_indent(flags, depth, 0, dump, data))
- goto object_error;
- }
-
- iter = next;
- }
- }
-
- object->visited = 0;
- return embed ? 0 : dump("}", 1, data);
-
- object_error:
- object->visited = 0;
- return -1;
- }
-
- default:
- /* not reached */
- return -1;
- }
-}
-
-char *json_dumps(const json_t *json, size_t flags)
-{
- strbuffer_t strbuff;
- char *result;
-
- if(strbuffer_init(&strbuff))
- return NULL;
-
- if(json_dump_callback(json, dump_to_strbuffer, (void *)&strbuff, flags))
- result = NULL;
- else
- result = jsonp_strdup(strbuffer_value(&strbuff));
-
- strbuffer_close(&strbuff);
- return result;
-}
-
-size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags)
-{
- struct buffer buf = { size, 0, buffer };
-
- if(json_dump_callback(json, dump_to_buffer, (void *)&buf, flags))
- return 0;
-
- return buf.used;
-}
-
-int json_dumpf(const json_t *json, FILE *output, size_t flags)
-{
- return json_dump_callback(json, dump_to_file, (void *)output, flags);
-}
-
-int json_dumpfd(const json_t *json, int output, size_t flags)
-{
- return json_dump_callback(json, dump_to_fd, (void *)&output, flags);
-}
-
-int json_dump_file(const json_t *json, const char *path, size_t flags)
-{
- int result;
-
- FILE *output = fopen(path, "w");
- if(!output)
- return -1;
-
- result = json_dumpf(json, output, flags);
-
- fclose(output);
- return result;
-}
-
-int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags)
-{
- if(!(flags & JSON_ENCODE_ANY)) {
- if(!json_is_array(json) && !json_is_object(json))
- return -1;
- }
-
- return do_dump(json, flags, 0, callback, data);
-}
diff --git a/compat/jansson/error.c b/compat/jansson/error.c
deleted file mode 100644
index 58c83790..00000000
--- a/compat/jansson/error.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include
-#include "jansson_private.h"
-
-void jsonp_error_init(json_error_t *error, const char *source)
-{
- if(error)
- {
- error->text[0] = '\0';
- error->line = -1;
- error->column = -1;
- error->position = 0;
- if(source)
- jsonp_error_set_source(error, source);
- else
- error->source[0] = '\0';
- }
-}
-
-void jsonp_error_set_source(json_error_t *error, const char *source)
-{
- size_t length;
-
- if(!error || !source)
- return;
-
- length = strlen(source);
- if(length < JSON_ERROR_SOURCE_LENGTH)
- strncpy(error->source, source, length + 1);
- else {
- size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
- strncpy(error->source, "...", 3);
- strncpy(error->source + 3, source + extra, length - extra + 1);
- }
-}
-
-void jsonp_error_set(json_error_t *error, int line, int column,
- size_t position, const char *msg, ...)
-{
- va_list ap;
-
- va_start(ap, msg);
- jsonp_error_vset(error, line, column, position, msg, ap);
- va_end(ap);
-}
-
-void jsonp_error_vset(json_error_t *error, int line, int column,
- size_t position, const char *msg, va_list ap)
-{
- if(!error)
- return;
-
- if(error->text[0] != '\0') {
- /* error already set */
- return;
- }
-
- error->line = line;
- error->column = column;
- error->position = (int)position;
-
- vsnprintf(error->text, JSON_ERROR_TEXT_LENGTH, msg, ap);
- error->text[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
-}
diff --git a/compat/jansson/hashtable.c b/compat/jansson/hashtable.c
deleted file mode 100644
index c819319a..00000000
--- a/compat/jansson/hashtable.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#if HAVE_CONFIG_H
-#include
-#endif
-
-#include
-#include
-
-#if HAVE_STDINT_H
-#include
-#endif
-
-#include /* for JSON_INLINE */
-#include "jansson_private.h" /* for container_of() */
-#include "hashtable.h"
-
-#ifndef INITIAL_HASHTABLE_ORDER
-#define INITIAL_HASHTABLE_ORDER 3
-#endif
-
-typedef struct hashtable_list list_t;
-typedef struct hashtable_pair pair_t;
-typedef struct hashtable_bucket bucket_t;
-
-extern volatile uint32_t hashtable_seed;
-
-/* Implementation of the hash function */
-#include "lookup3.h"
-
-#define list_to_pair(list_) container_of(list_, pair_t, list)
-#define ordered_list_to_pair(list_) container_of(list_, pair_t, ordered_list)
-#define hash_str(key) ((size_t)hashlittle((key), strlen(key), hashtable_seed))
-
-static JSON_INLINE void list_init(list_t *list)
-{
- list->next = list;
- list->prev = list;
-}
-
-static JSON_INLINE void list_insert(list_t *list, list_t *node)
-{
- node->next = list;
- node->prev = list->prev;
- list->prev->next = node;
- list->prev = node;
-}
-
-static JSON_INLINE void list_remove(list_t *list)
-{
- list->prev->next = list->next;
- list->next->prev = list->prev;
-}
-
-static JSON_INLINE int bucket_is_empty(hashtable_t *hashtable, bucket_t *bucket)
-{
- return bucket->first == &hashtable->list && bucket->first == bucket->last;
-}
-
-static void insert_to_bucket(hashtable_t *hashtable, bucket_t *bucket,
- list_t *list)
-{
- if(bucket_is_empty(hashtable, bucket))
- {
- list_insert(&hashtable->list, list);
- bucket->first = bucket->last = list;
- }
- else
- {
- list_insert(bucket->first, list);
- bucket->first = list;
- }
-}
-
-static pair_t *hashtable_find_pair(hashtable_t *hashtable, bucket_t *bucket,
- const char *key, size_t hash)
-{
- list_t *list;
- pair_t *pair;
-
- if(bucket_is_empty(hashtable, bucket))
- return NULL;
-
- list = bucket->first;
- while(1)
- {
- pair = list_to_pair(list);
- if(pair->hash == hash && strcmp(pair->key, key) == 0)
- return pair;
-
- if(list == bucket->last)
- break;
-
- list = list->next;
- }
-
- return NULL;
-}
-
-/* returns 0 on success, -1 if key was not found */
-static int hashtable_do_del(hashtable_t *hashtable,
- const char *key, size_t hash)
-{
- pair_t *pair;
- bucket_t *bucket;
- size_t index;
-
- index = hash & hashmask(hashtable->order);
- bucket = &hashtable->buckets[index];
-
- pair = hashtable_find_pair(hashtable, bucket, key, hash);
- if(!pair)
- return -1;
-
- if(&pair->list == bucket->first && &pair->list == bucket->last)
- bucket->first = bucket->last = &hashtable->list;
-
- else if(&pair->list == bucket->first)
- bucket->first = pair->list.next;
-
- else if(&pair->list == bucket->last)
- bucket->last = pair->list.prev;
-
- list_remove(&pair->list);
- list_remove(&pair->ordered_list);
- json_decref(pair->value);
-
- jsonp_free(pair);
- hashtable->size--;
-
- return 0;
-}
-
-static void hashtable_do_clear(hashtable_t *hashtable)
-{
- list_t *list, *next;
- pair_t *pair;
-
- for(list = hashtable->list.next; list != &hashtable->list; list = next)
- {
- next = list->next;
- pair = list_to_pair(list);
- json_decref(pair->value);
- jsonp_free(pair);
- }
-}
-
-static int hashtable_do_rehash(hashtable_t *hashtable)
-{
- list_t *list, *next;
- pair_t *pair;
- size_t i, index, new_size, new_order;
- struct hashtable_bucket *new_buckets;
-
- new_order = hashtable->order + 1;
- new_size = hashsize(new_order);
-
- new_buckets = jsonp_malloc(new_size * sizeof(bucket_t));
- if(!new_buckets)
- return -1;
-
- jsonp_free(hashtable->buckets);
- hashtable->buckets = new_buckets;
- hashtable->order = new_order;
-
- for(i = 0; i < hashsize(hashtable->order); i++)
- {
- hashtable->buckets[i].first = hashtable->buckets[i].last =
- &hashtable->list;
- }
-
- list = hashtable->list.next;
- list_init(&hashtable->list);
-
- for(; list != &hashtable->list; list = next) {
- next = list->next;
- pair = list_to_pair(list);
- index = pair->hash % new_size;
- insert_to_bucket(hashtable, &hashtable->buckets[index], &pair->list);
- }
-
- return 0;
-}
-
-
-int hashtable_init(hashtable_t *hashtable)
-{
- size_t i;
-
- hashtable->size = 0;
- hashtable->order = INITIAL_HASHTABLE_ORDER;
- hashtable->buckets = jsonp_malloc(hashsize(hashtable->order) * sizeof(bucket_t));
- if(!hashtable->buckets)
- return -1;
-
- list_init(&hashtable->list);
- list_init(&hashtable->ordered_list);
-
- for(i = 0; i < hashsize(hashtable->order); i++)
- {
- hashtable->buckets[i].first = hashtable->buckets[i].last =
- &hashtable->list;
- }
-
- return 0;
-}
-
-void hashtable_close(hashtable_t *hashtable)
-{
- hashtable_do_clear(hashtable);
- jsonp_free(hashtable->buckets);
-}
-
-int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value)
-{
- pair_t *pair;
- bucket_t *bucket;
- size_t hash, index;
-
- /* rehash if the load ratio exceeds 1 */
- if(hashtable->size >= hashsize(hashtable->order))
- if(hashtable_do_rehash(hashtable))
- return -1;
-
- hash = hash_str(key);
- index = hash & hashmask(hashtable->order);
- bucket = &hashtable->buckets[index];
- pair = hashtable_find_pair(hashtable, bucket, key, hash);
-
- if(pair)
- {
- json_decref(pair->value);
- pair->value = value;
- }
- else
- {
- /* offsetof(...) returns the size of pair_t without the last,
- flexible member. This way, the correct amount is
- allocated. */
-
- size_t len = strlen(key);
- if(len >= (size_t)-1 - offsetof(pair_t, key)) {
- /* Avoid an overflow if the key is very long */
- return -1;
- }
-
- pair = jsonp_malloc(offsetof(pair_t, key) + len + 1);
- if(!pair)
- return -1;
-
- pair->hash = hash;
- strncpy(pair->key, key, len + 1);
- pair->value = value;
- list_init(&pair->list);
- list_init(&pair->ordered_list);
-
- insert_to_bucket(hashtable, bucket, &pair->list);
- list_insert(&hashtable->ordered_list, &pair->ordered_list);
-
- hashtable->size++;
- }
- return 0;
-}
-
-void *hashtable_get(hashtable_t *hashtable, const char *key)
-{
- pair_t *pair;
- size_t hash;
- bucket_t *bucket;
-
- hash = hash_str(key);
- bucket = &hashtable->buckets[hash & hashmask(hashtable->order)];
-
- pair = hashtable_find_pair(hashtable, bucket, key, hash);
- if(!pair)
- return NULL;
-
- return pair->value;
-}
-
-int hashtable_del(hashtable_t *hashtable, const char *key)
-{
- size_t hash = hash_str(key);
- return hashtable_do_del(hashtable, key, hash);
-}
-
-void hashtable_clear(hashtable_t *hashtable)
-{
- size_t i;
-
- hashtable_do_clear(hashtable);
-
- for(i = 0; i < hashsize(hashtable->order); i++)
- {
- hashtable->buckets[i].first = hashtable->buckets[i].last =
- &hashtable->list;
- }
-
- list_init(&hashtable->list);
- list_init(&hashtable->ordered_list);
- hashtable->size = 0;
-}
-
-void *hashtable_iter(hashtable_t *hashtable)
-{
- return hashtable_iter_next(hashtable, &hashtable->ordered_list);
-}
-
-void *hashtable_iter_at(hashtable_t *hashtable, const char *key)
-{
- pair_t *pair;
- size_t hash;
- bucket_t *bucket;
-
- hash = hash_str(key);
- bucket = &hashtable->buckets[hash & hashmask(hashtable->order)];
-
- pair = hashtable_find_pair(hashtable, bucket, key, hash);
- if(!pair)
- return NULL;
-
- return &pair->ordered_list;
-}
-
-void *hashtable_iter_next(hashtable_t *hashtable, void *iter)
-{
- list_t *list = (list_t *)iter;
- if(list->next == &hashtable->ordered_list)
- return NULL;
- return list->next;
-}
-
-void *hashtable_iter_key(void *iter)
-{
- pair_t *pair = ordered_list_to_pair((list_t *)iter);
- return pair->key;
-}
-
-void *hashtable_iter_value(void *iter)
-{
- pair_t *pair = ordered_list_to_pair((list_t *)iter);
- return pair->value;
-}
-
-void hashtable_iter_set(void *iter, json_t *value)
-{
- pair_t *pair = ordered_list_to_pair((list_t *)iter);
-
- json_decref(pair->value);
- pair->value = value;
-}
diff --git a/compat/jansson/hashtable.h b/compat/jansson/hashtable.h
deleted file mode 100644
index d4c32ae0..00000000
--- a/compat/jansson/hashtable.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef HASHTABLE_H
-#define HASHTABLE_H
-
-#include
-#include "jansson.h"
-
-struct hashtable_list {
- struct hashtable_list *prev;
- struct hashtable_list *next;
-};
-
-/* "pair" may be a bit confusing a name, but think of it as a
- key-value pair. In this case, it just encodes some extra data,
- too */
-struct hashtable_pair {
- struct hashtable_list list;
- struct hashtable_list ordered_list;
- size_t hash;
- json_t *value;
- char key[1];
-};
-
-struct hashtable_bucket {
- struct hashtable_list *first;
- struct hashtable_list *last;
-};
-
-typedef struct hashtable {
- size_t size;
- struct hashtable_bucket *buckets;
- size_t order; /* hashtable has pow(2, order) buckets */
- struct hashtable_list list;
- struct hashtable_list ordered_list;
-} hashtable_t;
-
-
-#define hashtable_key_to_iter(key_) \
- (&(container_of(key_, struct hashtable_pair, key)->ordered_list))
-
-
-/**
- * hashtable_init - Initialize a hashtable object
- *
- * @hashtable: The (statically allocated) hashtable object
- *
- * Initializes a statically allocated hashtable object. The object
- * should be cleared with hashtable_close when it's no longer used.
- *
- * Returns 0 on success, -1 on error (out of memory).
- */
-int hashtable_init(hashtable_t *hashtable);
-
-/**
- * hashtable_close - Release all resources used by a hashtable object
- *
- * @hashtable: The hashtable
- *
- * Destroys a statically allocated hashtable object.
- */
-void hashtable_close(hashtable_t *hashtable);
-
-/**
- * hashtable_set - Add/modify value in hashtable
- *
- * @hashtable: The hashtable object
- * @key: The key
- * @serial: For addition order of keys
- * @value: The value
- *
- * If a value with the given key already exists, its value is replaced
- * with the new value. Value is "stealed" in the sense that hashtable
- * doesn't increment its refcount but decreases the refcount when the
- * value is no longer needed.
- *
- * Returns 0 on success, -1 on failure (out of memory).
- */
-int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value);
-
-/**
- * hashtable_get - Get a value associated with a key
- *
- * @hashtable: The hashtable object
- * @key: The key
- *
- * Returns value if it is found, or NULL otherwise.
- */
-void *hashtable_get(hashtable_t *hashtable, const char *key);
-
-/**
- * hashtable_del - Remove a value from the hashtable
- *
- * @hashtable: The hashtable object
- * @key: The key
- *
- * Returns 0 on success, or -1 if the key was not found.
- */
-int hashtable_del(hashtable_t *hashtable, const char *key);
-
-/**
- * hashtable_clear - Clear hashtable
- *
- * @hashtable: The hashtable object
- *
- * Removes all items from the hashtable.
- */
-void hashtable_clear(hashtable_t *hashtable);
-
-/**
- * hashtable_iter - Iterate over hashtable
- *
- * @hashtable: The hashtable object
- *
- * Returns an opaque iterator to the first element in the hashtable.
- * The iterator should be passed to hashtable_iter_* functions.
- * The hashtable items are not iterated over in any particular order.
- *
- * There's no need to free the iterator in any way. The iterator is
- * valid as long as the item that is referenced by the iterator is not
- * deleted. Other values may be added or deleted. In particular,
- * hashtable_iter_next() may be called on an iterator, and after that
- * the key/value pair pointed by the old iterator may be deleted.
- */
-void *hashtable_iter(hashtable_t *hashtable);
-
-/**
- * hashtable_iter_at - Return an iterator at a specific key
- *
- * @hashtable: The hashtable object
- * @key: The key that the iterator should point to
- *
- * Like hashtable_iter() but returns an iterator pointing to a
- * specific key.
- */
-void *hashtable_iter_at(hashtable_t *hashtable, const char *key);
-
-/**
- * hashtable_iter_next - Advance an iterator
- *
- * @hashtable: The hashtable object
- * @iter: The iterator
- *
- * Returns a new iterator pointing to the next element in the
- * hashtable or NULL if the whole hastable has been iterated over.
- */
-void *hashtable_iter_next(hashtable_t *hashtable, void *iter);
-
-/**
- * hashtable_iter_key - Retrieve the key pointed by an iterator
- *
- * @iter: The iterator
- */
-void *hashtable_iter_key(void *iter);
-
-/**
- * hashtable_iter_value - Retrieve the value pointed by an iterator
- *
- * @iter: The iterator
- */
-void *hashtable_iter_value(void *iter);
-
-/**
- * hashtable_iter_set - Set the value pointed by an iterator
- *
- * @iter: The iterator
- * @value: The value to set
- */
-void hashtable_iter_set(void *iter, json_t *value);
-
-#endif
diff --git a/compat/jansson/hashtable_seed.c b/compat/jansson/hashtable_seed.c
deleted file mode 100644
index 8aed5406..00000000
--- a/compat/jansson/hashtable_seed.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* Generate sizeof(uint32_t) bytes of as random data as possible to seed
- the hash function.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include
-#endif
-
-#include
-#include
-
-#ifdef HAVE_STDINT_H
-#include
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include
-#endif
-
-#ifdef HAVE_SCHED_H
-#include
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#include
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include
-#endif
-
-#if defined(_WIN32)
-/* For GetModuleHandle(), GetProcAddress() and GetCurrentProcessId() */
-#include
-#endif
-
-#include "jansson.h"
-
-
-static uint32_t buf_to_uint32(char *data) {
- size_t i;
- uint32_t result = 0;
-
- for (i = 0; i < sizeof(uint32_t); i++)
- result = (result << 8) | (unsigned char)data[i];
-
- return result;
-}
-
-
-
-/* /dev/urandom */
-#if !defined(_WIN32) && defined(USE_URANDOM)
-static int seed_from_urandom(uint32_t *seed) {
- /* Use unbuffered I/O if we have open(), close() and read(). Otherwise
- fall back to fopen() */
-
- char data[sizeof(uint32_t)];
- int ok;
-
-#if defined(HAVE_OPEN) && defined(HAVE_CLOSE) && defined(HAVE_READ)
- int urandom;
- urandom = open("/dev/urandom", O_RDONLY);
- if (urandom == -1)
- return 1;
-
- ok = read(urandom, data, sizeof(uint32_t)) == sizeof(uint32_t);
- close(urandom);
-#else
- FILE *urandom;
-
- urandom = fopen("/dev/urandom", "rb");
- if (!urandom)
- return 1;
-
- ok = fread(data, 1, sizeof(uint32_t), urandom) == sizeof(uint32_t);
- fclose(urandom);
-#endif
-
- if (!ok)
- return 1;
-
- *seed = buf_to_uint32(data);
- return 0;
-}
-#endif
-
-/* Windows Crypto API */
-#if defined(_WIN32) && defined(USE_WINDOWS_CRYPTOAPI)
-#include
-
-typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv, LPCSTR pszContainer, LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags);
-typedef BOOL (WINAPI *CRYPTGENRANDOM)(HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer);
-typedef BOOL (WINAPI *CRYPTRELEASECONTEXT)(HCRYPTPROV hProv, DWORD dwFlags);
-
-static int seed_from_windows_cryptoapi(uint32_t *seed)
-{
- HINSTANCE hAdvAPI32 = NULL;
- CRYPTACQUIRECONTEXTA pCryptAcquireContext = NULL;
- CRYPTGENRANDOM pCryptGenRandom = NULL;
- CRYPTRELEASECONTEXT pCryptReleaseContext = NULL;
- HCRYPTPROV hCryptProv = 0;
- BYTE data[sizeof(uint32_t)];
- int ok;
-
- hAdvAPI32 = GetModuleHandle(TEXT("advapi32.dll"));
- if(hAdvAPI32 == NULL)
- return 1;
-
- pCryptAcquireContext = (CRYPTACQUIRECONTEXTA)GetProcAddress(hAdvAPI32, "CryptAcquireContextA");
- if (!pCryptAcquireContext)
- return 1;
-
- pCryptGenRandom = (CRYPTGENRANDOM)GetProcAddress(hAdvAPI32, "CryptGenRandom");
- if (!pCryptGenRandom)
- return 1;
-
- pCryptReleaseContext = (CRYPTRELEASECONTEXT)GetProcAddress(hAdvAPI32, "CryptReleaseContext");
- if (!pCryptReleaseContext)
- return 1;
-
- if (!pCryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
- return 1;
-
- ok = pCryptGenRandom(hCryptProv, sizeof(uint32_t), data);
- pCryptReleaseContext(hCryptProv, 0);
-
- if (!ok)
- return 1;
-
- *seed = buf_to_uint32((char *)data);
- return 0;
-}
-#endif
-
-/* gettimeofday() and getpid() */
-static int seed_from_timestamp_and_pid(uint32_t *seed) {
-#ifdef HAVE_GETTIMEOFDAY
- /* XOR of seconds and microseconds */
- struct timeval tv;
- gettimeofday(&tv, NULL);
- *seed = (uint32_t)tv.tv_sec ^ (uint32_t)tv.tv_usec;
-#else
- /* Seconds only */
- *seed = (uint32_t)time(NULL);
-#endif
-
- /* XOR with PID for more randomness */
-#if defined(_WIN32)
- *seed ^= (uint32_t)GetCurrentProcessId();
-#elif defined(HAVE_GETPID)
- *seed ^= (uint32_t)getpid();
-#endif
-
- return 0;
-}
-
-static uint32_t generate_seed() {
- uint32_t seed;
- int done = 0;
-
-#if !defined(_WIN32) && defined(USE_URANDOM)
- if (seed_from_urandom(&seed) == 0)
- done = 1;
-#endif
-
-#if defined(_WIN32) && defined(USE_WINDOWS_CRYPTOAPI)
- if (seed_from_windows_cryptoapi(&seed) == 0)
- done = 1;
-#endif
-
- if (!done) {
- /* Fall back to timestamp and PID if no better randomness is
- available */
- seed_from_timestamp_and_pid(&seed);
- }
-
- /* Make sure the seed is never zero */
- if (seed == 0)
- seed = 1;
-
- return seed;
-}
-
-
-volatile uint32_t hashtable_seed = 0;
-
-#if defined(HAVE_ATOMIC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
-static volatile char seed_initialized = 0;
-
-void json_object_seed(size_t seed) {
- uint32_t new_seed = (uint32_t)seed;
-
- if (hashtable_seed == 0) {
- if (__atomic_test_and_set(&seed_initialized, __ATOMIC_RELAXED) == 0) {
- /* Do the seeding ourselves */
- if (new_seed == 0)
- new_seed = generate_seed();
-
- __atomic_store_n(&hashtable_seed, new_seed, __ATOMIC_RELEASE);
- } else {
- /* Wait for another thread to do the seeding */
- do {
-#ifdef HAVE_SCHED_YIELD
- sched_yield();
-#endif
- } while(__atomic_load_n(&hashtable_seed, __ATOMIC_ACQUIRE) == 0);
- }
- }
-}
-#elif defined(HAVE_SYNC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
-void json_object_seed(size_t seed) {
- uint32_t new_seed = (uint32_t)seed;
-
- if (hashtable_seed == 0) {
- if (new_seed == 0) {
- /* Explicit synchronization fences are not supported by the
- __sync builtins, so every thread getting here has to
- generate the seed value.
- */
- new_seed = generate_seed();
- }
-
- do {
- if (__sync_bool_compare_and_swap(&hashtable_seed, 0, new_seed)) {
- /* We were the first to seed */
- break;
- } else {
- /* Wait for another thread to do the seeding */
-#ifdef HAVE_SCHED_YIELD
- sched_yield();
-#endif
- }
- } while(hashtable_seed == 0);
- }
-}
-#elif defined(_WIN32)
-static long seed_initialized = 0;
-void json_object_seed(size_t seed) {
- uint32_t new_seed = (uint32_t)seed;
-
- if (hashtable_seed == 0) {
- if (InterlockedIncrement(&seed_initialized) == 1) {
- /* Do the seeding ourselves */
- if (new_seed == 0)
- new_seed = generate_seed();
-
- hashtable_seed = new_seed;
- } else {
- /* Wait for another thread to do the seeding */
- do {
- SwitchToThread();
- } while (hashtable_seed == 0);
- }
- }
-}
-#else
-/* Fall back to a thread-unsafe version */
-void json_object_seed(size_t seed) {
- uint32_t new_seed = (uint32_t)seed;
-
- if (hashtable_seed == 0) {
- if (new_seed == 0)
- new_seed = generate_seed();
-
- hashtable_seed = new_seed;
- }
-}
-#endif
diff --git a/compat/jansson/jansson.h b/compat/jansson/jansson.h
deleted file mode 100644
index a5927bd6..00000000
--- a/compat/jansson/jansson.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef JANSSON_H
-#define JANSSON_H
-
-#include
-#include /* for size_t */
-#include
-
-#include "jansson_config.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* version */
-
-#define JANSSON_MAJOR_VERSION 2
-#define JANSSON_MINOR_VERSION 10
-#define JANSSON_MICRO_VERSION 0
-
-/* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION "2.10"
-
-/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
- for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
-#define JANSSON_VERSION_HEX ((JANSSON_MAJOR_VERSION << 16) | \
- (JANSSON_MINOR_VERSION << 8) | \
- (JANSSON_MICRO_VERSION << 0))
-
-
-/* types */
-
-typedef enum {
- JSON_OBJECT,
- JSON_ARRAY,
- JSON_STRING,
- JSON_INTEGER,
- JSON_REAL,
- JSON_TRUE,
- JSON_FALSE,
- JSON_NULL
-} json_type;
-
-typedef struct json_t {
- json_type type;
- size_t refcount;
-} json_t;
-
-#ifndef JANSSON_USING_CMAKE /* disabled if using cmake */
-#if JSON_INTEGER_IS_LONG_LONG
-#ifdef _WIN32
-#define JSON_INTEGER_FORMAT "I64d"
-#else
-#define JSON_INTEGER_FORMAT "lld"
-#endif
-typedef long long json_int_t;
-#else
-#define JSON_INTEGER_FORMAT "ld"
-typedef long json_int_t;
-#endif /* JSON_INTEGER_IS_LONG_LONG */
-#endif
-
-#define json_typeof(json) ((json)->type)
-#define json_is_object(json) ((json) && json_typeof(json) == JSON_OBJECT)
-#define json_is_array(json) ((json) && json_typeof(json) == JSON_ARRAY)
-#define json_is_string(json) ((json) && json_typeof(json) == JSON_STRING)
-#define json_is_integer(json) ((json) && json_typeof(json) == JSON_INTEGER)
-#define json_is_real(json) ((json) && json_typeof(json) == JSON_REAL)
-#define json_is_number(json) (json_is_integer(json) || json_is_real(json))
-#define json_is_true(json) ((json) && json_typeof(json) == JSON_TRUE)
-#define json_is_false(json) ((json) && json_typeof(json) == JSON_FALSE)
-#define json_boolean_value json_is_true
-#define json_is_boolean(json) (json_is_true(json) || json_is_false(json))
-#define json_is_null(json) ((json) && json_typeof(json) == JSON_NULL)
-
-/* construction, destruction, reference counting */
-
-json_t *json_object(void);
-json_t *json_array(void);
-json_t *json_string(const char *value);
-json_t *json_stringn(const char *value, size_t len);
-json_t *json_string_nocheck(const char *value);
-json_t *json_stringn_nocheck(const char *value, size_t len);
-json_t *json_integer(json_int_t value);
-json_t *json_real(double value);
-json_t *json_true(void);
-json_t *json_false(void);
-#define json_boolean(val) ((val) ? json_true() : json_false())
-json_t *json_null(void);
-
-static JSON_INLINE
-json_t *json_incref(json_t *json)
-{
- if(json && json->refcount != (size_t)-1)
- ++json->refcount;
- return json;
-}
-
-/* do not call json_delete directly */
-void json_delete(json_t *json);
-
-static JSON_INLINE
-void json_decref(json_t *json)
-{
- if(json && json->refcount != (size_t)-1 && --json->refcount == 0)
- json_delete(json);
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-static JSON_INLINE
-void json_decrefp(json_t **json)
-{
- if(json) {
- json_decref(*json);
- *json = NULL;
- }
-}
-
-#define json_auto_t json_t __attribute__((cleanup(json_decrefp)))
-#endif
-
-
-/* error reporting */
-
-#define JSON_ERROR_TEXT_LENGTH 160
-#define JSON_ERROR_SOURCE_LENGTH 80
-
-typedef struct {
- int line;
- int column;
- int position;
- char source[JSON_ERROR_SOURCE_LENGTH];
- char text[JSON_ERROR_TEXT_LENGTH];
-} json_error_t;
-
-
-/* getters, setters, manipulation */
-
-void json_object_seed(size_t seed);
-size_t json_object_size(const json_t *object);
-json_t *json_object_get(const json_t *object, const char *key);
-int json_object_set_new(json_t *object, const char *key, json_t *value);
-int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value);
-int json_object_del(json_t *object, const char *key);
-int json_object_clear(json_t *object);
-int json_object_update(json_t *object, json_t *other);
-int json_object_update_existing(json_t *object, json_t *other);
-int json_object_update_missing(json_t *object, json_t *other);
-void *json_object_iter(json_t *object);
-void *json_object_iter_at(json_t *object, const char *key);
-void *json_object_key_to_iter(const char *key);
-void *json_object_iter_next(json_t *object, void *iter);
-const char *json_object_iter_key(void *iter);
-json_t *json_object_iter_value(void *iter);
-int json_object_iter_set_new(json_t *object, void *iter, json_t *value);
-
-#define json_object_foreach(object, key, value) \
- for(key = json_object_iter_key(json_object_iter(object)); \
- key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
- key = json_object_iter_key(json_object_iter_next(object, json_object_key_to_iter(key))))
-
-#define json_object_foreach_safe(object, n, key, value) \
- for(key = json_object_iter_key(json_object_iter(object)), \
- n = json_object_iter_next(object, json_object_key_to_iter(key)); \
- key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
- key = json_object_iter_key(n), \
- n = json_object_iter_next(object, json_object_key_to_iter(key)))
-
-#define json_array_foreach(array, index, value) \
- for(index = 0; \
- index < json_array_size(array) && (value = json_array_get(array, index)); \
- index++)
-
-static JSON_INLINE
-int json_object_set(json_t *object, const char *key, json_t *value)
-{
- return json_object_set_new(object, key, json_incref(value));
-}
-
-static JSON_INLINE
-int json_object_set_nocheck(json_t *object, const char *key, json_t *value)
-{
- return json_object_set_new_nocheck(object, key, json_incref(value));
-}
-
-static JSON_INLINE
-int json_object_iter_set(json_t *object, void *iter, json_t *value)
-{
- return json_object_iter_set_new(object, iter, json_incref(value));
-}
-
-size_t json_array_size(const json_t *array);
-json_t *json_array_get(const json_t *array, size_t index);
-int json_array_set_new(json_t *array, size_t index, json_t *value);
-int json_array_append_new(json_t *array, json_t *value);
-int json_array_insert_new(json_t *array, size_t index, json_t *value);
-int json_array_remove(json_t *array, size_t index);
-int json_array_clear(json_t *array);
-int json_array_extend(json_t *array, json_t *other);
-
-static JSON_INLINE
-int json_array_set(json_t *array, size_t ind, json_t *value)
-{
- return json_array_set_new(array, ind, json_incref(value));
-}
-
-static JSON_INLINE
-int json_array_append(json_t *array, json_t *value)
-{
- return json_array_append_new(array, json_incref(value));
-}
-
-static JSON_INLINE
-int json_array_insert(json_t *array, size_t ind, json_t *value)
-{
- return json_array_insert_new(array, ind, json_incref(value));
-}
-
-const char *json_string_value(const json_t *string);
-size_t json_string_length(const json_t *string);
-json_int_t json_integer_value(const json_t *integer);
-double json_real_value(const json_t *real);
-double json_number_value(const json_t *json);
-
-int json_string_set(json_t *string, const char *value);
-int json_string_setn(json_t *string, const char *value, size_t len);
-int json_string_set_nocheck(json_t *string, const char *value);
-int json_string_setn_nocheck(json_t *string, const char *value, size_t len);
-int json_integer_set(json_t *integer, json_int_t value);
-int json_real_set(json_t *real, double value);
-
-/* pack, unpack */
-
-json_t *json_pack(const char *fmt, ...);
-json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...);
-json_t *json_vpack_ex(json_error_t *error, size_t flags, const char *fmt, va_list ap);
-
-#define JSON_VALIDATE_ONLY 0x1
-#define JSON_STRICT 0x2
-
-int json_unpack(json_t *root, const char *fmt, ...);
-int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...);
-int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, va_list ap);
-
-
-/* equality */
-
-int json_equal(json_t *value1, json_t *value2);
-
-
-/* copying */
-
-json_t *json_copy(json_t *value);
-json_t *json_deep_copy(const json_t *value);
-
-
-/* decoding */
-
-#define JSON_REJECT_DUPLICATES 0x1
-#define JSON_DISABLE_EOF_CHECK 0x2
-#define JSON_DECODE_ANY 0x4
-#define JSON_DECODE_INT_AS_REAL 0x8
-#define JSON_ALLOW_NUL 0x10
-
-typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);
-
-json_t *json_loads(const char *input, size_t flags, json_error_t *error);
-json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error);
-json_t *json_loadf(FILE *input, size_t flags, json_error_t *error);
-json_t *json_loadfd(int input, size_t flags, json_error_t *error);
-json_t *json_load_file(const char *path, size_t flags, json_error_t *error);
-json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error);
-
-
-/* encoding */
-
-#define JSON_MAX_INDENT 0x1F
-#define JSON_INDENT(n) ((n) & JSON_MAX_INDENT)
-#define JSON_COMPACT 0x20
-#define JSON_ENSURE_ASCII 0x40
-#define JSON_SORT_KEYS 0x80
-#define JSON_PRESERVE_ORDER 0x100
-#define JSON_ENCODE_ANY 0x200
-#define JSON_ESCAPE_SLASH 0x400
-#define JSON_REAL_PRECISION(n) (((n) & 0x1F) << 11)
-#define JSON_EMBED 0x10000
-
-typedef int (*json_dump_callback_t)(const char *buffer, size_t size, void *data);
-
-char *json_dumps(const json_t *json, size_t flags);
-size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags);
-int json_dumpf(const json_t *json, FILE *output, size_t flags);
-int json_dumpfd(const json_t *json, int output, size_t flags);
-int json_dump_file(const json_t *json, const char *path, size_t flags);
-int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags);
-
-/* custom memory allocation */
-
-typedef void *(*json_malloc_t)(size_t);
-typedef void (*json_free_t)(void *);
-
-void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn);
-void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/compat/jansson/jansson_config.h b/compat/jansson/jansson_config.h
deleted file mode 100644
index f1a5ddd2..00000000
--- a/compat/jansson/jansson_config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2010-2016 Petri Lehtinen
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- *
- *
- * This file specifies a part of the site-specific configuration for
- * Jansson, namely those things that affect the public API in
- * jansson.h.
- *
- * The configure script copies this file to jansson_config.h and
- * replaces @var@ substitutions by values that fit your system. If you
- * cannot run the configure script, you can do the value substitution
- * by hand.
- */
-
-#ifndef JANSSON_CONFIG_H
-#define JANSSON_CONFIG_H
-
-/* If your compiler supports the inline keyword in C, JSON_INLINE is
- defined to `inline', otherwise empty. In C++, the inline is always
- supported. */
-#ifdef __cplusplus
-#define JSON_INLINE inline
-#else
-#define JSON_INLINE inline
-#endif
-
-/* If your compiler supports the `long long` type and the strtoll()
- library function, JSON_INTEGER_IS_LONG_LONG is defined to 1,
- otherwise to 0. */
-#define JSON_INTEGER_IS_LONG_LONG 1
-
-/* If locale.h and localeconv() are available, define to 1,
- otherwise to 0. */
-#define JSON_HAVE_LOCALECONV 1
-
-/* Maximum recursion depth for parsing JSON input.
- This limits the depth of e.g. array-within-array constructions. */
-#define JSON_PARSER_MAX_DEPTH 2048
-
-#endif
diff --git a/compat/jansson/jansson_private.h b/compat/jansson/jansson_private.h
deleted file mode 100644
index 5ed96158..00000000
--- a/compat/jansson/jansson_private.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef JANSSON_PRIVATE_H
-#define JANSSON_PRIVATE_H
-
-#include "jansson_private_config.h"
-#include
-#include "jansson.h"
-#include "hashtable.h"
-#include "strbuffer.h"
-
-#define container_of(ptr_, type_, member_) \
- ((type_ *)((char *)ptr_ - offsetof(type_, member_)))
-
-/* On some platforms, max() may already be defined */
-#ifndef max
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-/* va_copy is a C99 feature. In C89 implementations, it's sometimes
- available as __va_copy. If not, memcpy() should do the trick. */
-#ifndef va_copy
-#ifdef __va_copy
-#define va_copy __va_copy
-#else
-#define va_copy(a, b) memcpy(&(a), &(b), sizeof(va_list))
-#endif
-#endif
-
-typedef struct {
- json_t json;
- hashtable_t hashtable;
- int visited;
-} json_object_t;
-
-typedef struct {
- json_t json;
- size_t size;
- size_t entries;
- json_t **table;
- int visited;
-} json_array_t;
-
-typedef struct {
- json_t json;
- char *value;
- size_t length;
-} json_string_t;
-
-typedef struct {
- json_t json;
- double value;
-} json_real_t;
-
-typedef struct {
- json_t json;
- json_int_t value;
-} json_integer_t;
-
-#define json_to_object(json_) container_of(json_, json_object_t, json)
-#define json_to_array(json_) container_of(json_, json_array_t, json)
-#define json_to_string(json_) container_of(json_, json_string_t, json)
-#define json_to_real(json_) container_of(json_, json_real_t, json)
-#define json_to_integer(json_) container_of(json_, json_integer_t, json)
-
-/* Create a string by taking ownership of an existing buffer */
-json_t *jsonp_stringn_nocheck_own(const char *value, size_t len);
-
-/* Error message formatting */
-void jsonp_error_init(json_error_t *error, const char *source);
-void jsonp_error_set_source(json_error_t *error, const char *source);
-void jsonp_error_set(json_error_t *error, int line, int column,
- size_t position, const char *msg, ...);
-void jsonp_error_vset(json_error_t *error, int line, int column,
- size_t position, const char *msg, va_list ap);
-
-/* Locale independent string<->double conversions */
-int jsonp_strtod(strbuffer_t *strbuffer, double *out);
-int jsonp_dtostr(char *buffer, size_t size, double value, int prec);
-
-/* Wrappers for custom memory functions */
-void* jsonp_malloc(size_t size);
-void jsonp_free(void *ptr);
-char *jsonp_strndup(const char *str, size_t length);
-char *jsonp_strdup(const char *str);
-char *jsonp_strndup(const char *str, size_t len);
-
-
-/* Windows compatibility */
-#if defined(_WIN32) || defined(WIN32)
-# if defined(_MSC_VER) /* MS compiller */
-# if (_MSC_VER < 1900) && !defined(snprintf) /* snprintf not defined yet & not introduced */
-# define snprintf _snprintf
-# endif
-# if (_MSC_VER < 1500) && !defined(vsnprintf) /* vsnprintf not defined yet & not introduced */
-# define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
-# endif
-# else /* Other Windows compiller, old definition */
-# define snprintf _snprintf
-# define vsnprintf _vsnprintf
-# endif
-#endif
-
-#endif
diff --git a/compat/jansson/jansson_private_config.h b/compat/jansson/jansson_private_config.h
deleted file mode 100644
index 2b17f182..00000000
--- a/compat/jansson/jansson_private_config.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* jansson_private_config.h. Generated from jansson_private_config.h.in by configure. */
-/* jansson_private_config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to 1 if gcc's __atomic builtins are available */
-#define HAVE_ATOMIC_BUILTINS 1
-
-/* Define to 1 if you have the `close' function. */
-#define HAVE_CLOSE 1
-
-/* Define to 1 if you have the header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the header file. */
-/* #undef HAVE_ENDIAN_H */
-
-/* Define to 1 if you have the header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getpid' function. */
-#define HAVE_GETPID 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `localeconv' function. */
-#define HAVE_LOCALECONV 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if the system has the type 'long long int'. */
-#define HAVE_LONG_LONG_INT 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `open' function. */
-#define HAVE_OPEN 1
-
-/* Define to 1 if you have the `read' function. */
-#define HAVE_READ 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_SCHED_H 1
-
-/* Define to 1 if you have the `sched_yield' function. */
-#define HAVE_SCHED_YIELD 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtoll' function. */
-#define HAVE_STRTOLL 1
-
-/* Define to 1 if gcc's __sync builtins are available */
-#define HAVE_SYNC_BUILTINS 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if the system has the type 'unsigned long long int'. */
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-
-/* Number of buckets new object hashtables contain is 2 raised to this power.
- E.g. 3 -> 2^3 = 8. */
-#define INITIAL_HASHTABLE_ORDER 3
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "jansson"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "petri@digip.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "jansson"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "jansson 2.9"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "jansson"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.9"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if /dev/urandom should be used for seeding the hash function */
-#define USE_URANDOM 1
-
-/* Define to 1 if CryptGenRandom should be used for seeding the hash function
- */
-#define USE_WINDOWS_CRYPTOAPI 1
-
-/* Version number of package */
-#define VERSION "2.9"
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from ,
- , or is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-/* #undef _UINT32_T */
-
-/* Define for Solaris 2.5.1 so the uint8_t typedef from ,
- , or is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-/* #undef _UINT8_T */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to the type of a signed integer type of width exactly 32 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef int32_t */
-
-/* Define to the type of an unsigned integer type of width exactly 16 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint16_t */
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint32_t */
-
-/* Define to the type of an unsigned integer type of width exactly 8 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint8_t */
diff --git a/compat/jansson/load.c b/compat/jansson/load.c
deleted file mode 100644
index c212489a..00000000
--- a/compat/jansson/load.c
+++ /dev/null
@@ -1,1153 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include "jansson_private.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#ifdef HAVE_UNISTD_H
-#include
-#endif
-
-#include "jansson.h"
-#include "strbuffer.h"
-#include "utf.h"
-
-#define STREAM_STATE_OK 0
-#define STREAM_STATE_EOF -1
-#define STREAM_STATE_ERROR -2
-
-#define TOKEN_INVALID -1
-#define TOKEN_EOF 0
-#define TOKEN_STRING 256
-#define TOKEN_INTEGER 257
-#define TOKEN_REAL 258
-#define TOKEN_TRUE 259
-#define TOKEN_FALSE 260
-#define TOKEN_NULL 261
-
-/* Locale independent versions of isxxx() functions */
-#define l_isupper(c) ('A' <= (c) && (c) <= 'Z')
-#define l_islower(c) ('a' <= (c) && (c) <= 'z')
-#define l_isalpha(c) (l_isupper(c) || l_islower(c))
-#define l_isdigit(c) ('0' <= (c) && (c) <= '9')
-#define l_isxdigit(c) \
- (l_isdigit(c) || ('A' <= (c) && (c) <= 'F') || ('a' <= (c) && (c) <= 'f'))
-
-/* Read one byte from stream, convert to unsigned char, then int, and
- return. return EOF on end of file. This corresponds to the
- behaviour of fgetc(). */
-typedef int (*get_func)(void *data);
-
-typedef struct {
- get_func get;
- void *data;
- char buffer[5];
- size_t buffer_pos;
- int state;
- int line;
- int column, last_column;
- size_t position;
-} stream_t;
-
-typedef struct {
- stream_t stream;
- strbuffer_t saved_text;
- size_t flags;
- size_t depth;
- int token;
- union {
- struct {
- char *val;
- size_t len;
- } string;
- json_int_t integer;
- double real;
- } value;
-} lex_t;
-
-#define stream_to_lex(stream) container_of(stream, lex_t, stream)
-
-
-/*** error reporting ***/
-
-static void error_set(json_error_t *error, const lex_t *lex,
- const char *msg, ...)
-{
- va_list ap;
- char msg_text[JSON_ERROR_TEXT_LENGTH];
- char msg_with_context[JSON_ERROR_TEXT_LENGTH];
-
- int line = -1, col = -1;
- size_t pos = 0;
- const char *result = msg_text;
-
- if(!error)
- return;
-
- va_start(ap, msg);
- vsnprintf(msg_text, JSON_ERROR_TEXT_LENGTH, msg, ap);
- msg_text[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
- va_end(ap);
-
- if(lex)
- {
- const char *saved_text = strbuffer_value(&lex->saved_text);
-
- line = lex->stream.line;
- col = lex->stream.column;
- pos = lex->stream.position;
-
- if(saved_text && saved_text[0])
- {
- if(lex->saved_text.length <= 20) {
- snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
- "%s near '%s'", msg_text, saved_text);
- msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
- result = msg_with_context;
- }
- }
- else
- {
- if(lex->stream.state == STREAM_STATE_ERROR) {
- /* No context for UTF-8 decoding errors */
- result = msg_text;
- }
- else {
- snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
- "%s near end of file", msg_text);
- msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
- result = msg_with_context;
- }
- }
- }
-
- jsonp_error_set(error, line, col, pos, "%s", result);
-}
-
-
-/*** lexical analyzer ***/
-
-static void
-stream_init(stream_t *stream, get_func get, void *data)
-{
- stream->get = get;
- stream->data = data;
- stream->buffer[0] = '\0';
- stream->buffer_pos = 0;
-
- stream->state = STREAM_STATE_OK;
- stream->line = 1;
- stream->column = 0;
- stream->position = 0;
-}
-
-static int stream_get(stream_t *stream, json_error_t *error)
-{
- int c;
-
- if(stream->state != STREAM_STATE_OK)
- return stream->state;
-
- if(!stream->buffer[stream->buffer_pos])
- {
- c = stream->get(stream->data);
- if(c == EOF) {
- stream->state = STREAM_STATE_EOF;
- return STREAM_STATE_EOF;
- }
-
- stream->buffer[0] = c;
- stream->buffer_pos = 0;
-
- if(0x80 <= c && c <= 0xFF)
- {
- /* multi-byte UTF-8 sequence */
- size_t i, count;
-
- count = utf8_check_first(c);
- if(!count)
- goto out;
-
- assert(count >= 2);
-
- for(i = 1; i < count; i++)
- stream->buffer[i] = stream->get(stream->data);
-
- if(!utf8_check_full(stream->buffer, count, NULL))
- goto out;
-
- stream->buffer[count] = '\0';
- }
- else
- stream->buffer[1] = '\0';
- }
-
- c = stream->buffer[stream->buffer_pos++];
-
- stream->position++;
- if(c == '\n') {
- stream->line++;
- stream->last_column = stream->column;
- stream->column = 0;
- }
- else if(utf8_check_first(c)) {
- /* track the Unicode character column, so increment only if
- this is the first character of a UTF-8 sequence */
- stream->column++;
- }
-
- return c;
-
-out:
- stream->state = STREAM_STATE_ERROR;
- error_set(error, stream_to_lex(stream), "unable to decode byte 0x%x", c);
- return STREAM_STATE_ERROR;
-}
-
-static void stream_unget(stream_t *stream, int c)
-{
- if(c == STREAM_STATE_EOF || c == STREAM_STATE_ERROR)
- return;
-
- stream->position--;
- if(c == '\n') {
- stream->line--;
- stream->column = stream->last_column;
- }
- else if(utf8_check_first(c))
- stream->column--;
-
- assert(stream->buffer_pos > 0);
- stream->buffer_pos--;
- assert(stream->buffer[stream->buffer_pos] == c);
-}
-
-
-static int lex_get(lex_t *lex, json_error_t *error)
-{
- return stream_get(&lex->stream, error);
-}
-
-static void lex_save(lex_t *lex, int c)
-{
- strbuffer_append_byte(&lex->saved_text, c);
-}
-
-static int lex_get_save(lex_t *lex, json_error_t *error)
-{
- int c = stream_get(&lex->stream, error);
- if(c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR)
- lex_save(lex, c);
- return c;
-}
-
-static void lex_unget(lex_t *lex, int c)
-{
- stream_unget(&lex->stream, c);
-}
-
-static void lex_unget_unsave(lex_t *lex, int c)
-{
- if(c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR) {
- /* Since we treat warnings as errors, when assertions are turned
- * off the "d" variable would be set but never used. Which is
- * treated as an error by GCC.
- */
- #ifndef NDEBUG
- char d;
- #endif
- stream_unget(&lex->stream, c);
- #ifndef NDEBUG
- d =
- #endif
- strbuffer_pop(&lex->saved_text);
- assert(c == d);
- }
-}
-
-static void lex_save_cached(lex_t *lex)
-{
- while(lex->stream.buffer[lex->stream.buffer_pos] != '\0')
- {
- lex_save(lex, lex->stream.buffer[lex->stream.buffer_pos]);
- lex->stream.buffer_pos++;
- lex->stream.position++;
- }
-}
-
-static void lex_free_string(lex_t *lex)
-{
- jsonp_free(lex->value.string.val);
- lex->value.string.val = NULL;
- lex->value.string.len = 0;
-}
-
-/* assumes that str points to 'u' plus at least 4 valid hex digits */
-static int32_t decode_unicode_escape(const char *str)
-{
- int i;
- int32_t value = 0;
-
- assert(str[0] == 'u');
-
- for(i = 1; i <= 4; i++) {
- char c = str[i];
- value <<= 4;
- if(l_isdigit(c))
- value += c - '0';
- else if(l_islower(c))
- value += c - 'a' + 10;
- else if(l_isupper(c))
- value += c - 'A' + 10;
- else
- return -1;
- }
-
- return value;
-}
-
-static void lex_scan_string(lex_t *lex, json_error_t *error)
-{
- int c;
- const char *p;
- char *t;
- int i;
-
- lex->value.string.val = NULL;
- lex->token = TOKEN_INVALID;
-
- c = lex_get_save(lex, error);
-
- while(c != '"') {
- if(c == STREAM_STATE_ERROR)
- goto out;
-
- else if(c == STREAM_STATE_EOF) {
- error_set(error, lex, "premature end of input");
- goto out;
- }
-
- else if(0 <= c && c <= 0x1F) {
- /* control character */
- lex_unget_unsave(lex, c);
- if(c == '\n')
- error_set(error, lex, "unexpected newline");
- else
- error_set(error, lex, "control character 0x%x", c);
- goto out;
- }
-
- else if(c == '\\') {
- c = lex_get_save(lex, error);
- if(c == 'u') {
- c = lex_get_save(lex, error);
- for(i = 0; i < 4; i++) {
- if(!l_isxdigit(c)) {
- error_set(error, lex, "invalid escape");
- goto out;
- }
- c = lex_get_save(lex, error);
- }
- }
- else if(c == '"' || c == '\\' || c == '/' || c == 'b' ||
- c == 'f' || c == 'n' || c == 'r' || c == 't')
- c = lex_get_save(lex, error);
- else {
- error_set(error, lex, "invalid escape");
- goto out;
- }
- }
- else
- c = lex_get_save(lex, error);
- }
-
- /* the actual value is at most of the same length as the source
- string, because:
- - shortcut escapes (e.g. "\t") (length 2) are converted to 1 byte
- - a single \uXXXX escape (length 6) is converted to at most 3 bytes
- - two \uXXXX escapes (length 12) forming an UTF-16 surrogate pair
- are converted to 4 bytes
- */
- t = jsonp_malloc(lex->saved_text.length + 1);
- if(!t) {
- /* this is not very nice, since TOKEN_INVALID is returned */
- goto out;
- }
- lex->value.string.val = t;
-
- /* + 1 to skip the " */
- p = strbuffer_value(&lex->saved_text) + 1;
-
- while(*p != '"') {
- if(*p == '\\') {
- p++;
- if(*p == 'u') {
- size_t length;
- int32_t value;
-
- value = decode_unicode_escape(p);
- if(value < 0) {
- error_set(error, lex, "invalid Unicode escape '%.6s'", p - 1);
- goto out;
- }
- p += 5;
-
- if(0xD800 <= value && value <= 0xDBFF) {
- /* surrogate pair */
- if(*p == '\\' && *(p + 1) == 'u') {
- int32_t value2 = decode_unicode_escape(++p);
- if(value2 < 0) {
- error_set(error, lex, "invalid Unicode escape '%.6s'", p - 1);
- goto out;
- }
- p += 5;
-
- if(0xDC00 <= value2 && value2 <= 0xDFFF) {
- /* valid second surrogate */
- value =
- ((value - 0xD800) << 10) +
- (value2 - 0xDC00) +
- 0x10000;
- }
- else {
- /* invalid second surrogate */
- error_set(error, lex,
- "invalid Unicode '\\u%04X\\u%04X'",
- value, value2);
- goto out;
- }
- }
- else {
- /* no second surrogate */
- error_set(error, lex, "invalid Unicode '\\u%04X'",
- value);
- goto out;
- }
- }
- else if(0xDC00 <= value && value <= 0xDFFF) {
- error_set(error, lex, "invalid Unicode '\\u%04X'", value);
- goto out;
- }
-
- if(utf8_encode(value, t, &length))
- assert(0);
- t += length;
- }
- else {
- switch(*p) {
- case '"': case '\\': case '/':
- *t = *p; break;
- case 'b': *t = '\b'; break;
- case 'f': *t = '\f'; break;
- case 'n': *t = '\n'; break;
- case 'r': *t = '\r'; break;
- case 't': *t = '\t'; break;
- default: assert(0);
- }
- t++;
- p++;
- }
- }
- else
- *(t++) = *(p++);
- }
- *t = '\0';
- lex->value.string.len = t - lex->value.string.val;
- lex->token = TOKEN_STRING;
- return;
-
-out:
- lex_free_string(lex);
-}
-
-#ifndef JANSSON_USING_CMAKE /* disabled if using cmake */
-#if JSON_INTEGER_IS_LONG_LONG
-#ifdef _MSC_VER /* Microsoft Visual Studio */
-#define json_strtoint _strtoi64
-#else
-#define json_strtoint strtoll
-#endif
-#else
-#define json_strtoint strtol
-#endif
-#endif
-
-static int lex_scan_number(lex_t *lex, int c, json_error_t *error)
-{
- const char *saved_text;
- char *end;
- double doubleval;
-
- lex->token = TOKEN_INVALID;
-
- if(c == '-')
- c = lex_get_save(lex, error);
-
- if(c == '0') {
- c = lex_get_save(lex, error);
- if(l_isdigit(c)) {
- lex_unget_unsave(lex, c);
- goto out;
- }
- }
- else if(l_isdigit(c)) {
- do
- c = lex_get_save(lex, error);
- while(l_isdigit(c));
- }
- else {
- lex_unget_unsave(lex, c);
- goto out;
- }
-
- if(!(lex->flags & JSON_DECODE_INT_AS_REAL) &&
- c != '.' && c != 'E' && c != 'e')
- {
- json_int_t intval;
-
- lex_unget_unsave(lex, c);
-
- saved_text = strbuffer_value(&lex->saved_text);
-
- errno = 0;
- intval = json_strtoint(saved_text, &end, 10);
- if(errno == ERANGE) {
- if(intval < 0)
- error_set(error, lex, "too big negative integer");
- else
- error_set(error, lex, "too big integer");
- goto out;
- }
-
- assert(end == saved_text + lex->saved_text.length);
-
- lex->token = TOKEN_INTEGER;
- lex->value.integer = intval;
- return 0;
- }
-
- if(c == '.') {
- c = lex_get(lex, error);
- if(!l_isdigit(c)) {
- lex_unget(lex, c);
- goto out;
- }
- lex_save(lex, c);
-
- do
- c = lex_get_save(lex, error);
- while(l_isdigit(c));
- }
-
- if(c == 'E' || c == 'e') {
- c = lex_get_save(lex, error);
- if(c == '+' || c == '-')
- c = lex_get_save(lex, error);
-
- if(!l_isdigit(c)) {
- lex_unget_unsave(lex, c);
- goto out;
- }
-
- do
- c = lex_get_save(lex, error);
- while(l_isdigit(c));
- }
-
- lex_unget_unsave(lex, c);
-
- if(jsonp_strtod(&lex->saved_text, &doubleval)) {
- error_set(error, lex, "real number overflow");
- goto out;
- }
-
- lex->token = TOKEN_REAL;
- lex->value.real = doubleval;
- return 0;
-
-out:
- return -1;
-}
-
-static int lex_scan(lex_t *lex, json_error_t *error)
-{
- int c;
-
- strbuffer_clear(&lex->saved_text);
-
- if(lex->token == TOKEN_STRING)
- lex_free_string(lex);
-
- do
- c = lex_get(lex, error);
- while(c == ' ' || c == '\t' || c == '\n' || c == '\r');
-
- if(c == STREAM_STATE_EOF) {
- lex->token = TOKEN_EOF;
- goto out;
- }
-
- if(c == STREAM_STATE_ERROR) {
- lex->token = TOKEN_INVALID;
- goto out;
- }
-
- lex_save(lex, c);
-
- if(c == '{' || c == '}' || c == '[' || c == ']' || c == ':' || c == ',')
- lex->token = c;
-
- else if(c == '"')
- lex_scan_string(lex, error);
-
- else if(l_isdigit(c) || c == '-') {
- if(lex_scan_number(lex, c, error))
- goto out;
- }
-
- else if(l_isalpha(c)) {
- /* eat up the whole identifier for clearer error messages */
- const char *saved_text;
-
- do
- c = lex_get_save(lex, error);
- while(l_isalpha(c));
- lex_unget_unsave(lex, c);
-
- saved_text = strbuffer_value(&lex->saved_text);
-
- if(strcmp(saved_text, "true") == 0)
- lex->token = TOKEN_TRUE;
- else if(strcmp(saved_text, "false") == 0)
- lex->token = TOKEN_FALSE;
- else if(strcmp(saved_text, "null") == 0)
- lex->token = TOKEN_NULL;
- else
- lex->token = TOKEN_INVALID;
- }
-
- else {
- /* save the rest of the input UTF-8 sequence to get an error
- message of valid UTF-8 */
- lex_save_cached(lex);
- lex->token = TOKEN_INVALID;
- }
-
-out:
- return lex->token;
-}
-
-static char *lex_steal_string(lex_t *lex, size_t *out_len)
-{
- char *result = NULL;
- if(lex->token == TOKEN_STRING) {
- result = lex->value.string.val;
- *out_len = lex->value.string.len;
- lex->value.string.val = NULL;
- lex->value.string.len = 0;
- }
- return result;
-}
-
-static int lex_init(lex_t *lex, get_func get, size_t flags, void *data)
-{
- stream_init(&lex->stream, get, data);
- if(strbuffer_init(&lex->saved_text))
- return -1;
-
- lex->flags = flags;
- lex->token = TOKEN_INVALID;
- return 0;
-}
-
-static void lex_close(lex_t *lex)
-{
- if(lex->token == TOKEN_STRING)
- lex_free_string(lex);
- strbuffer_close(&lex->saved_text);
-}
-
-
-/*** parser ***/
-
-static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error);
-
-static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error)
-{
- json_t *object = json_object();
- if(!object)
- return NULL;
-
- lex_scan(lex, error);
- if(lex->token == '}')
- return object;
-
- while(1) {
- char *key;
- size_t len;
- json_t *value;
-
- if(lex->token != TOKEN_STRING) {
- error_set(error, lex, "string or '}' expected");
- goto error;
- }
-
- key = lex_steal_string(lex, &len);
- if(!key)
- return NULL;
- if (memchr(key, '\0', len)) {
- jsonp_free(key);
- error_set(error, lex, "NUL byte in object key not supported");
- goto error;
- }
-
- if(flags & JSON_REJECT_DUPLICATES) {
- if(json_object_get(object, key)) {
- jsonp_free(key);
- error_set(error, lex, "duplicate object key");
- goto error;
- }
- }
-
- lex_scan(lex, error);
- if(lex->token != ':') {
- jsonp_free(key);
- error_set(error, lex, "':' expected");
- goto error;
- }
-
- lex_scan(lex, error);
- value = parse_value(lex, flags, error);
- if(!value) {
- jsonp_free(key);
- goto error;
- }
-
- if(json_object_set_nocheck(object, key, value)) {
- jsonp_free(key);
- json_decref(value);
- goto error;
- }
-
- json_decref(value);
- jsonp_free(key);
-
- lex_scan(lex, error);
- if(lex->token != ',')
- break;
-
- lex_scan(lex, error);
- }
-
- if(lex->token != '}') {
- error_set(error, lex, "'}' expected");
- goto error;
- }
-
- return object;
-
-error:
- json_decref(object);
- return NULL;
-}
-
-static json_t *parse_array(lex_t *lex, size_t flags, json_error_t *error)
-{
- json_t *array = json_array();
- if(!array)
- return NULL;
-
- lex_scan(lex, error);
- if(lex->token == ']')
- return array;
-
- while(lex->token) {
- json_t *elem = parse_value(lex, flags, error);
- if(!elem)
- goto error;
-
- if(json_array_append(array, elem)) {
- json_decref(elem);
- goto error;
- }
- json_decref(elem);
-
- lex_scan(lex, error);
- if(lex->token != ',')
- break;
-
- lex_scan(lex, error);
- }
-
- if(lex->token != ']') {
- error_set(error, lex, "']' expected");
- goto error;
- }
-
- return array;
-
-error:
- json_decref(array);
- return NULL;
-}
-
-static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
-{
- json_t *json;
-
- lex->depth++;
- if(lex->depth > JSON_PARSER_MAX_DEPTH) {
- error_set(error, lex, "maximum parsing depth reached");
- return NULL;
- }
-
- switch(lex->token) {
- case TOKEN_STRING: {
- const char *value = lex->value.string.val;
- size_t len = lex->value.string.len;
-
- if(!(flags & JSON_ALLOW_NUL)) {
- if(memchr(value, '\0', len)) {
- error_set(error, lex, "\\u0000 is not allowed without JSON_ALLOW_NUL");
- return NULL;
- }
- }
-
- json = jsonp_stringn_nocheck_own(value, len);
- if(json) {
- lex->value.string.val = NULL;
- lex->value.string.len = 0;
- }
- break;
- }
-
- case TOKEN_INTEGER: {
- json = json_integer(lex->value.integer);
- break;
- }
-
- case TOKEN_REAL: {
- json = json_real(lex->value.real);
- break;
- }
-
- case TOKEN_TRUE:
- json = json_true();
- break;
-
- case TOKEN_FALSE:
- json = json_false();
- break;
-
- case TOKEN_NULL:
- json = json_null();
- break;
-
- case '{':
- json = parse_object(lex, flags, error);
- break;
-
- case '[':
- json = parse_array(lex, flags, error);
- break;
-
- case TOKEN_INVALID:
- error_set(error, lex, "invalid token");
- return NULL;
-
- default:
- error_set(error, lex, "unexpected token");
- return NULL;
- }
-
- if(!json)
- return NULL;
-
- lex->depth--;
- return json;
-}
-
-static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error)
-{
- json_t *result;
-
- lex->depth = 0;
-
- lex_scan(lex, error);
- if(!(flags & JSON_DECODE_ANY)) {
- if(lex->token != '[' && lex->token != '{') {
- error_set(error, lex, "'[' or '{' expected");
- return NULL;
- }
- }
-
- result = parse_value(lex, flags, error);
- if(!result)
- return NULL;
-
- if(!(flags & JSON_DISABLE_EOF_CHECK)) {
- lex_scan(lex, error);
- if(lex->token != TOKEN_EOF) {
- error_set(error, lex, "end of file expected");
- json_decref(result);
- return NULL;
- }
- }
-
- if(error) {
- /* Save the position even though there was no error */
- error->position = (int)lex->stream.position;
- }
-
- return result;
-}
-
-typedef struct
-{
- const char *data;
- size_t pos;
-} string_data_t;
-
-static int string_get(void *data)
-{
- char c;
- string_data_t *stream = (string_data_t *)data;
- c = stream->data[stream->pos];
- if(c == '\0')
- return EOF;
- else
- {
- stream->pos++;
- return (unsigned char)c;
- }
-}
-
-json_t *json_loads(const char *string, size_t flags, json_error_t *error)
-{
- lex_t lex;
- json_t *result;
- string_data_t stream_data;
-
- jsonp_error_init(error, "");
-
- if (string == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- stream_data.data = string;
- stream_data.pos = 0;
-
- if(lex_init(&lex, string_get, flags, (void *)&stream_data))
- return NULL;
-
- result = parse_json(&lex, flags, error);
-
- lex_close(&lex);
- return result;
-}
-
-typedef struct
-{
- const char *data;
- size_t len;
- size_t pos;
-} buffer_data_t;
-
-static int buffer_get(void *data)
-{
- char c;
- buffer_data_t *stream = data;
- if(stream->pos >= stream->len)
- return EOF;
-
- c = stream->data[stream->pos];
- stream->pos++;
- return (unsigned char)c;
-}
-
-json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error)
-{
- lex_t lex;
- json_t *result;
- buffer_data_t stream_data;
-
- jsonp_error_init(error, "");
-
- if (buffer == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- stream_data.data = buffer;
- stream_data.pos = 0;
- stream_data.len = buflen;
-
- if(lex_init(&lex, buffer_get, flags, (void *)&stream_data))
- return NULL;
-
- result = parse_json(&lex, flags, error);
-
- lex_close(&lex);
- return result;
-}
-
-json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
-{
- lex_t lex;
- const char *source;
- json_t *result;
-
- if(input == stdin)
- source = "";
- else
- source = "";
-
- jsonp_error_init(error, source);
-
- if (input == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- if(lex_init(&lex, (get_func)fgetc, flags, input))
- return NULL;
-
- result = parse_json(&lex, flags, error);
-
- lex_close(&lex);
- return result;
-}
-
-static int fd_get_func(int *fd)
-{
- uint8_t c;
-#ifdef HAVE_UNISTD_H
- if (read(*fd, &c, 1) == 1)
- return c;
-#endif
- return EOF;
-}
-
-json_t *json_loadfd(int input, size_t flags, json_error_t *error)
-{
- lex_t lex;
- const char *source;
- json_t *result;
-
-#ifdef HAVE_UNISTD_H
- if(input == STDIN_FILENO)
- source = "";
- else
-#endif
- source = "";
-
- jsonp_error_init(error, source);
-
- if (input < 0) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- if(lex_init(&lex, (get_func)fd_get_func, flags, &input))
- return NULL;
-
- result = parse_json(&lex, flags, error);
-
- lex_close(&lex);
- return result;
-}
-
-json_t *json_load_file(const char *path, size_t flags, json_error_t *error)
-{
- json_t *result;
- FILE *fp;
-
- jsonp_error_init(error, path);
-
- if (path == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- fp = fopen(path, "rb");
- if(!fp)
- {
- error_set(error, NULL, "unable to open %s: %s",
- path, strerror(errno));
- return NULL;
- }
-
- result = json_loadf(fp, flags, error);
-
- fclose(fp);
- return result;
-}
-
-#define MAX_BUF_LEN 1024
-
-typedef struct
-{
- char data[MAX_BUF_LEN];
- size_t len;
- size_t pos;
- json_load_callback_t callback;
- void *arg;
-} callback_data_t;
-
-static int callback_get(void *data)
-{
- char c;
- callback_data_t *stream = data;
-
- if(stream->pos >= stream->len) {
- stream->pos = 0;
- stream->len = stream->callback(stream->data, MAX_BUF_LEN, stream->arg);
- if(stream->len == 0 || stream->len == (size_t)-1)
- return EOF;
- }
-
- c = stream->data[stream->pos];
- stream->pos++;
- return (unsigned char)c;
-}
-
-json_t *json_load_callback(json_load_callback_t callback, void *arg, size_t flags, json_error_t *error)
-{
- lex_t lex;
- json_t *result;
-
- callback_data_t stream_data;
-
- memset(&stream_data, 0, sizeof(stream_data));
- stream_data.callback = callback;
- stream_data.arg = arg;
-
- jsonp_error_init(error, "");
-
- if (callback == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- if(lex_init(&lex, (get_func)callback_get, flags, &stream_data))
- return NULL;
-
- result = parse_json(&lex, flags, error);
-
- lex_close(&lex);
- return result;
-}
diff --git a/compat/jansson/lookup3.h b/compat/jansson/lookup3.h
deleted file mode 100644
index 522a41ae..00000000
--- a/compat/jansson/lookup3.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
--------------------------------------------------------------------------------
-lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-
-These are functions for producing 32-bit hashes for hash table lookup.
-hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
-are externally useful functions. Routines to test the hash are included
-if SELF_TEST is defined. You can use this free for any purpose. It's in
-the public domain. It has no warranty.
-
-You probably want to use hashlittle(). hashlittle() and hashbig()
-hash byte arrays. hashlittle() is is faster than hashbig() on
-little-endian machines. Intel and AMD are little-endian machines.
-On second thought, you probably want hashlittle2(), which is identical to
-hashlittle() except it returns two 32-bit hashes for the price of one.
-You could implement hashbig2() if you wanted but I haven't bothered here.
-
-If you want to find a hash of, say, exactly 7 integers, do
- a = i1; b = i2; c = i3;
- mix(a,b,c);
- a += i4; b += i5; c += i6;
- mix(a,b,c);
- a += i7;
- final(a,b,c);
-then use c as the hash value. If you have a variable length array of
-4-byte integers to hash, use hashword(). If you have a byte array (like
-a character string), use hashlittle(). If you have several byte arrays, or
-a mix of things, see the comments above hashlittle().
-
-Why is this so big? I read 12 bytes at a time into 3 4-byte integers,
-then mix those integers. This is fast (you can do a lot more thorough
-mixing with 12*3 instructions on 3 integers than you can with 3 instructions
-on 1 byte), but shoehorning those bytes into integers efficiently is messy.
--------------------------------------------------------------------------------
-*/
-
-#include
-
-#ifdef HAVE_CONFIG_H
-#include
-#endif
-
-#ifdef HAVE_STDINT_H
-#include /* defines uint32_t etc */
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include /* attempt to define endianness */
-#endif
-
-#ifdef HAVE_ENDIAN_H
-# include /* attempt to define endianness */
-#endif
-
-/*
- * My best guess at if you are big-endian or little-endian. This may
- * need adjustment.
- */
-#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
- __BYTE_ORDER == __LITTLE_ENDIAN) || \
- (defined(i386) || defined(__i386__) || defined(__i486__) || \
- defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
-# define HASH_LITTLE_ENDIAN 1
-# define HASH_BIG_ENDIAN 0
-#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
- __BYTE_ORDER == __BIG_ENDIAN) || \
- (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 1
-#else
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 0
-#endif
-
-#define hashsize(n) ((uint32_t)1<<(n))
-#define hashmask(n) (hashsize(n)-1)
-#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-
-/*
--------------------------------------------------------------------------------
-mix -- mix 3 32-bit values reversibly.
-
-This is reversible, so any information in (a,b,c) before mix() is
-still in (a,b,c) after mix().
-
-If four pairs of (a,b,c) inputs are run through mix(), or through
-mix() in reverse, there are at least 32 bits of the output that
-are sometimes the same for one pair and different for another pair.
-This was tested for:
-* pairs that differed by one bit, by two bits, in any combination
- of top bits of (a,b,c), or in any combination of bottom bits of
- (a,b,c).
-* "differ" is defined as +, -, ^, or ~^. For + and -, I transformed
- the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
- is commonly produced by subtraction) look like a single 1-bit
- difference.
-* the base values were pseudorandom, all zero but one bit set, or
- all zero plus a counter that starts at zero.
-
-Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
-satisfy this are
- 4 6 8 16 19 4
- 9 15 3 18 27 15
- 14 9 3 7 17 3
-Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
-for "differ" defined as + with a one-bit base and a two-bit delta. I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose
-the operations, constants, and arrangements of the variables.
-
-This does not achieve avalanche. There are input bits of (a,b,c)
-that fail to affect some output bits of (a,b,c), especially of a. The
-most thoroughly mixed value is c, but it doesn't really even achieve
-avalanche in c.
-
-This allows some parallelism. Read-after-writes are good at doubling
-the number of bits affected, so the goal of mixing pulls in the opposite
-direction as the goal of parallelism. I did what I could. Rotates
-seem to cost as much as shifts on every machine I could lay my hands
-on, and rotates are much kinder to the top and bottom bits, so I used
-rotates.
--------------------------------------------------------------------------------
-*/
-#define mix(a,b,c) \
-{ \
- a -= c; a ^= rot(c, 4); c += b; \
- b -= a; b ^= rot(a, 6); a += c; \
- c -= b; c ^= rot(b, 8); b += a; \
- a -= c; a ^= rot(c,16); c += b; \
- b -= a; b ^= rot(a,19); a += c; \
- c -= b; c ^= rot(b, 4); b += a; \
-}
-
-/*
--------------------------------------------------------------------------------
-final -- final mixing of 3 32-bit values (a,b,c) into c
-
-Pairs of (a,b,c) values differing in only a few bits will usually
-produce values of c that look totally different. This was tested for
-* pairs that differed by one bit, by two bits, in any combination
- of top bits of (a,b,c), or in any combination of bottom bits of
- (a,b,c).
-* "differ" is defined as +, -, ^, or ~^. For + and -, I transformed
- the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
- is commonly produced by subtraction) look like a single 1-bit
- difference.
-* the base values were pseudorandom, all zero but one bit set, or
- all zero plus a counter that starts at zero.
-
-These constants passed:
- 14 11 25 16 4 14 24
- 12 14 25 16 4 14 24
-and these came close:
- 4 8 15 26 3 22 24
- 10 8 15 26 3 22 24
- 11 8 15 26 3 22 24
--------------------------------------------------------------------------------
-*/
-#define final(a,b,c) \
-{ \
- c ^= b; c -= rot(b,14); \
- a ^= c; a -= rot(c,11); \
- b ^= a; b -= rot(a,25); \
- c ^= b; c -= rot(b,16); \
- a ^= c; a -= rot(c,4); \
- b ^= a; b -= rot(a,14); \
- c ^= b; c -= rot(b,24); \
-}
-
-/*
--------------------------------------------------------------------------------
-hashlittle() -- hash a variable-length key into a 32-bit value
- k : the key (the unaligned variable-length array of bytes)
- length : the length of the key, counting by bytes
- initval : can be any 4-byte value
-Returns a 32-bit value. Every bit of the key affects every bit of
-the return value. Two keys differing by one or two bits will have
-totally different hash values.
-
-The best hash table sizes are powers of 2. There is no need to do
-mod a prime (mod is sooo slow!). If you need less than 32 bits,
-use a bitmask. For example, if you need only 10 bits, do
- h = (h & hashmask(10));
-In which case, the hash table should have hashsize(10) elements.
-
-If you are hashing n strings (uint8_t **)k, do it like this:
- for (i=0, h=0; i 12)
- {
- a += k[0];
- b += k[1];
- c += k[2];
- mix(a,b,c);
- length -= 12;
- k += 3;
- }
-
- /*----------------------------- handle the last (probably partial) block */
- /*
- * "k[2]&0xffffff" actually reads beyond the end of the string, but
- * then masks off the part it's not allowed to read. Because the
- * string is aligned, the masked-off tail is in the same word as the
- * rest of the string. Every machine with memory protection I've seen
- * does it on word boundaries, so is OK with this. But VALGRIND will
- * still catch it and complain. The masking trick does make the hash
- * noticably faster for short strings (like English words).
- */
-#ifndef NO_MASKING_TRICK
-
- switch(length)
- {
- case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
- case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
- case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
- case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
- case 8 : b+=k[1]; a+=k[0]; break;
- case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
- case 6 : b+=k[1]&0xffff; a+=k[0]; break;
- case 5 : b+=k[1]&0xff; a+=k[0]; break;
- case 4 : a+=k[0]; break;
- case 3 : a+=k[0]&0xffffff; break;
- case 2 : a+=k[0]&0xffff; break;
- case 1 : a+=k[0]&0xff; break;
- case 0 : return c; /* zero length strings require no mixing */
- }
-
-#else /* make valgrind happy */
-
- k8 = (const uint8_t *)k;
- switch(length)
- {
- case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
- case 11: c+=((uint32_t)k8[10])<<16; /* fall through */
- case 10: c+=((uint32_t)k8[9])<<8; /* fall through */
- case 9 : c+=k8[8]; /* fall through */
- case 8 : b+=k[1]; a+=k[0]; break;
- case 7 : b+=((uint32_t)k8[6])<<16; /* fall through */
- case 6 : b+=((uint32_t)k8[5])<<8; /* fall through */
- case 5 : b+=k8[4]; /* fall through */
- case 4 : a+=k[0]; break;
- case 3 : a+=((uint32_t)k8[2])<<16; /* fall through */
- case 2 : a+=((uint32_t)k8[1])<<8; /* fall through */
- case 1 : a+=k8[0]; break;
- case 0 : return c;
- }
-
-#endif /* !valgrind */
-
- } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
- const uint16_t *k = (const uint16_t *)key; /* read 16-bit chunks */
- const uint8_t *k8;
-
- /*--------------- all but last block: aligned reads and different mixing */
- while (length > 12)
- {
- a += k[0] + (((uint32_t)k[1])<<16);
- b += k[2] + (((uint32_t)k[3])<<16);
- c += k[4] + (((uint32_t)k[5])<<16);
- mix(a,b,c);
- length -= 12;
- k += 6;
- }
-
- /*----------------------------- handle the last (probably partial) block */
- k8 = (const uint8_t *)k;
- switch(length)
- {
- case 12: c+=k[4]+(((uint32_t)k[5])<<16);
- b+=k[2]+(((uint32_t)k[3])<<16);
- a+=k[0]+(((uint32_t)k[1])<<16);
- break;
- case 11: c+=((uint32_t)k8[10])<<16; /* fall through */
- case 10: c+=k[4];
- b+=k[2]+(((uint32_t)k[3])<<16);
- a+=k[0]+(((uint32_t)k[1])<<16);
- break;
- case 9 : c+=k8[8]; /* fall through */
- case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
- a+=k[0]+(((uint32_t)k[1])<<16);
- break;
- case 7 : b+=((uint32_t)k8[6])<<16; /* fall through */
- case 6 : b+=k[2];
- a+=k[0]+(((uint32_t)k[1])<<16);
- break;
- case 5 : b+=k8[4]; /* fall through */
- case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
- break;
- case 3 : a+=((uint32_t)k8[2])<<16; /* fall through */
- case 2 : a+=k[0];
- break;
- case 1 : a+=k8[0];
- break;
- case 0 : return c; /* zero length requires no mixing */
- }
-
- } else { /* need to read the key one byte at a time */
- const uint8_t *k = (const uint8_t *)key;
-
- /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
- while (length > 12)
- {
- a += k[0];
- a += ((uint32_t)k[1])<<8;
- a += ((uint32_t)k[2])<<16;
- a += ((uint32_t)k[3])<<24;
- b += k[4];
- b += ((uint32_t)k[5])<<8;
- b += ((uint32_t)k[6])<<16;
- b += ((uint32_t)k[7])<<24;
- c += k[8];
- c += ((uint32_t)k[9])<<8;
- c += ((uint32_t)k[10])<<16;
- c += ((uint32_t)k[11])<<24;
- mix(a,b,c);
- length -= 12;
- k += 12;
- }
-
- /*-------------------------------- last block: affect all 32 bits of (c) */
- switch(length) /* all the case statements fall through */
- {
- case 12: c+=((uint32_t)k[11])<<24;
- case 11: c+=((uint32_t)k[10])<<16;
- case 10: c+=((uint32_t)k[9])<<8;
- case 9 : c+=k[8];
- case 8 : b+=((uint32_t)k[7])<<24;
- case 7 : b+=((uint32_t)k[6])<<16;
- case 6 : b+=((uint32_t)k[5])<<8;
- case 5 : b+=k[4];
- case 4 : a+=((uint32_t)k[3])<<24;
- case 3 : a+=((uint32_t)k[2])<<16;
- case 2 : a+=((uint32_t)k[1])<<8;
- case 1 : a+=k[0];
- break;
- case 0 : return c;
- }
- }
-
- final(a,b,c);
- return c;
-}
diff --git a/compat/jansson/memory.c b/compat/jansson/memory.c
deleted file mode 100644
index a2be5d23..00000000
--- a/compat/jansson/memory.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- * Copyright (c) 2011-2012 Basile Starynkevitch
- *
- * Jansson is free software; you can redistribute it and/or modify it
- * under the terms of the MIT license. See LICENSE for details.
- */
-
-#include
-#include
-
-#include "jansson.h"
-#include "jansson_private.h"
-
-/* C89 allows these to be macros */
-#undef malloc
-#undef free
-
-/* memory function pointers */
-static json_malloc_t do_malloc = malloc;
-static json_free_t do_free = free;
-
-void *jsonp_malloc(size_t size)
-{
- if(!size)
- return NULL;
-
- return (*do_malloc)(size);
-}
-
-void jsonp_free(void *ptr)
-{
- if(!ptr)
- return;
-
- (*do_free)(ptr);
-}
-
-char *jsonp_strdup(const char *str)
-{
- return jsonp_strndup(str, strlen(str));
-}
-
-char *jsonp_strndup(const char *str, size_t len)
-{
- char *new_str;
-
- new_str = jsonp_malloc(len + 1);
- if(!new_str)
- return NULL;
-
- memcpy(new_str, str, len);
- new_str[len] = '\0';
- return new_str;
-}
-
-void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn)
-{
- do_malloc = malloc_fn;
- do_free = free_fn;
-}
-
-void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn)
-{
- if (malloc_fn)
- *malloc_fn = do_malloc;
- if (free_fn)
- *free_fn = do_free;
-}
diff --git a/compat/jansson/pack_unpack.c b/compat/jansson/pack_unpack.c
deleted file mode 100644
index 2a2da353..00000000
--- a/compat/jansson/pack_unpack.c
+++ /dev/null
@@ -1,871 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- * Copyright (c) 2011-2012 Graeme Smecher
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include
-#include "jansson.h"
-#include "jansson_private.h"
-#include "utf.h"
-
-typedef struct {
- int line;
- int column;
- size_t pos;
- char token;
-} token_t;
-
-typedef struct {
- const char *start;
- const char *fmt;
- token_t prev_token;
- token_t token;
- token_t next_token;
- json_error_t *error;
- size_t flags;
- int line;
- int column;
- size_t pos;
-} scanner_t;
-
-#define token(scanner) ((scanner)->token.token)
-
-static const char * const type_names[] = {
- "object",
- "array",
- "string",
- "integer",
- "real",
- "true",
- "false",
- "null"
-};
-
-#define type_name(x) type_names[json_typeof(x)]
-
-static const char unpack_value_starters[] = "{[siIbfFOon";
-
-static void scanner_init(scanner_t *s, json_error_t *error,
- size_t flags, const char *fmt)
-{
- s->error = error;
- s->flags = flags;
- s->fmt = s->start = fmt;
- memset(&s->prev_token, 0, sizeof(token_t));
- memset(&s->token, 0, sizeof(token_t));
- memset(&s->next_token, 0, sizeof(token_t));
- s->line = 1;
- s->column = 0;
- s->pos = 0;
-}
-
-static void next_token(scanner_t *s)
-{
- const char *t;
- s->prev_token = s->token;
-
- if(s->next_token.line) {
- s->token = s->next_token;
- s->next_token.line = 0;
- return;
- }
-
- t = s->fmt;
- s->column++;
- s->pos++;
-
- /* skip space and ignored chars */
- while(*t == ' ' || *t == '\t' || *t == '\n' || *t == ',' || *t == ':') {
- if(*t == '\n') {
- s->line++;
- s->column = 1;
- }
- else
- s->column++;
-
- s->pos++;
- t++;
- }
-
- s->token.token = *t;
- s->token.line = s->line;
- s->token.column = s->column;
- s->token.pos = s->pos;
-
- t++;
- s->fmt = t;
-}
-
-static void prev_token(scanner_t *s)
-{
- s->next_token = s->token;
- s->token = s->prev_token;
-}
-
-static void set_error(scanner_t *s, const char *source, const char *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
-
- jsonp_error_vset(s->error, s->token.line, s->token.column, s->token.pos,
- fmt, ap);
-
- jsonp_error_set_source(s->error, source);
-
- va_end(ap);
-}
-
-static json_t *pack(scanner_t *s, va_list *ap);
-
-
-/* ours will be set to 1 if jsonp_free() must be called for the result
- afterwards */
-static char *read_string(scanner_t *s, va_list *ap,
- const char *purpose, size_t *out_len, int *ours)
-{
- char t;
- strbuffer_t strbuff;
- const char *str;
- size_t length;
-
- next_token(s);
- t = token(s);
- prev_token(s);
-
- if(t != '#' && t != '%' && t != '+') {
- /* Optimize the simple case */
- str = va_arg(*ap, const char *);
-
- if(!str) {
- set_error(s, "", "NULL string argument");
- return NULL;
- }
-
- length = strlen(str);
-
- if(!utf8_check_string(str, length)) {
- set_error(s, "", "Invalid UTF-8 %s", purpose);
- return NULL;
- }
-
- *out_len = length;
- *ours = 0;
- return (char *)str;
- }
-
- strbuffer_init(&strbuff);
-
- while(1) {
- str = va_arg(*ap, const char *);
- if(!str) {
- set_error(s, "", "NULL string argument");
- strbuffer_close(&strbuff);
- return NULL;
- }
-
- next_token(s);
-
- if(token(s) == '#') {
- length = va_arg(*ap, int);
- }
- else if(token(s) == '%') {
- length = va_arg(*ap, size_t);
- }
- else {
- prev_token(s);
- length = strlen(str);
- }
-
- if(strbuffer_append_bytes(&strbuff, str, length) == -1) {
- set_error(s, "", "Out of memory");
- strbuffer_close(&strbuff);
- return NULL;
- }
-
- next_token(s);
- if(token(s) != '+') {
- prev_token(s);
- break;
- }
- }
-
- if(!utf8_check_string(strbuff.value, strbuff.length)) {
- set_error(s, "", "Invalid UTF-8 %s", purpose);
- strbuffer_close(&strbuff);
- return NULL;
- }
-
- *out_len = strbuff.length;
- *ours = 1;
- return strbuffer_steal_value(&strbuff);
-}
-
-static json_t *pack_object(scanner_t *s, va_list *ap)
-{
- json_t *object = json_object();
- next_token(s);
-
- while(token(s) != '}') {
- char *key;
- size_t len;
- int ours;
- json_t *value;
-
- if(!token(s)) {
- set_error(s, "", "Unexpected end of format string");
- goto error;
- }
-
- if(token(s) != 's') {
- set_error(s, "", "Expected format 's', got '%c'", token(s));
- goto error;
- }
-
- key = read_string(s, ap, "object key", &len, &ours);
- if(!key)
- goto error;
-
- next_token(s);
-
- value = pack(s, ap);
- if(!value) {
- if(ours)
- jsonp_free(key);
-
- goto error;
- }
-
- if(json_object_set_new_nocheck(object, key, value)) {
- set_error(s, "", "Unable to add key \"%s\"", key);
- if(ours)
- jsonp_free(key);
-
- goto error;
- }
-
- if(ours)
- jsonp_free(key);
-
- next_token(s);
- }
-
- return object;
-
-error:
- json_decref(object);
- return NULL;
-}
-
-static json_t *pack_array(scanner_t *s, va_list *ap)
-{
- json_t *array = json_array();
- next_token(s);
-
- while(token(s) != ']') {
- json_t *value;
-
- if(!token(s)) {
- set_error(s, "", "Unexpected end of format string");
- goto error;
- }
-
- value = pack(s, ap);
- if(!value)
- goto error;
-
- if(json_array_append_new(array, value)) {
- set_error(s, "", "Unable to append to array");
- goto error;
- }
-
- next_token(s);
- }
- return array;
-
-error:
- json_decref(array);
- return NULL;
-}
-
-static json_t *pack_string(scanner_t *s, va_list *ap)
-{
- char *str;
- size_t len;
- int ours;
- int nullable;
-
- next_token(s);
- nullable = token(s) == '?';
- if (!nullable)
- prev_token(s);
-
- str = read_string(s, ap, "string", &len, &ours);
- if (!str) {
- return nullable ? json_null() : NULL;
- } else if (ours) {
- return jsonp_stringn_nocheck_own(str, len);
- } else {
- return json_stringn_nocheck(str, len);
- }
-}
-
-static json_t *pack(scanner_t *s, va_list *ap)
-{
- switch(token(s)) {
- case '{':
- return pack_object(s, ap);
-
- case '[':
- return pack_array(s, ap);
-
- case 's': /* string */
- return pack_string(s, ap);
-
- case 'n': /* null */
- return json_null();
-
- case 'b': /* boolean */
- return va_arg(*ap, int) ? json_true() : json_false();
-
- case 'i': /* integer from int */
- return json_integer(va_arg(*ap, int));
-
- case 'I': /* integer from json_int_t */
- return json_integer(va_arg(*ap, json_int_t));
-
- case 'f': /* real */
- return json_real(va_arg(*ap, double));
-
- case 'O': /* a json_t object; increments refcount */
- {
- int nullable;
- json_t *json;
-
- next_token(s);
- nullable = token(s) == '?';
- if (!nullable)
- prev_token(s);
-
- json = va_arg(*ap, json_t *);
- if (!json && nullable) {
- return json_null();
- } else {
- return json_incref(json);
- }
- }
-
- case 'o': /* a json_t object; doesn't increment refcount */
- {
- int nullable;
- json_t *json;
-
- next_token(s);
- nullable = token(s) == '?';
- if (!nullable)
- prev_token(s);
-
- json = va_arg(*ap, json_t *);
- if (!json && nullable) {
- return json_null();
- } else {
- return json;
- }
- }
-
- default:
- set_error(s, "", "Unexpected format character '%c'",
- token(s));
- return NULL;
- }
-}
-
-static int unpack(scanner_t *s, json_t *root, va_list *ap);
-
-static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
-{
- int ret = -1;
- int strict = 0;
- int gotopt = 0;
-
- /* Use a set (emulated by a hashtable) to check that all object
- keys are accessed. Checking that the correct number of keys
- were accessed is not enough, as the same key can be unpacked
- multiple times.
- */
- hashtable_t key_set;
-
- if(hashtable_init(&key_set)) {
- set_error(s, "", "Out of memory");
- return -1;
- }
-
- if(root && !json_is_object(root)) {
- set_error(s, "", "Expected object, got %s",
- type_name(root));
- goto out;
- }
- next_token(s);
-
- while(token(s) != '}') {
- const char *key;
- json_t *value;
- int opt = 0;
-
- if(strict != 0) {
- set_error(s, "", "Expected '}' after '%c', got '%c'",
- (strict == 1 ? '!' : '*'), token(s));
- goto out;
- }
-
- if(!token(s)) {
- set_error(s, "", "Unexpected end of format string");
- goto out;
- }
-
- if(token(s) == '!' || token(s) == '*') {
- strict = (token(s) == '!' ? 1 : -1);
- next_token(s);
- continue;
- }
-
- if(token(s) != 's') {
- set_error(s, "", "Expected format 's', got '%c'", token(s));
- goto out;
- }
-
- key = va_arg(*ap, const char *);
- if(!key) {
- set_error(s, "", "NULL object key");
- goto out;
- }
-
- next_token(s);
-
- if(token(s) == '?') {
- opt = gotopt = 1;
- next_token(s);
- }
-
- if(!root) {
- /* skipping */
- value = NULL;
- }
- else {
- value = json_object_get(root, key);
- if(!value && !opt) {
- set_error(s, "", "Object item not found: %s", key);
- goto out;
- }
- }
-
- if(unpack(s, value, ap))
- goto out;
-
- hashtable_set(&key_set, key, json_null());
- next_token(s);
- }
-
- if(strict == 0 && (s->flags & JSON_STRICT))
- strict = 1;
-
- if(root && strict == 1) {
- /* We need to check that all non optional items have been parsed */
- const char *key;
- int have_unrecognized_keys = 0;
- strbuffer_t unrecognized_keys;
- json_t *value;
- long unpacked = 0;
- if (gotopt) {
- /* We have optional keys, we need to iter on each key */
- json_object_foreach(root, key, value) {
- if(!hashtable_get(&key_set, key)) {
- unpacked++;
-
- /* Save unrecognized keys for the error message */
- if (!have_unrecognized_keys) {
- strbuffer_init(&unrecognized_keys);
- have_unrecognized_keys = 1;
- } else {
- strbuffer_append_bytes(&unrecognized_keys, ", ", 2);
- }
- strbuffer_append_bytes(&unrecognized_keys, key, strlen(key));
- }
- }
- } else {
- /* No optional keys, we can just compare the number of items */
- unpacked = (long)json_object_size(root) - (long)key_set.size;
- }
- if (unpacked) {
- if (!gotopt) {
- /* Save unrecognized keys for the error message */
- json_object_foreach(root, key, value) {
- if(!hashtable_get(&key_set, key)) {
- if (!have_unrecognized_keys) {
- strbuffer_init(&unrecognized_keys);
- have_unrecognized_keys = 1;
- } else {
- strbuffer_append_bytes(&unrecognized_keys, ", ", 2);
- }
- strbuffer_append_bytes(&unrecognized_keys, key, strlen(key));
- }
- }
- }
- set_error(s, "",
- "%li object item(s) left unpacked: %s",
- unpacked, strbuffer_value(&unrecognized_keys));
- strbuffer_close(&unrecognized_keys);
- goto out;
- }
- }
-
- ret = 0;
-
-out:
- hashtable_close(&key_set);
- return ret;
-}
-
-static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
-{
- size_t i = 0;
- int strict = 0;
-
- if(root && !json_is_array(root)) {
- set_error(s, "", "Expected array, got %s", type_name(root));
- return -1;
- }
- next_token(s);
-
- while(token(s) != ']') {
- json_t *value;
-
- if(strict != 0) {
- set_error(s, "", "Expected ']' after '%c', got '%c'",
- (strict == 1 ? '!' : '*'),
- token(s));
- return -1;
- }
-
- if(!token(s)) {
- set_error(s, "", "Unexpected end of format string");
- return -1;
- }
-
- if(token(s) == '!' || token(s) == '*') {
- strict = (token(s) == '!' ? 1 : -1);
- next_token(s);
- continue;
- }
-
- if(!strchr(unpack_value_starters, token(s))) {
- set_error(s, "", "Unexpected format character '%c'",
- token(s));
- return -1;
- }
-
- if(!root) {
- /* skipping */
- value = NULL;
- }
- else {
- value = json_array_get(root, i);
- if(!value) {
- set_error(s, "", "Array index %lu out of range",
- (unsigned long)i);
- return -1;
- }
- }
-
- if(unpack(s, value, ap))
- return -1;
-
- next_token(s);
- i++;
- }
-
- if(strict == 0 && (s->flags & JSON_STRICT))
- strict = 1;
-
- if(root && strict == 1 && i != json_array_size(root)) {
- long diff = (long)json_array_size(root) - (long)i;
- set_error(s, "", "%li array item(s) left unpacked", diff);
- return -1;
- }
-
- return 0;
-}
-
-static int unpack(scanner_t *s, json_t *root, va_list *ap)
-{
- switch(token(s))
- {
- case '{':
- return unpack_object(s, root, ap);
-
- case '[':
- return unpack_array(s, root, ap);
-
- case 's':
- if(root && !json_is_string(root)) {
- set_error(s, "", "Expected string, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- const char **str_target;
- size_t *len_target = NULL;
-
- str_target = va_arg(*ap, const char **);
- if(!str_target) {
- set_error(s, "", "NULL string argument");
- return -1;
- }
-
- next_token(s);
-
- if(token(s) == '%') {
- len_target = va_arg(*ap, size_t *);
- if(!len_target) {
- set_error(s, "", "NULL string length argument");
- return -1;
- }
- }
- else
- prev_token(s);
-
- if(root) {
- *str_target = json_string_value(root);
- if(len_target)
- *len_target = json_string_length(root);
- }
- }
- return 0;
-
- case 'i':
- if(root && !json_is_integer(root)) {
- set_error(s, "", "Expected integer, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- int *target = va_arg(*ap, int*);
- if(root)
- *target = (int)json_integer_value(root);
- }
-
- return 0;
-
- case 'I':
- if(root && !json_is_integer(root)) {
- set_error(s, "", "Expected integer, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- json_int_t *target = va_arg(*ap, json_int_t*);
- if(root)
- *target = json_integer_value(root);
- }
-
- return 0;
-
- case 'b':
- if(root && !json_is_boolean(root)) {
- set_error(s, "", "Expected true or false, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- int *target = va_arg(*ap, int*);
- if(root)
- *target = json_is_true(root);
- }
-
- return 0;
-
- case 'f':
- if(root && !json_is_real(root)) {
- set_error(s, "", "Expected real, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- double *target = va_arg(*ap, double*);
- if(root)
- *target = json_real_value(root);
- }
-
- return 0;
-
- case 'F':
- if(root && !json_is_number(root)) {
- set_error(s, "", "Expected real or integer, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- double *target = va_arg(*ap, double*);
- if(root)
- *target = json_number_value(root);
- }
-
- return 0;
-
- case 'O':
- if(root && !(s->flags & JSON_VALIDATE_ONLY))
- json_incref(root);
- /* Fall through */
-
- case 'o':
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- json_t **target = va_arg(*ap, json_t**);
- if(root)
- *target = root;
- }
-
- return 0;
-
- case 'n':
- /* Never assign, just validate */
- if(root && !json_is_null(root)) {
- set_error(s, "", "Expected null, got %s",
- type_name(root));
- return -1;
- }
- return 0;
-
- default:
- set_error(s, "", "Unexpected format character '%c'",
- token(s));
- return -1;
- }
-}
-
-json_t *json_vpack_ex(json_error_t *error, size_t flags,
- const char *fmt, va_list ap)
-{
- scanner_t s;
- va_list ap_copy;
- json_t *value;
-
- if(!fmt || !*fmt) {
- jsonp_error_init(error, "");
- jsonp_error_set(error, -1, -1, 0, "NULL or empty format string");
- return NULL;
- }
- jsonp_error_init(error, NULL);
-
- scanner_init(&s, error, flags, fmt);
- next_token(&s);
-
- va_copy(ap_copy, ap);
- value = pack(&s, &ap_copy);
- va_end(ap_copy);
-
- if(!value)
- return NULL;
-
- next_token(&s);
- if(token(&s)) {
- json_decref(value);
- set_error(&s, "", "Garbage after format string");
- return NULL;
- }
-
- return value;
-}
-
-json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...)
-{
- json_t *value;
- va_list ap;
-
- va_start(ap, fmt);
- value = json_vpack_ex(error, flags, fmt, ap);
- va_end(ap);
-
- return value;
-}
-
-json_t *json_pack(const char *fmt, ...)
-{
- json_t *value;
- va_list ap;
-
- va_start(ap, fmt);
- value = json_vpack_ex(NULL, 0, fmt, ap);
- va_end(ap);
-
- return value;
-}
-
-int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags,
- const char *fmt, va_list ap)
-{
- scanner_t s;
- va_list ap_copy;
-
- if(!root) {
- jsonp_error_init(error, "");
- jsonp_error_set(error, -1, -1, 0, "NULL root value");
- return -1;
- }
-
- if(!fmt || !*fmt) {
- jsonp_error_init(error, "");
- jsonp_error_set(error, -1, -1, 0, "NULL or empty format string");
- return -1;
- }
- jsonp_error_init(error, NULL);
-
- scanner_init(&s, error, flags, fmt);
- next_token(&s);
-
- va_copy(ap_copy, ap);
- if(unpack(&s, root, &ap_copy)) {
- va_end(ap_copy);
- return -1;
- }
- va_end(ap_copy);
-
- next_token(&s);
- if(token(&s)) {
- set_error(&s, "", "Garbage after format string");
- return -1;
- }
-
- return 0;
-}
-
-int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...)
-{
- int ret;
- va_list ap;
-
- va_start(ap, fmt);
- ret = json_vunpack_ex(root, error, flags, fmt, ap);
- va_end(ap);
-
- return ret;
-}
-
-int json_unpack(json_t *root, const char *fmt, ...)
-{
- int ret;
- va_list ap;
-
- va_start(ap, fmt);
- ret = json_vunpack_ex(root, NULL, 0, fmt, ap);
- va_end(ap);
-
- return ret;
-}
diff --git a/compat/jansson/strbuffer.c b/compat/jansson/strbuffer.c
deleted file mode 100644
index 5e8c0039..00000000
--- a/compat/jansson/strbuffer.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include
-#include
-#include "jansson_private.h"
-#include "strbuffer.h"
-
-#define STRBUFFER_MIN_SIZE 16
-#define STRBUFFER_FACTOR 2
-#define STRBUFFER_SIZE_MAX ((size_t)-1)
-
-int strbuffer_init(strbuffer_t *strbuff)
-{
- strbuff->size = STRBUFFER_MIN_SIZE;
- strbuff->length = 0;
-
- strbuff->value = jsonp_malloc(strbuff->size);
- if(!strbuff->value)
- return -1;
-
- /* initialize to empty */
- strbuff->value[0] = '\0';
- return 0;
-}
-
-void strbuffer_close(strbuffer_t *strbuff)
-{
- if(strbuff->value)
- jsonp_free(strbuff->value);
-
- strbuff->size = 0;
- strbuff->length = 0;
- strbuff->value = NULL;
-}
-
-void strbuffer_clear(strbuffer_t *strbuff)
-{
- strbuff->length = 0;
- strbuff->value[0] = '\0';
-}
-
-const char *strbuffer_value(const strbuffer_t *strbuff)
-{
- return strbuff->value;
-}
-
-char *strbuffer_steal_value(strbuffer_t *strbuff)
-{
- char *result = strbuff->value;
- strbuff->value = NULL;
- return result;
-}
-
-int strbuffer_append_byte(strbuffer_t *strbuff, char byte)
-{
- return strbuffer_append_bytes(strbuff, &byte, 1);
-}
-
-int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size)
-{
- if(size >= strbuff->size - strbuff->length)
- {
- size_t new_size;
- char *new_value;
-
- /* avoid integer overflow */
- if (strbuff->size > STRBUFFER_SIZE_MAX / STRBUFFER_FACTOR
- || size > STRBUFFER_SIZE_MAX - 1
- || strbuff->length > STRBUFFER_SIZE_MAX - 1 - size)
- return -1;
-
- new_size = max(strbuff->size * STRBUFFER_FACTOR,
- strbuff->length + size + 1);
-
- new_value = jsonp_malloc(new_size);
- if(!new_value)
- return -1;
-
- memcpy(new_value, strbuff->value, strbuff->length);
-
- jsonp_free(strbuff->value);
- strbuff->value = new_value;
- strbuff->size = new_size;
- }
-
- memcpy(strbuff->value + strbuff->length, data, size);
- strbuff->length += size;
- strbuff->value[strbuff->length] = '\0';
-
- return 0;
-}
-
-char strbuffer_pop(strbuffer_t *strbuff)
-{
- if(strbuff->length > 0) {
- char c = strbuff->value[--strbuff->length];
- strbuff->value[strbuff->length] = '\0';
- return c;
- }
- else
- return '\0';
-}
diff --git a/compat/jansson/strbuffer.h b/compat/jansson/strbuffer.h
deleted file mode 100644
index 615b7f5f..00000000
--- a/compat/jansson/strbuffer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef STRBUFFER_H
-#define STRBUFFER_H
-
-#include
-
-typedef struct {
- char *value;
- size_t length; /* bytes used */
- size_t size; /* bytes allocated */
-} strbuffer_t;
-
-int strbuffer_init(strbuffer_t *strbuff);
-void strbuffer_close(strbuffer_t *strbuff);
-
-void strbuffer_clear(strbuffer_t *strbuff);
-
-const char *strbuffer_value(const strbuffer_t *strbuff);
-
-/* Steal the value and close the strbuffer */
-char *strbuffer_steal_value(strbuffer_t *strbuff);
-
-int strbuffer_append_byte(strbuffer_t *strbuff, char byte);
-int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size);
-
-char strbuffer_pop(strbuffer_t *strbuff);
-
-#endif
diff --git a/compat/jansson/strconv.c b/compat/jansson/strconv.c
deleted file mode 100644
index 8075481e..00000000
--- a/compat/jansson/strconv.c
+++ /dev/null
@@ -1,145 +0,0 @@
-#include
-#include
-#include
-#include
-#include
-#ifdef __MINGW32__
-#undef __NO_ISOCEXT /* ensure stdlib.h will declare prototypes for mingw own 'strtod' replacement, called '__strtod' */
-#endif
-#include "jansson_private.h"
-#include "strbuffer.h"
-
-/* need jansson_private_config.h to get the correct snprintf */
-#ifdef HAVE_CONFIG_H
-#include
-#endif
-
-#ifdef __MINGW32__
-#define strtod __strtod
-#endif
-
-#if JSON_HAVE_LOCALECONV
-#include
-
-/*
- - This code assumes that the decimal separator is exactly one
- character.
-
- - If setlocale() is called by another thread between the call to
- localeconv() and the call to sprintf() or strtod(), the result may
- be wrong. setlocale() is not thread-safe and should not be used
- this way. Multi-threaded programs should use uselocale() instead.
-*/
-
-static void to_locale(strbuffer_t *strbuffer)
-{
- const char *point;
- char *pos;
-
- point = localeconv()->decimal_point;
- if(*point == '.') {
- /* No conversion needed */
- return;
- }
-
- pos = strchr(strbuffer->value, '.');
- if(pos)
- *pos = *point;
-}
-
-static void from_locale(char *buffer)
-{
- const char *point;
- char *pos;
-
- point = localeconv()->decimal_point;
- if(*point == '.') {
- /* No conversion needed */
- return;
- }
-
- pos = strchr(buffer, *point);
- if(pos)
- *pos = '.';
-}
-#endif
-
-int jsonp_strtod(strbuffer_t *strbuffer, double *out)
-{
- double value;
- char *end;
-
-#if JSON_HAVE_LOCALECONV
- to_locale(strbuffer);
-#endif
-
- errno = 0;
- value = strtod(strbuffer->value, &end);
- assert(end == strbuffer->value + strbuffer->length);
-
- if((value == HUGE_VAL || value == -HUGE_VAL) && errno == ERANGE) {
- /* Overflow */
- return -1;
- }
-
- *out = value;
- return 0;
-}
-
-int jsonp_dtostr(char *buffer, size_t size, double value, int precision)
-{
- int ret;
- char *start, *end;
- size_t length;
-
- if (precision == 0)
- precision = 17;
-
- ret = snprintf(buffer, size, "%.*g", precision, value);
- if(ret < 0)
- return -1;
-
- length = (size_t)ret;
- if(length >= size)
- return -1;
-
-#if JSON_HAVE_LOCALECONV
- from_locale(buffer);
-#endif
-
- /* Make sure there's a dot or 'e' in the output. Otherwise
- a real is converted to an integer when decoding */
- if(strchr(buffer, '.') == NULL &&
- strchr(buffer, 'e') == NULL)
- {
- if(length + 3 >= size) {
- /* No space to append ".0" */
- return -1;
- }
- buffer[length] = '.';
- buffer[length + 1] = '0';
- buffer[length + 2] = '\0';
- length += 2;
- }
-
- /* Remove leading '+' from positive exponent. Also remove leading
- zeros from exponents (added by some printf() implementations) */
- start = strchr(buffer, 'e');
- if(start) {
- start++;
- end = start + 1;
-
- if(*start == '-')
- start++;
-
- while(*end == '0')
- end++;
-
- if(end != start) {
- memmove(start, end, length - (size_t)(end - buffer));
- length -= (size_t)(end - start);
- }
- }
-
- return (int)length;
-}
diff --git a/compat/jansson/utf.c b/compat/jansson/utf.c
deleted file mode 100644
index be966cbd..00000000
--- a/compat/jansson/utf.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include
-#include "utf.h"
-
-int utf8_encode(int32_t codepoint, char *buffer, size_t *size)
-{
- if(codepoint < 0)
- return -1;
- else if(codepoint < 0x80)
- {
- buffer[0] = (char)codepoint;
- *size = 1;
- }
- else if(codepoint < 0x800)
- {
- buffer[0] = 0xC0 + ((codepoint & 0x7C0) >> 6);
- buffer[1] = 0x80 + ((codepoint & 0x03F));
- *size = 2;
- }
- else if(codepoint < 0x10000)
- {
- buffer[0] = 0xE0 + ((codepoint & 0xF000) >> 12);
- buffer[1] = 0x80 + ((codepoint & 0x0FC0) >> 6);
- buffer[2] = 0x80 + ((codepoint & 0x003F));
- *size = 3;
- }
- else if(codepoint <= 0x10FFFF)
- {
- buffer[0] = 0xF0 + ((codepoint & 0x1C0000) >> 18);
- buffer[1] = 0x80 + ((codepoint & 0x03F000) >> 12);
- buffer[2] = 0x80 + ((codepoint & 0x000FC0) >> 6);
- buffer[3] = 0x80 + ((codepoint & 0x00003F));
- *size = 4;
- }
- else
- return -1;
-
- return 0;
-}
-
-size_t utf8_check_first(char byte)
-{
- unsigned char u = (unsigned char)byte;
-
- if(u < 0x80)
- return 1;
-
- if(0x80 <= u && u <= 0xBF) {
- /* second, third or fourth byte of a multi-byte
- sequence, i.e. a "continuation byte" */
- return 0;
- }
- else if(u == 0xC0 || u == 0xC1) {
- /* overlong encoding of an ASCII byte */
- return 0;
- }
- else if(0xC2 <= u && u <= 0xDF) {
- /* 2-byte sequence */
- return 2;
- }
-
- else if(0xE0 <= u && u <= 0xEF) {
- /* 3-byte sequence */
- return 3;
- }
- else if(0xF0 <= u && u <= 0xF4) {
- /* 4-byte sequence */
- return 4;
- }
- else { /* u >= 0xF5 */
- /* Restricted (start of 4-, 5- or 6-byte sequence) or invalid
- UTF-8 */
- return 0;
- }
-}
-
-size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint)
-{
- size_t i;
- int32_t value = 0;
- unsigned char u = (unsigned char)buffer[0];
-
- if(size == 2)
- {
- value = u & 0x1F;
- }
- else if(size == 3)
- {
- value = u & 0xF;
- }
- else if(size == 4)
- {
- value = u & 0x7;
- }
- else
- return 0;
-
- for(i = 1; i < size; i++)
- {
- u = (unsigned char)buffer[i];
-
- if(u < 0x80 || u > 0xBF) {
- /* not a continuation byte */
- return 0;
- }
-
- value = (value << 6) + (u & 0x3F);
- }
-
- if(value > 0x10FFFF) {
- /* not in Unicode range */
- return 0;
- }
-
- else if(0xD800 <= value && value <= 0xDFFF) {
- /* invalid code point (UTF-16 surrogate halves) */
- return 0;
- }
-
- else if((size == 2 && value < 0x80) ||
- (size == 3 && value < 0x800) ||
- (size == 4 && value < 0x10000)) {
- /* overlong encoding */
- return 0;
- }
-
- if(codepoint)
- *codepoint = value;
-
- return 1;
-}
-
-const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint)
-{
- size_t count;
- int32_t value;
-
- if(!bufsize)
- return buffer;
-
- count = utf8_check_first(buffer[0]);
- if(count <= 0)
- return NULL;
-
- if(count == 1)
- value = (unsigned char)buffer[0];
- else
- {
- if(count > bufsize || !utf8_check_full(buffer, count, &value))
- return NULL;
- }
-
- if(codepoint)
- *codepoint = value;
-
- return buffer + count;
-}
-
-int utf8_check_string(const char *string, size_t length)
-{
- size_t i;
-
- for(i = 0; i < length; i++)
- {
- size_t count = utf8_check_first(string[i]);
- if(count == 0)
- return 0;
- else if(count > 1)
- {
- if(count > length - i)
- return 0;
-
- if(!utf8_check_full(&string[i], count, NULL))
- return 0;
-
- i += count - 1;
- }
- }
-
- return 1;
-}
diff --git a/compat/jansson/utf.h b/compat/jansson/utf.h
deleted file mode 100644
index e182df78..00000000
--- a/compat/jansson/utf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen